Skip to content

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

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
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 37 deletions
arch/arm/boot/dts/rk3036-kylin.dts
View file @ ec6ca8e1
......@@ -357,7 +357,6 @@ &sdio {
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 @@ &sdmmc {
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
View file @ ec6ca8e1
......@@ -287,7 +287,6 @@ emmc: dwmmc@1021c000 {
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
View file @ ec6ca8e1
......@@ -190,7 +190,6 @@ vcc28_cif: regulator@12 {
#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 @@ &mmc0 { /* sdmmc */
};
&mmc1 { /* wifi */
num-slots = <1>;
status = "okay";
non-removable;
......
arch/arm/boot/dts/rk3066a-mk808.dts
View file @ ec6ca8e1
......@@ -132,7 +132,6 @@ &mmc0 {
bus-width = <4>;
cap-mmc-highspeed;
cap-sd-highspeed;
num-slots = <1>;
vmmc-supply = <&vcc_sd>;
status = "okay";
};
......@@ -141,7 +140,6 @@ &mmc1 {
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
View file @ ec6ca8e1
......@@ -185,7 +185,6 @@ &emmc {
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 @@ &i2c4 {
&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 @@ &mmc1 {
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>;
......
arch/arm/boot/dts/rk3188-px3-evb.dts
View file @ ec6ca8e1
......@@ -89,7 +89,6 @@ &emmc {
cap-mmc-highspeed;
disable-wp;
non-removable;
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_rst>;
status = "okay";
......@@ -256,7 +255,6 @@ gsl1680: touchscreen@40 {
};
&mmc0 {
num-slots = <1>;
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;
......
arch/arm/boot/dts/rk3188-radxarock.dts
View file @ ec6ca8e1
......@@ -296,7 +296,6 @@ vcc28: REG12 {
};
&mmc0 {
num-slots = <1>;
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;
......
arch/arm/boot/dts/rk322x.dtsi
View file @ ec6ca8e1
......@@ -529,7 +529,6 @@ emmc: dwmmc@30020000 {
clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
bus-width = <8>;
default-sample-phase = <158>;
num-slots = <1>;
fifo-depth = <0x100>;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
......
arch/arm/boot/dts/rk3288-evb.dtsi
View file @ ec6ca8e1
......@@ -249,7 +249,6 @@ &emmc {
cap-mmc-highspeed;
disable-wp;
non-removable;
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
status = "okay";
......@@ -266,7 +265,6 @@ &sdmmc {
cap-sd-highspeed;
card-detect-delay = <200>;
disable-wp; /* wp not hooked up */
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
status = "okay";
......
arch/arm/boot/dts/rk3288-fennec.dts
View file @ ec6ca8e1
......@@ -77,7 +77,6 @@ &emmc {
cap-mmc-highspeed;
disable-wp;
non-removable;
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
status = "okay";
......
arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
View file @ ec6ca8e1
......@@ -78,7 +78,6 @@ &emmc {
mmc-ddr-1_8v;
mmc-hs200-1_8v;
non-removable;
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_pwr>, <&emmc_bus8>;
vmmc-supply = <&vcc_io>;
......
arch/arm/boot/dts/rk3288-firefly-reload.dts
View file @ ec6ca8e1
......@@ -269,7 +269,6 @@ &sdmmc {
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>;
vmmc-supply = <&vcc_sd>;
......@@ -284,7 +283,6 @@ &sdio0 {
disable-wp;
mmc-pwrseq = <&sdio_pwrseq>;
non-removable;
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&sdio0_bus4>, <&sdio0_cmd>, <&sdio0_clk>, <&sdio0_int>;
sd-uhs-sdr12;
......
arch/arm/boot/dts/rk3288-firefly.dtsi
View file @ ec6ca8e1
......@@ -208,7 +208,6 @@ &emmc {
cap-mmc-highspeed;
disable-wp;
non-removable;
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_pwr>, <&emmc_bus8>;
vmmc-supply = <&vcc_io>;
......@@ -527,7 +526,6 @@ &sdio0 {
bus-width = <4>;
disable-wp;
non-removable;
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&sdio0_bus4>, <&sdio0_cmd>, <&sdio0_clk>;
vmmc-supply = <&vbat_wl>;
......@@ -541,7 +539,6 @@ &sdmmc {
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>;
vmmc-supply = <&vcc_sd>;
......
arch/arm/boot/dts/rk3288-miqi.dts
View file @ ec6ca8e1
......@@ -126,7 +126,6 @@ &emmc {
cap-mmc-highspeed;
disable-wp;
non-removable;
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_pwr>, <&emmc_bus8>;
vmmc-supply = <&vcc_io>;
......@@ -404,7 +403,6 @@ &sdmmc {
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>;
vmmc-supply = <&vcc_sd>;
......
arch/arm/boot/dts/rk3288-phycore-rdk.dts
View file @ ec6ca8e1
......@@ -263,7 +263,6 @@ &sdmmc {
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>;
vmmc-supply = <&vdd_io_sd>;
......
arch/arm/boot/dts/rk3288-phycore-som.dtsi
View file @ ec6ca8e1
......@@ -136,7 +136,6 @@ &emmc {
cap-mmc-highspeed;
disable-wp;
non-removable;
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
vmmc-supply = <&vdd_3v3_io>;
......
arch/arm/boot/dts/rk3288-popmetal.dts
View file @ ec6ca8e1
......@@ -150,7 +150,6 @@ &emmc {
mmc-ddr-1_8v;
mmc-hs200-1_8v;
non-removable;
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
vmmc-supply = <&vcc_io>;
......@@ -164,7 +163,6 @@ &sdmmc {
cap-sd-highspeed;
card-detect-delay = <200>;
disable-wp; /* wp not hooked up */
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
sd-uhs-sdr12;
......
arch/arm/boot/dts/rk3288-r89.dts
View file @ ec6ca8e1
......@@ -354,7 +354,6 @@ &sdmmc {
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>;
vmmc-supply = <&vcc_sdmmc>;
......
arch/arm/boot/dts/rk3288-rock2-som.dtsi
View file @ ec6ca8e1
......@@ -89,7 +89,6 @@ &emmc {
cap-mmc-highspeed;
disable-wp;
non-removable;
num-slots = <1>;
mmc-pwrseq = <&emmc_pwrseq>;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
......
arch/arm/boot/dts/rk3288-rock2-square.dts
View file @ ec6ca8e1
......@@ -147,7 +147,6 @@ &sdio0 {
disable-wp;
mmc-pwrseq = <&sdio_pwrseq>;
non-removable;
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk &sdio0_int>;
vmmc-supply = <&vcc_io>;
......@@ -161,7 +160,6 @@ &sdmmc {
cap-sd-highspeed;
card-detect-delay = <200>;
disable-wp; /* wp not hooked up */
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
vmmc-supply = <&vcc_sd>;
......
arch/arm/boot/dts/rk3288-tinker.dts
View file @ ec6ca8e1
......@@ -470,7 +470,6 @@ &sdmmc {
cap-sd-highspeed;
card-detect-delay = <200>;
disable-wp; /* wp not hooked up */
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
status = "okay";
......
arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
View file @ ec6ca8e1
......@@ -117,7 +117,6 @@ &sdmmc {
card-detect-delay = <200>;
cd-gpios = <&gpio7 RK_PA5 GPIO_ACTIVE_LOW>;
rockchip,default-sample-phase = <90>;
num-slots = <1>;
sd-uhs-sdr12;
sd-uhs-sdr25;
sd-uhs-sdr50;
......
arch/arm/boot/dts/rk3288-veyron.dtsi
View file @ ec6ca8e1
......@@ -156,7 +156,6 @@ &emmc {
mmc-hs200-1_8v;
mmc-pwrseq = <&emmc_pwrseq>;
non-removable;
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
};
......@@ -372,7 +371,6 @@ &sdio0 {
keep-power-in-suspend;
mmc-pwrseq = <&sdio_pwrseq>;
non-removable;
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&sdio0_clk &sdio0_cmd &sdio0_bus4>;
sd-uhs-sdr12;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7