arm64: dts: rockchip: clean up the abuse of disable-wp

The mmc.txt didn't explicitly say disable-wp is for SD card slot
only, but that is what it was designed for in the first place.

Remove all disable-wp from emmc or sdio controller.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
index 4de089149c504940b94c4cc450eb0710d54d9a80..e96eb62f362ba3c3cdd1fae15dfac4ec3f7606b9 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
@@ -116,7 +116,6 @@ vcc_sys: vcc-sys-regulator {
 &emmc {
        bus-width = <8>;
        cap-mmc-highspeed;
-       disable-wp;
        mmc-pwrseq = <&emmc_pwrseq>;
        non-removable;
        pinctrl-names = "default";

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
index 6b9b1ac1994c3512c07b6ab28b20d88a3538de71..8fa550cbd1a4a5498008da976deffee2b6d9230b 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
@@ -78,7 +78,6 @@ &emmc {
        bus-width = <8>;
        cap-mmc-highspeed;
        clock-frequency = <150000000>;
-       disable-wp;
        non-removable;
        vmmc-supply = <&vcc_io>;
        vqmmc-supply = <&vcc18_flash>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
index 1315972412df39e5268a91299b0f4226a380b431..1b35d612b66053ed96043f0837e894c2d8b333d5 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
@@ -139,7 +139,6 @@ &cpu_b3 {
 &emmc {
        bus-width = <8>;
        clock-frequency = <150000000>;
-       disable-wp;
        mmc-hs200-1_8v;
        non-removable;
        vmmc-supply = <&vcc33_io>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
index 96147d93dd1da3b4b43066d763ac47ae80150d8d..f5aa3cad67c5c22b826009930368fff37dba25f7 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
@@ -161,7 +161,6 @@ vdd_10: vdd-10-regulator {
 &emmc {
        bus-width = <8>;
        cap-mmc-highspeed;
-       disable-wp;
        mmc-pwrseq = <&emmc_pwrseq>;
        mmc-hs200-1_2v;
        mmc-hs200-1_8v;

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
index fc1bf078a41f6bd4b6e5ac76c85f01642d7d89a4..41edcfd531843b4cfa8de248c55fa5801fbde34b 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
@@ -48,7 +48,6 @@ &emmc {
        bus-width = <8>;
        cap-mmc-highspeed;
        clock-frequency = <150000000>;
-       disable-wp;
        mmc-hs200-1_8v;
        no-sdio;
        no-sd;

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
index 7452bedf1a7e18be83e589084250a92d83c1ba6b..d34064c65f10721115925108cc827315e3b412c3 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
@@ -149,7 +149,6 @@ vdd_10: vdd-10-regulator {
 &emmc {
        bus-width = <8>;
        cap-mmc-highspeed;
-       disable-wp;
        mmc-pwrseq = <&emmc_pwrseq>;
        non-removable;
        pinctrl-names = "default";

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
index 2d304d2df62e1b388e7b9f1ed9ff5b3a7efeee08..cf6cc4e7d315ea8b612e31998de19e3f36eb6e4d 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
@@ -553,7 +553,6 @@ &sdio0 {
        bus-width = <4>;
        cap-sd-highspeed;
        cap-sdio-irq;
-       disable-wp;
        keep-power-in-suspend;
        mmc-pwrseq = <&sdio_pwrseq>;
        non-removable;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
index 0b8f1edbd746b5ce0359e60f8279ca11b6633322..d5abf7d90f915c02f201dd2e0daa8653df1a948c 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
@@ -219,7 +219,6 @@ &sdio0 {
        cap-sd-highspeed;
        cap-sdio-irq;
        clock-frequency = <50000000>;
-       disable-wp;
        keep-power-in-suspend;
        max-frequency = <50000000>;
        mmc-pwrseq = <&sdio_pwrseq>;