OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: dts: exynos: replace mshc0 alias with mmc-ddr-1_8v property 

Previously, the mshc0 alias has been necessary so that
MMC_CAP_1_8V_DDR | MMC_CAP_8_BIT_DATA are set for mshc_0/mmc_0.
However, these capabilities should be described in the device tree so
that we do not have to rely on the alias.

The property mmc-ddr-1_8v replaces MMC_CAP_1_8V_DDR, while bus_width =
<8>, which is already set for all the mshc0/mmc0 nodes, replaces
MMC_CAP_8_BIT_DATA.

Also drop other mshc aliases as they are not needed.

Signed-off-by: Henrik Grimler <henrik@grimler.se>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20230402144724.17839-2-henrik@grimler.se
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
This commit is contained in:
Henrik Grimler 2023-04-02 16:47:23 +02:00 committed by Krzysztof Kozlowski
parent 0e84f3493a
commit 37f9514e61
26 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/exynos3250-artik5.dtsi
View File

@ -321,6 +321,7 @@
vmmc-supply = <&ldo12_reg>;
clock-frequency = <100000000>;
max-frequency = <100000000>;
mmc-ddr-1_8v;
samsung,dw-mshc-ciu-div = <1>;
samsung,dw-mshc-sdr-timing = <0 1>;
samsung,dw-mshc-ddr-timing = <1 2>;

1
arch/arm/boot/dts/exynos3250-monk.dts
View File

@ -443,6 +443,7 @@
vmmc-supply = <&vemmc_reg>;
clock-frequency = <100000000>;
max-frequency = <100000000>;
mmc-ddr-1_8v;
samsung,dw-mshc-ciu-div = <1>;
samsung,dw-mshc-sdr-timing = <0 1>;
samsung,dw-mshc-ddr-timing = <1 2>;

1
arch/arm/boot/dts/exynos3250-rinato.dts
View File

@ -624,6 +624,7 @@
vmmc-supply = <&ldo12_reg>;
clock-frequency = <100000000>;
max-frequency = <100000000>;
mmc-ddr-1_8v;
samsung,dw-mshc-ciu-div = <1>;
samsung,dw-mshc-sdr-timing = <0 1>;
samsung,dw-mshc-ddr-timing = <1 2>;

3
arch/arm/boot/dts/exynos3250.dtsi
View File

@ -28,9 +28,6 @@
aliases {
pinctrl0 = &pinctrl_0;
pinctrl1 = &pinctrl_1;
mshc0 = &mshc_0;
mshc1 = &mshc_1;
mshc2 = &mshc_2;
spi0 = &spi_0;
spi1 = &spi_1;
i2c0 = &i2c_0;

1
arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi
View File

@ -476,6 +476,7 @@
vmmc-supply = <&buck9_reg>;
broken-cd;
card-detect-delay = <200>;
mmc-ddr-1_8v;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;

1
arch/arm/boot/dts/exynos4412-midas.dtsi
View File

@ -977,6 +977,7 @@
samsung,dw-mshc-ciu-div = <0>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
mmc-ddr-1_8v;
pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
pinctrl-names = "default";
status = "okay";

1
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
View File

@ -533,6 +533,7 @@
broken-cd;
card-detect-delay = <200>;
mmc-ddr-1_8v;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;

1
arch/arm/boot/dts/exynos4412-origen.dts
View File

@ -498,6 +498,7 @@
broken-cd;
card-detect-delay = <200>;
mmc-ddr-1_8v;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;

1
arch/arm/boot/dts/exynos4412-p4note.dtsi
View File

@ -693,6 +693,7 @@
samsung,dw-mshc-ciu-div = <0>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
mmc-ddr-1_8v;
pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
pinctrl-names = "default";
bus-width = <4>;

1
arch/arm/boot/dts/exynos4412.dtsi
View File

@ -28,7 +28,6 @@
pinctrl3 = &pinctrl_3;
fimc-lite0 = &fimc_lite_0;
fimc-lite1 = &fimc_lite_1;
mshc0 = &mshc_0;
};
bus_acp: bus-acp {

1
arch/arm/boot/dts/exynos5250-arndale.dts
View File

@ -589,6 +589,7 @@
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
bus-width = <8>;
cap-mmc-highspeed;
mmc-ddr-1_8v;
};
&mmc_2 {

1
arch/arm/boot/dts/exynos5250-smdk5250.dts
View File

@ -350,6 +350,7 @@
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
bus-width = <8>;
cap-mmc-highspeed;
mmc-ddr-1_8v;
};
&mmc_2 {

1
arch/arm/boot/dts/exynos5250-snow-common.dtsi
View File

@ -549,6 +549,7 @@
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>;
bus-width = <8>;
cap-mmc-highspeed;
mmc-ddr-1_8v;
};
/* uSD card */

