Re: [PATCH v1 1/2] arm: rockchip: sync ROCK Pi 4 SoCs from Linux

[Kever Yang]

On 2023/7/20 00:33, Christopher Obbard wrote:

To prepare for ROCK 4 SE support, changes are needed to the common ROCK
Pi 4 devicetree to move the OPP from the common devicetree to individual
board devicetrees. Sync the Rockchip RK3399 ROCK Pi 4-related DTs from
Linux to gain from these changes.

Kernel tag: next-20230719
Kernel commits:
cfa12c32b96f ("arm64: dts: rockchip: correct wifi interrupt flag in Rock \
Pi 4B")
cee572756aa2 ("arm64: dts: rockchip: Disable HS400 for eMMC on ROCK Pi 4")
2bd1d2dd808c ("arm64: dts: rockchip: Disable HS400 for eMMC on ROCK 4C+")
fd2762a62646 ("arm64: dts: rockchip: Move OPP table from ROCK Pi 4 dtsi")

Signed-off-by: Christopher Obbard <chris.obb...@collabora.com>

Reviewed-by: Kever Yang <kever.y...@rock-chips.com>

Thanks,
- Kever

---

  arch/arm/dts/rk3399-rock-4c-plus.dts | 3 +--
  arch/arm/dts/rk3399-rock-pi-4.dtsi   | 5 ++---
  arch/arm/dts/rk3399-rock-pi-4a.dts   | 1 +
  arch/arm/dts/rk3399-rock-pi-4c.dts   | 1 +
  4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/dts/rk3399-rock-4c-plus.dts 
b/arch/arm/dts/rk3399-rock-4c-plus.dts
index 028eb508ae..8bfd5f88d1 100644
--- a/arch/arm/dts/rk3399-rock-4c-plus.dts
+++ b/arch/arm/dts/rk3399-rock-4c-plus.dts
@@ -548,9 +548,8 @@
  &sdhci {
        max-frequency = <150000000>;
        bus-width = <8>;
-       mmc-hs400-1_8v;
+       mmc-hs200-1_8v;
        non-removable;
-       mmc-hs400-enhanced-strobe;
        status = "okay";
  };

diff --git a/arch/arm/dts/rk3399-rock-pi-4.dtsi b/arch/arm/dts/rk3399-rock-pi-4.dtsi

index 907071d4fe..b1b7f4ffb1 100644
--- a/arch/arm/dts/rk3399-rock-pi-4.dtsi
+++ b/arch/arm/dts/rk3399-rock-pi-4.dtsi
@@ -9,7 +9,6 @@
  #include <dt-bindings/leds/common.h>
  #include <dt-bindings/pwm/pwm.h>
  #include "rk3399.dtsi"
-#include "rk3399-opp.dtsi"

/ {

        aliases {
@@ -645,9 +644,9 @@
  };

&sdhci {

+       max-frequency = <150000000>;
        bus-width = <8>;
-       mmc-hs400-1_8v;
-       mmc-hs400-enhanced-strobe;
+       mmc-hs200-1_8v;
        non-removable;
        status = "okay";
  };
diff --git a/arch/arm/dts/rk3399-rock-pi-4a.dts 
b/arch/arm/dts/rk3399-rock-pi-4a.dts
index 89f2af5e11..931334aa3d 100644
--- a/arch/arm/dts/rk3399-rock-pi-4a.dts
+++ b/arch/arm/dts/rk3399-rock-pi-4a.dts
@@ -6,6 +6,7 @@

/dts-v1/;

  #include "rk3399-rock-pi-4.dtsi"
+#include "rk3399-opp.dtsi"

/ {

        model = "Radxa ROCK Pi 4A";
diff --git a/arch/arm/dts/rk3399-rock-pi-4c.dts 
b/arch/arm/dts/rk3399-rock-pi-4c.dts
index 4053ba7261..d32efab74e 100644
--- a/arch/arm/dts/rk3399-rock-pi-4c.dts
+++ b/arch/arm/dts/rk3399-rock-pi-4c.dts
@@ -7,6 +7,7 @@

/dts-v1/;

  #include "rk3399-rock-pi-4.dtsi"
+#include "rk3399-opp.dtsi"

/ {

        model = "Radxa ROCK Pi 4C";