From: FUKAUMI Naoki <naoki@radxa.com>
To: heiko@sntech.de
Cc: robh@kernel.org, conor+dt@kernel.org, inindev@gmail.com,
devicetree@vger.kernel.org, sebastian.reichel@collabora.com,
linux-rockchip@lists.infradead.org, alchark@gmail.com,
FUKAUMI Naoki <naoki@radxa.com>,
krzk+dt@kernel.org, dsimic@manjaro.org
Subject: [PATCH v2 2/4] arm64: dts: rockchip: sort nodes in root node for Radxa ROCK 5B
Date: Mon, 2 Dec 2024 02:32:25 +0000 [thread overview]
Message-ID: <20241202023227.2671-3-naoki@radxa.com> (raw)
In-Reply-To: <20241202023227.2671-1-naoki@radxa.com>
sort alphanumerically.
Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
Changes in v2:
- none
---
.../boot/dts/rockchip/rk3588-rock-5b.dts | 42 +++++++++----------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index 08f5efeeac9c..c816febb486a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -91,30 +91,30 @@ typec_vin: regulator-typec-vin {
regulator-boot-on;
};
- vcc3v3_wf: regulator-vcc3v3-wf {
+ /* pi6c pcie clock generator */
+ vcc3v3_pi6c_05: vcc3v3_pcie30: regulator-vcc3v3-pi6c-05 {
compatible = "regulator-fixed";
enable-active-high;
- gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
+ gpios = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
- pinctrl-0 = <&ekey_en>;
- regulator-name = "vcc3v3_wf";
+ pinctrl-0 = <&pcie30x4_pwren_h>;
+ regulator-name = "vcc3v3_pi6c_05";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- startup-delay-us = <50000>;
+ startup-delay-us = <5000>;
vin-supply = <&vcc5v0_sys>;
};
- /* pi6c pcie clock generator */
- vcc3v3_pi6c_05: vcc3v3_pcie30: regulator-vcc3v3-pi6c-05 {
+ vcc3v3_wf: regulator-vcc3v3-wf {
compatible = "regulator-fixed";
enable-active-high;
- gpios = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
+ gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
- pinctrl-0 = <&pcie30x4_pwren_h>;
- regulator-name = "vcc3v3_pi6c_05";
+ pinctrl-0 = <&ekey_en>;
+ regulator-name = "vcc3v3_wf";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- startup-delay-us = <5000>;
+ startup-delay-us = <50000>;
vin-supply = <&vcc5v0_sys>;
};
@@ -128,6 +128,16 @@ vcc4v0_sys: regulator-vcc4v0-sys {
vin-supply = <&vcc5v0_sys>;
};
+ vcc5v0_sys: regulator-vcc5v0-sys {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc5v0_sys";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ vin-supply = <&typec_vin>;
+ };
+
vcc5v_usb: regulator-vcc5v-usb {
compatible = "regulator-fixed";
regulator-name = "vcc5v_usb";
@@ -140,16 +150,6 @@ vcc5v_usb: regulator-vcc5v-usb {
vin-supply = <&vcc5v0_sys>;
};
- vcc5v0_sys: regulator-vcc5v0-sys {
- compatible = "regulator-fixed";
- regulator-name = "vcc5v0_sys";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- vin-supply = <&typec_vin>;
- };
-
vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
compatible = "regulator-fixed";
regulator-name = "vcc_1v1_nldo_s3";
--
2.43.0
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2024-12-02 2:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-02 2:32 [PATCH v2 0/4] arm64: dts: rockchip: cosmetic changes for Radxa ROCK 5B FUKAUMI Naoki
2024-12-02 2:32 ` [PATCH v2 1/4] arm64: dts: rockchip: sort nodes in .dts " FUKAUMI Naoki
2024-12-02 2:32 ` FUKAUMI Naoki [this message]
2024-12-02 2:32 ` [PATCH v2 3/4] arm64: dts: rockchip: sort properties " FUKAUMI Naoki
2024-12-02 2:32 ` [PATCH v2 4/4] arm64: dts: rockchip: cosmetic changes " FUKAUMI Naoki
2024-12-02 3:06 ` [PATCH v2 0/4] " Dragan Simic
2024-12-02 3:58 ` FUKAUMI Naoki
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=20241202023227.2671-3-naoki@radxa.com \
--to=naoki@radxa.com \
--cc=alchark@gmail.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dsimic@manjaro.org \
--cc=heiko@sntech.de \
--cc=inindev@gmail.com \
--cc=krzk+dt@kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=robh@kernel.org \
--cc=sebastian.reichel@collabora.com \
/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;
as well as URLs for NNTP newsgroup(s).