From: Jagan Teki <jagan@amarulasolutions.com>
To: Kever Yang <kever.yang@rock-chips.com>
Cc: u-boot@lists.denx.de, linux-amarula@amarulasolutions.com,
Jagan Teki <jagan@amarulasolutions.com>
Subject: [PATCH 2/4] arm64: dts: rockchip: px30: Move dmc into -u-boot.dtsi
Date: Wed, 4 Aug 2021 14:35:49 +0530 [thread overview]
Message-ID: <20210804090551.90819-3-jagan@amarulasolutions.com> (raw)
In-Reply-To: <20210804090551.90819-1-jagan@amarulasolutions.com>
dmc node is specific to U-Boot, it is always better practice
to maintain U-Boot specific nodes into -u-boot.dtsi files
in order to maintain Linux dts file sync compatibility.
Move the dmc into px30-u-boot.dtsi, also add dmc node
explicitly in rk3326-odroid-go2-u-boot.dtsi since it is
using px30.dts.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
arch/arm/dts/px30-u-boot.dtsi | 10 ++++++----
arch/arm/dts/px30.dtsi | 5 -----
arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi | 10 ++++++----
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/arch/arm/dts/px30-u-boot.dtsi b/arch/arm/dts/px30-u-boot.dtsi
index 029c8fbd8d..bbed7dcde5 100644
--- a/arch/arm/dts/px30-u-boot.dtsi
+++ b/arch/arm/dts/px30-u-boot.dtsi
@@ -13,6 +13,12 @@
u-boot,spl-boot-order = &emmc, &sdmmc;
};
+ dmc {
+ u-boot,dm-pre-reloc;
+ compatible = "rockchip,px30-dmc", "syscon";
+ reg = <0x0 0xff2a0000 0x0 0x1000>;
+ };
+
rng: rng@ff0b0000 {
compatible = "rockchip,cryptov2-rng";
reg = <0x0 0xff0b0000 0x0 0x4000>;
@@ -20,10 +26,6 @@
};
};
-&dmc {
- u-boot,dm-pre-reloc;
-};
-
&uart2 {
clock-frequency = <24000000>;
u-boot,dm-pre-reloc;
diff --git a/arch/arm/dts/px30.dtsi b/arch/arm/dts/px30.dtsi
index b6c79e7ed3..e892d3b5a5 100644
--- a/arch/arm/dts/px30.dtsi
+++ b/arch/arm/dts/px30.dtsi
@@ -151,11 +151,6 @@
interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
};
- dmc: dmc {
- compatible = "rockchip,px30-dmc", "syscon";
- reg = <0x0 0xff2a0000 0x0 0x1000>;
- };
-
display_subsystem: display-subsystem {
compatible = "rockchip,display-subsystem";
ports = <&vopb_out>, <&vopl_out>;
diff --git a/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi b/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi
index 00767d2abd..93bc399087 100644
--- a/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi
+++ b/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi
@@ -7,13 +7,15 @@
chosen {
u-boot,spl-boot-order = &sdmmc;
};
-};
-&cru {
- u-boot,dm-pre-reloc;
+ dmc {
+ u-boot,dm-pre-reloc;
+ compatible = "rockchip,px30-dmc", "syscon";
+ reg = <0x0 0xff2a0000 0x0 0x1000>;
+ };
};
-&dmc {
+&cru {
u-boot,dm-pre-reloc;
};
--
2.25.1
next prev parent reply other threads:[~2021-08-04 9:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-04 9:05 [PATCH 0/4] arm64: dts: rockchip: px30: Linux-5.14-rc3 Sync Jagan Teki
2021-08-04 9:05 ` [PATCH 1/4] arm64: dts: rockchip: px30: Sync Linux PX30.Core files Jagan Teki
2021-08-04 9:05 ` Jagan Teki [this message]
2021-08-04 9:05 ` [PATCH 3/4] arm64: dts: rockchip: px30: Sync Linux-5.14-rc3 dts(i) Jagan Teki
2021-08-04 9:05 ` [PATCH 4/4] engicam: px30: Add Engicam PX30.Core C.TOUCH 2.0 10.1" OF Jagan Teki
2021-10-08 21:10 ` [PATCH 0/4] arm64: dts: rockchip: px30: Linux-5.14-rc3 Sync Jagan Teki
2021-10-09 14:52 ` Kever Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210804090551.90819-3-jagan@amarulasolutions.com \
--to=jagan@amarulasolutions.com \
--cc=kever.yang@rock-chips.com \
--cc=linux-amarula@amarulasolutions.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox