rockchip: rk35xx: Remove use of eMMC DDR52 mode

Testing has shown that writing to eMMC using DDR52 mode does not seem to
work on RK356x and RK3588 boards.

A simple test of writing a single block to e.g. sector 0x4000 fails:

  # Rescan using DDR52 mode
  => mmc rescan 4

  # Write a single block to sector 0x4000 fails with ERROR
  => mmc write 20000000 4000 1

With the MMC_SPEED_MODE_SET Kconfig option enabled.

Fix this by removing the mmc-ddr-1_8v prop from sdhci nodes in affected
board u-boot.dtsi files.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi b/arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi
index 11976fd3a6e0d4ddd2d3970a523b999b38d15fa7..930d660868bbd75d4d8b8537c9e10269391dbdea 100644 (file)
--- a/arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi
+++ b/arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi
@@ -8,7 +8,6 @@
 
 &sdhci {
        cap-mmc-highspeed;
-       mmc-ddr-1_8v;
        pinctrl-names = "default";
        pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
 };

diff --git a/arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi b/arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi
index 8de9d1535efbbd7db4ae7b3aa03db28bb5d718af..c235b4357f7da29101204d3d521b1bac10182c5d 100644 (file)
--- a/arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi
+++ b/arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi
@@ -4,7 +4,6 @@
 
 &sdhci {
        cap-mmc-highspeed;
-       mmc-ddr-1_8v;
        pinctrl-names = "default";
        pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
 };

diff --git a/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi b/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi
index 158f652cb3b1e3e7276473d680d73a37461b6ed2..e0e501deccfe684731f9ce8fbe5ff6c0eeab31ed 100644 (file)
--- a/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi
+++ b/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi
@@ -7,5 +7,4 @@
 
 &sdhci {
        cap-mmc-highspeed;
-       mmc-ddr-1_8v;
 };

diff --git a/arch/arm/dts/rk3566-soquartz-u-boot.dtsi b/arch/arm/dts/rk3566-soquartz-u-boot.dtsi
index f65f4067f3e9a099aa311f70dff40838ee7060cc..5e46a2422d6009bad8f3c9ea138c37e212747ab8 100644 (file)
--- a/arch/arm/dts/rk3566-soquartz-u-boot.dtsi
+++ b/arch/arm/dts/rk3566-soquartz-u-boot.dtsi
@@ -4,7 +4,6 @@
 
 &sdhci {
        cap-mmc-highspeed;
-       mmc-ddr-1_8v;
        pinctrl-names = "default";
        pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
 };

diff --git a/arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi b/arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi
index a44ac35bdacd440ad4d4a0f245fbb3454d520e2a..1597473017ed8b492e012c647e3f6f06c1e703c2 100644 (file)
--- a/arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi
@@ -8,7 +8,6 @@
 
 &sdhci {
        cap-mmc-highspeed;
-       mmc-ddr-1_8v;
        mmc-hs400-1_8v;
        mmc-hs400-enhanced-strobe;
        pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;

diff --git a/arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi b/arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi
index 62f572c4cf9f8f9714c56f04d6ae972ccbf7d62d..64c43374c0424b469f6d458a845e4be838c79599 100644 (file)
--- a/arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi
@@ -14,7 +14,6 @@
 
 &sdhci {
        cap-mmc-highspeed;
-       mmc-ddr-1_8v;
        mmc-hs200-1_8v;
        mmc-hs400-1_8v;
        mmc-hs400-enhanced-strobe;

diff --git a/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi b/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
index ecba91aa30f522d7841edf205dd35da2e8632aa8..1fc71faa9e07d03a1a995354f4352fd5cea25799 100644 (file)
--- a/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
@@ -8,7 +8,6 @@
 
 &sdhci {
        cap-mmc-highspeed;
-       mmc-ddr-1_8v;
        mmc-hs200-1_8v;
        mmc-hs400-1_8v;
        mmc-hs400-enhanced-strobe;

diff --git a/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi b/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi
index caf524443079100802da47a0c614df556647f68f..74755a44eaee42bb74e94b904ecc2e0292c20099 100644 (file)
--- a/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi
@@ -16,7 +16,6 @@
 
 &sdhci {
        cap-mmc-highspeed;
-       mmc-ddr-1_8v;
        mmc-hs200-1_8v;
        mmc-hs400-1_8v;
        mmc-hs400-enhanced-strobe;

diff --git a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
index 46ebb77283f10d3614e75ee2f6ec8685b2d56e1f..5b823fcca5fbf8c71430b704e06b952d941780f5 100644 (file)
--- a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
@@ -20,7 +20,6 @@
 
 &sdhci {
        cap-mmc-highspeed;
-       mmc-ddr-1_8v;
        mmc-hs200-1_8v;
        mmc-hs400-1_8v;
        mmc-hs400-enhanced-strobe;

diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
index e99e60185ebebc61dc3f7e6b69e039cd78ad9930..9ee9dd051e32c412acec76b1f469c40b3d78c899 100644 (file)
--- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
@@ -31,7 +31,6 @@
 
 &sdhci {
        cap-mmc-highspeed;
-       mmc-ddr-1_8v;
        mmc-hs200-1_8v;
 };
 

diff --git a/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi b/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
index 471508a9ed7418b2cc19bceb0210de0608d73cfe..ca2a684f35415f24c56579c4f89bb59759413ac5 100644 (file)
--- a/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
@@ -8,7 +8,6 @@
 
 &sdhci {
        cap-mmc-highspeed;
-       mmc-ddr-1_8v;
        mmc-hs200-1_8v;
 };
 

diff --git a/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi b/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi
index 9a6a353088df0e9e2357ea9d334aac72eb472f99..efba0c359ba58e78c0db097e4ce28cd3e6c7cb04 100644 (file)
--- a/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi
@@ -7,6 +7,5 @@
 
 &sdhci {
        cap-mmc-highspeed;
-       mmc-ddr-1_8v;
        mmc-hs200-1_8v;
 };