mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-11 13:27:06 +09:00
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:
committed by
Krzysztof Kozlowski
parent
0e84f3493a
commit
37f9514e61
@@ -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>;
|
||||
|
||||
@@ -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>;
|
||||
|
||||
@@ -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>;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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>;
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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>;
|
||||
|
||||
@@ -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>;
|
||||
|
||||
@@ -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>;
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
pinctrl3 = &pinctrl_3;
|
||||
fimc-lite0 = &fimc_lite_0;
|
||||
fimc-lite1 = &fimc_lite_1;
|
||||
mshc0 = &mshc_0;
|
||||
};
|
||||
|
||||
bus_acp: bus-acp {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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>;
|
||||
|
||||
@@ -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>;
|
||||
|
||||
@@ -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>;
|
||||
|
||||
@@ -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>;
|
||||
|
||||
@@ -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>;
|
||||
|
||||
@@ -722,6 +722,7 @@
|
||||
/* eMMC flash */
|
||||
&mmc_0 {
|
||||
status = "okay";
|
||||
mmc-ddr-1_8v;
|
||||
mmc-hs200-1_8v;
|
||||
cap-mmc-highspeed;
|
||||
non-removable;
|
||||
|
||||
@@ -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>;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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>;
|
||||
|
||||
@@ -597,6 +597,7 @@
|
||||
/* eMMC flash */
|
||||
&mmc_0 {
|
||||
status = "okay";
|
||||
mmc-ddr-1_8v;
|
||||
mmc-hs200-1_8v;
|
||||
cap-mmc-highspeed;
|
||||
non-removable;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user