Skip to contentSkip to conversation

arm: dts: rockchip: fix dts for Radxa ROCK 4C+

PATCH In review FUKAUMI Naoki 2 participants 2 messages Aug 15, 2024 – Oct 21, 2024 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 arm: dts: rockchip: fix dts for Radxa ROCK 4C+

ROCK Pi 4 series and ROCK 4C+ cannot share .dtsi file because 4C+ is different board.

add rk3399-rock-pi-4-u-boot.dtsi contents and remove dependency of it.

no functional change is intended.

Fixes 71a95e2efd30 ("arm: dts: rockchip: add Radxa ROCK 4C+")

---
Changes in v2:
- reword commit message

---
 arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi +14 -2
index 5ec15a845c1..50dae5cb5ef 100644
@@ -1,8 +1,10 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+// SPDX-License-Identifier: GPL-2.0+
 /*
+ * Copyright (C) 2019 Jagan Teki <[email protected]>
  * Copyright (c) 2023 Radxa Limited
  */
-#include "rk3399-rock-pi-4-u-boot.dtsi"
+#include "rk3399-u-boot.dtsi"
+#include "rk3399-sdram-lpddr4-100.dtsi"
 
 &pcfg_pull_none_18ma {
 	bootph-pre-ram;
@@ -14,6 +16,12 @@
 	bootph-some-ram;
 };
 
+&sdhci {
+	cap-mmc-highspeed;
+	mmc-ddr-1_8v;
+	mmc-hs200-1_8v;
+};
+
 &spi1 {
 	status = "okay";
 
@@ -25,3 +33,7 @@
 		spi-max-frequency = <10000000>;
 	};
 };
+
+&vdd_log {
+	regulator-init-microvolt = <950000>;
+};
Signature · 1 line
2.43.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 10 lines · FUKAUMI Naoki

ROCK Pi 4 series and ROCK 4C+ cannot share .dtsi file because 4C+ is different board.

add rk3399-rock-pi-4-u-boot.dtsi contents and remove dependency of it.

no functional change is intended.

Fixes 71a95e2efd30 ("arm: dts: rockchip: add Radxa ROCK 4C+")

Thanks,
- Kever

Quoted 45 lines

---
Changes in v2:
- reword commit message

---
  arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 16 ++++++++++++++--
  1 file changed, 14 insertions(+), 2 deletions(-)
arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi +14 -2
index 5ec15a845c1..50dae5cb5ef 100644
@@ -1,8 +1,10 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+// SPDX-License-Identifier: GPL-2.0+
  /*
+ * Copyright (C) 2019 Jagan Teki <[email protected]>
   * Copyright (c) 2023 Radxa Limited
   */
-#include "rk3399-rock-pi-4-u-boot.dtsi"
+#include "rk3399-u-boot.dtsi"
+#include "rk3399-sdram-lpddr4-100.dtsi"
 
  &pcfg_pull_none_18ma {
  	bootph-pre-ram;
@@ -14,6 +16,12 @@
  	bootph-some-ram;
  };
 
+&sdhci {
+	cap-mmc-highspeed;
+	mmc-ddr-1_8v;
+	mmc-hs200-1_8v;
+};
+
  &spi1 {
  	status = "okay";
 
@@ -25,3 +33,7 @@
  		spi-max-frequency = <10000000>;
  	};
  };
+
+&vdd_log {
+	regulator-init-microvolt = <950000>;
+};