From: FUKAUMI Naoki <naoki@radxa.com>
Date: Thu, 15 Aug 2024 22:37:13 +0000 (+0900)
Subject: arm: dts: rockchip: fix dts for Radxa ROCK 4C+
X-Git-Url: http://git.dujemihanovic.xyz/%22http:/www.sics.se/static/git-logo.png?a=commitdiff_plain;h=e59a6c55231042e048fb5c1a3505a814b72a74b1;p=u-boot.git

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+")
Suggested-by: Dragan Simic <dsimic@manjaro.org>
Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
---

diff --git a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi
index 5ec15a845c..50dae5cb5e 100644
--- a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi
@@ -1,8 +1,10 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+// SPDX-License-Identifier: GPL-2.0+
 /*
+ * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
  * 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>;
+};