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

Commit ec6ca8e1 authored by Shawn Lin's avatar Shawn Lin Committed by Heiko Stuebner
Browse files

ARM: dts: rockchip: remove num-slots from all platforms 



We deprecated the "num-slots" property now and plan to get
rid of it finally. Just move a step to cleanup it from DT.

Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Reviewed-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 83086adf

arch/arm/boot/dts/rk3036-kylin.dts

+0 −2
Original line number Diff line number Diff line
@@ -357,7 +357,6 @@ 
	keep-power-in-suspend;

	mmc-pwrseq = <&sdio_pwrseq>;

	non-removable;

	num-slots = <1>;

	pinctrl-names = "default";

	pinctrl-0 = <&sdio_clk &sdio_cmd &sdio_bus4>;

	sd-uhs-sdr12;
@@ -372,7 +371,6 @@ 
	cap-sd-highspeed;

	card-detect-delay = <200>;

	disable-wp;

	num-slots = <1>;

	pinctrl-names = "default";

	pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>;

};

arch/arm/boot/dts/rk3036.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -287,7 +287,6 @@ 
		fifo-depth = <0x100>;

		mmc-ddr-1_8v;

		non-removable;

		num-slots = <1>;

		pinctrl-names = "default";

		pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;

		resets = <&cru SRST_EMMC>;

arch/arm/boot/dts/rk3066a-bqcurie2.dts

+0 −2
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ 
#include "tps65910.dtsi"



&mmc0 { /* sdmmc */

	num-slots = <1>;

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;
@@ -202,7 +201,6 @@ 
};



&mmc1 { /* wifi */

	num-slots = <1>;

	status = "okay";

	non-removable;

arch/arm/boot/dts/rk3066a-mk808.dts

+0 −2
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ 
	bus-width = <4>;

	cap-mmc-highspeed;

	cap-sd-highspeed;

	num-slots = <1>;

	vmmc-supply = <&vcc_sd>;

	status = "okay";

};
@@ -141,7 +140,6 @@ 
	bus-width = <4>;

	disable-wp;

	non-removable;

	num-slots = <1>;

	pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;

	pinctrl-names = "default";

	vmmc-supply = <&vcc_wifi>;

arch/arm/boot/dts/rk3066a-rayeager.dts

+0 −3
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ 
	cap-mmc-highspeed;

	disable-wp;

	non-removable;

	num-slots = <1>;

	pinctrl-names = "default";

	pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_rst>;

	vmmc-supply = <&vcc_emmc>;
@@ -336,7 +335,6 @@ 
&mmc0 {

	bus-width = <4>;

	disable-wp;

	num-slots = <1>;

	pinctrl-names = "default";

	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;

	vmmc-supply = <&vcc_sd>;
@@ -349,7 +347,6 @@ 
	bus-width = <4>;

	disable-wp;

	non-removable;

	num-slots = <1>;

	pinctrl-names = "default";

	pinctrl-0 = <&sd1_clk>, <&sd1_cmd>, <&sd1_bus4>;

	vmmc-supply = <&vccio_wl>;