1
arch/arm/boot/dts/exynos5250-spring.dts
View File

@ -431,6 +431,7 @@
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>;
bus-width = <8>;
cap-mmc-highspeed;
mmc-ddr-1_8v;
};
/*

4
arch/arm/boot/dts/exynos5250.dtsi
View File

@ -30,10 +30,6 @@
gsc1 = &gsc_1;
gsc2 = &gsc_2;
gsc3 = &gsc_3;
mshc0 = &mmc_0;
mshc1 = &mmc_1;
mshc2 = &mmc_2;
mshc3 = &mmc_3;
i2c4 = &i2c_4;
i2c5 = &i2c_5;
i2c6 = &i2c_6;

1
arch/arm/boot/dts/exynos5260-xyref5260.dts
View File

@ -89,6 +89,7 @@
cap-mmc-highspeed;
mmc-hs200-1_8v;
card-detect-delay = <200>;
mmc-ddr-1_8v;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <0 4>;
samsung,dw-mshc-ddr-timing = <0 2>;

1
arch/arm/boot/dts/exynos5410-odroidxu.dts
View File

@ -513,6 +513,7 @@
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8 &sd0_cd>;
bus-width = <8>;
cap-mmc-highspeed;
mmc-ddr-1_8v;
mmc-hs200-1_8v;
vmmc-supply = <&ldo20_reg>;
vqmmc-supply = <&ldo11_reg>;

1
arch/arm/boot/dts/exynos5410-smdk5410.dts
View File

@ -61,6 +61,7 @@
cap-mmc-highspeed;
broken-cd;
card-detect-delay = <200>;
mmc-ddr-1_8v;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;

1
arch/arm/boot/dts/exynos5420-arndale-octa.dts
View File

@ -778,6 +778,7 @@
status = "okay";
non-removable;
card-detect-delay = <200>;
mmc-ddr-1_8v;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <0 4>;
samsung,dw-mshc-ddr-timing = <0 2>;

1
arch/arm/boot/dts/exynos5420-galaxy-tab-common.dtsi
View File

@ -604,6 +604,7 @@
bus-width = <8>;
cap-mmc-highspeed;
card-detect-delay = <200>;
mmc-ddr-1_8v;
mmc-hs200-1_8v;
non-removable;
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8>;

1
arch/arm/boot/dts/exynos5420-peach-pit.dts
View File

@ -722,6 +722,7 @@
/* eMMC flash */
&mmc_0 {
status = "okay";
mmc-ddr-1_8v;
mmc-hs200-1_8v;
cap-mmc-highspeed;
non-removable;

1
arch/arm/boot/dts/exynos5420-smdk5420.dts
View File

@ -355,6 +355,7 @@
status = "okay";
broken-cd;
card-detect-delay = <200>;
mmc-ddr-1_8v;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <0 4>;
samsung,dw-mshc-ddr-timing = <0 2>;

3
arch/arm/boot/dts/exynos5420.dtsi
View File

@ -19,9 +19,6 @@
compatible = "samsung,exynos5420", "samsung,exynos5";
aliases {
mshc0 = &mmc_0;
mshc1 = &mmc_1;
mshc2 = &mmc_2;
pinctrl0 = &pinctrl_0;
pinctrl1 = &pinctrl_1;
pinctrl2 = &pinctrl_2;

1
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
View File

@ -472,6 +472,7 @@
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8 &sd0_cd &sd0_rclk>;
bus-width = <8>;
cap-mmc-highspeed;
mmc-ddr-1_8v;
mmc-hs200-1_8v;
mmc-hs400-1_8v;
max-frequency = <200000000>;

1
arch/arm/boot/dts/exynos5422-samsung-k3g.dts
View File

@ -597,6 +597,7 @@
/* eMMC flash */
&mmc_0 {
status = "okay";
mmc-ddr-1_8v;
mmc-hs200-1_8v;
cap-mmc-highspeed;
non-removable;

1
arch/arm/boot/dts/exynos5800-peach-pi.dts
View File

@ -703,6 +703,7 @@
/* eMMC flash */
&mmc_0 {
status = "okay";
mmc-ddr-1_8v;
mmc-hs200-1_8v;
mmc-hs400-1_8v;
cap-mmc-highspeed;