Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaa25a5a authored by Jaehoon Chung's avatar Jaehoon Chung Committed by Kukjin Kim
Browse files

ARM: dts: unuse the slot-node and deprecate the supports-highspeed for dw-mmc in exynos 



dw-mmc controller can support multiple slots.
But, there are no use-cases anywhere. So we don't need to support the
slot-node for dw-mmc controller.
And "supports-highspeed" property in dw-mmc is deprecated.
"supports-highspeed" property can be replaced with "cap-sd/mmc-highspeed".

Signed-off-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: default avatarTushar Behera <trblinux@gmail.com>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Tested-by: default avatarSachin Kamat <sachin.kamat@samsung.com>
[kgene.kim@samsung.com: rebased exynos5250-snow changes]
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 5fbc3f20

arch/arm/boot/dts/exynos4412-odroid-common.dtsi

+2 −6
Original line number Diff line number Diff line
@@ -54,17 +54,13 @@ 
		status = "okay";



		num-slots = <1>;

		supports-highspeed;

		broken-cd;

		card-detect-delay = <200>;

		samsung,dw-mshc-ciu-div = <3>;

		samsung,dw-mshc-sdr-timing = <2 3>;

		samsung,dw-mshc-ddr-timing = <1 2>;



		slot@0 {

			reg = <0>;

		bus-width = <8>;

		};

		cap-mmc-highspeed;

	};



	watchdog@10060000 {

arch/arm/boot/dts/exynos4412-origen.dts

+2 −6
Original line number Diff line number Diff line
@@ -137,17 +137,13 @@ 
		status = "okay";



		num-slots = <1>;

		supports-highspeed;

		broken-cd;

		card-detect-delay = <200>;

		samsung,dw-mshc-ciu-div = <3>;

		samsung,dw-mshc-sdr-timing = <2 3>;

		samsung,dw-mshc-ddr-timing = <1 2>;



		slot@0 {

			reg = <0>;

		bus-width = <8>;

		};

		cap-mmc-highspeed;

	};



	codec@13400000 {

arch/arm/boot/dts/exynos4412-trats2.dts

+2 −6
Original line number Diff line number Diff line
@@ -520,7 +520,6 @@ 


	mmc@12550000 {

		num-slots = <1>;

		supports-highspeed;

		broken-cd;

		non-removable;

		card-detect-delay = <200>;
@@ -532,11 +531,8 @@ 
		pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;

		pinctrl-names = "default";

		status = "okay";



		slot@0 {

			reg = <0>;

		bus-width = <8>;

		};

		cap-mmc-highspeed;

	};



	serial@13800000 {

arch/arm/boot/dts/exynos5250-arndale.dts

+5 −13
Original line number Diff line number Diff line
@@ -401,7 +401,6 @@ 
	mmc_0: mmc@12200000 {

		status = "okay";

		num-slots = <1>;

		supports-highspeed;

		broken-cd;

		card-detect-delay = <200>;

		samsung,dw-mshc-ciu-div = <3>;
@@ -410,17 +409,13 @@ 
		vmmc-supply = <&mmc_reg>;

		pinctrl-names = "default";

		pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;



		slot@0 {

			reg = <0>;

		bus-width = <8>;

		};

		cap-mmc-highspeed;

	};



	mmc_2: mmc@12220000 {

		status = "okay";

		num-slots = <1>;

		supports-highspeed;

		card-detect-delay = <200>;

		samsung,dw-mshc-ciu-div = <3>;

		samsung,dw-mshc-sdr-timing = <2 3>;
@@ -428,12 +423,9 @@ 
		vmmc-supply = <&mmc_reg>;

		pinctrl-names = "default";

		pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;



		slot@0 {

			reg = <0>;

		bus-width = <4>;

		disable-wp;

		};

		cap-sd-highspeed;

	};



	i2s0: i2s@03830000 {

arch/arm/boot/dts/exynos5250-smdk5250.dts

+5 −13
Original line number Diff line number Diff line
@@ -284,7 +284,6 @@ 
	mmc@12200000 {

		status = "okay";

		num-slots = <1>;

		supports-highspeed;

		broken-cd;

		card-detect-delay = <200>;

		samsung,dw-mshc-ciu-div = <3>;
@@ -292,29 +291,22 @@ 
		samsung,dw-mshc-ddr-timing = <1 2>;

		pinctrl-names = "default";

		pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;



		slot@0 {

			reg = <0>;

		bus-width = <8>;

		};

		cap-mmc-highspeed;

	};



	mmc@12220000 {

		status = "okay";

		num-slots = <1>;

		supports-highspeed;

		card-detect-delay = <200>;

		samsung,dw-mshc-ciu-div = <3>;

		samsung,dw-mshc-sdr-timing = <2 3>;

		samsung,dw-mshc-ddr-timing = <1 2>;

		pinctrl-names = "default";

		pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;



		slot@0 {

			reg = <0>;

		bus-width = <4>;

		disable-wp;

		};

		cap-sd-highspeed;

	};



	spi_1: spi@12d30000 {