linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/6] arm64: dts: rockchip: rk3399-rock-4c-plus: connect vcca_1v8 to APIO5_VDD
@ 2022-09-09 19:50 FUKAUMI Naoki
  2022-09-09 19:50 ` [PATCH 2/6] arm64: dts: rockchip: rk3399-rock-4c-plus: fix regulator name FUKAUMI Naoki
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: FUKAUMI Naoki @ 2022-09-09 19:50 UTC (permalink / raw)
  To: heiko; +Cc: linux-arm-kernel, linux-rockchip, FUKAUMI Naoki

GPIO pins for LEDs on ROCK 4C+ are in APIO5

Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
 arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
index 3f01772c66ad..d7051b5d4904 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
@@ -427,6 +427,7 @@ &i2s2 {
 
 &io_domains {
 	bt656-supply = <&vcc_3v0>;
+	audio-supply = <&vcca_1v8>;
 	gpio1830-supply = <&vcc_3v0>;
 	sdmmc-supply = <&vccio_sd>;
 	status = "okay";
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/6] arm64: dts: rockchip: rk3399-rock-4c-plus: fix regulator name
  2022-09-09 19:50 [PATCH 1/6] arm64: dts: rockchip: rk3399-rock-4c-plus: connect vcca_1v8 to APIO5_VDD FUKAUMI Naoki
@ 2022-09-09 19:50 ` FUKAUMI Naoki
  2022-09-09 19:50 ` [PATCH 3/6] arm64: dts: rockchip: rk3399-rock-4c-plus: sort nodes/properties FUKAUMI Naoki
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: FUKAUMI Naoki @ 2022-09-09 19:50 UTC (permalink / raw)
  To: heiko; +Cc: linux-arm-kernel, linux-rockchip, FUKAUMI Naoki

fix regulator name.
also, add vcc_3v3 and vdd_log.

ref:
 https://dl.radxa.com/rockpi4/docs/hw/rockpi4/rockpi4c_plus_v12_sch_220304.pdf

Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
 .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 83 ++++++++++++-------
 1 file changed, 52 insertions(+), 31 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
index d7051b5d4904..c88a7512e296 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
@@ -61,6 +61,16 @@ led-1 {
 		};
 	};
 
+	vcc_3v3: vcc-3v3-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_3v3";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc3v3_sys>;
+	};
+
 	vcc5v0_sys: vcc5v0-sys-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc5v0_sys";
@@ -94,13 +104,24 @@ vcc5v0_typec: vcc5v0-typec-regulator {
 		vin-supply = <&vcc5v0_sys>;
 	};
 
-	vcc_lan: vcc3v3-phy-regulator {
+	vcc3v3_phy1: vcc3v3-phy1-regulator {
 		compatible = "regulator-fixed";
-		regulator-name = "vcc_lan";
+		regulator-name = "vcc3v3_phy1";
 		regulator-always-on;
 		regulator-boot-on;
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc_3v3>;
+	};
+
+	vdd_log: vdd-log-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vdd_log";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <950000>;
+		regulator-max-microvolt = <950000>;
+		vin-supply = <&vcc5v0_sys>;
 	};
 };
 
@@ -136,7 +157,7 @@ &gmac {
 	assigned-clocks = <&cru SCLK_RMII_SRC>;
 	assigned-clock-parents = <&clkin_gmac>;
 	clock_in_out = "input";
-	phy-supply = <&vcc_lan>;
+	phy-supply = <&vcc3v3_phy1>;
 	phy-mode = "rgmii";
 	pinctrl-names = "default";
 	pinctrl-0 = <&rgmii_pins>;
@@ -186,20 +207,20 @@ rk809: pmic@20 {
 		vcc2-supply = <&vcc5v0_sys>;
 		vcc3-supply = <&vcc5v0_sys>;
 		vcc4-supply = <&vcc5v0_sys>;
-		vcc5-supply = <&vcc_buck5>;
-		vcc6-supply = <&vcc_buck5>;
+		vcc5-supply = <&vcc_buck5_s3>;
+		vcc6-supply = <&vcc_buck5_s3>;
 		vcc7-supply = <&vcc5v0_sys>;
 		vcc8-supply = <&vcc3v3_sys>;
 		vcc9-supply = <&vcc5v0_sys>;
 
 		regulators {
-			vdd_log: DCDC_REG1 {
+			vdd_center: DCDC_REG1 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <750000>;
 				regulator-max-microvolt = <1350000>;
 				regulator-initial-mode = <0x2>;
-				regulator-name = "vdd_log";
+				regulator-name = "vdd_center";
 				regulator-state-mem {
 					regulator-off-in-suspend;
 					regulator-suspend-microvolt = <900000>;
@@ -242,59 +263,59 @@ regulator-state-mem {
 				};
 			};
 
-			vcc_buck5: DCDC_REG5 {
+			vcc_buck5_s3: DCDC_REG5 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <3300000>;
 				regulator-max-microvolt = <3300000>;
-				regulator-name = "vcc_buck5";
+				regulator-name = "vcc_buck5_s3";
 				regulator-state-mem {
 					regulator-on-in-suspend;
 					regulator-suspend-microvolt = <3300000>;
 				};
 			};
 
-			vcca_0v9: LDO_REG1 {
+			vcc_0v9_s3: LDO_REG1 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <900000>;
 				regulator-max-microvolt = <900000>;
-				regulator-name = "vcca_0v9";
+				regulator-name = "vcc_0v9_s3";
 				regulator-state-mem {
 					regulator-off-in-suspend;
 				};
 			};
 
-			vcc_1v8: LDO_REG2 {
+			vcc_1v8_s3: LDO_REG2 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <1800000>;
-				regulator-name = "vcc_1v8";
+				regulator-name = "vcc_1v8_s3";
 				regulator-state-mem {
 					regulator-on-in-suspend;
 					regulator-suspend-microvolt = <1800000>;
 				};
 			};
 
-			vcc0v9_soc: LDO_REG3 {
+			vcc_0v9_s0: LDO_REG3 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <900000>;
 				regulator-max-microvolt = <900000>;
-				regulator-name = "vcc0v9_soc";
+				regulator-name = "vcc_0v9_s0";
 				regulator-state-mem {
 					regulator-on-in-suspend;
 					regulator-suspend-microvolt = <900000>;
 				};
 			};
 
-			vcca_1v8: LDO_REG4 {
+			vcc_1v8_s0: LDO_REG4 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <1800000>;
-				regulator-name = "vcca_1v8";
+				regulator-name = "vcc_1v8_s0";
 				regulator-state-mem {
 					regulator-off-in-suspend;
 				};
@@ -311,34 +332,34 @@ regulator-state-mem {
 				};
 			};
 
-			vcc_1v5: LDO_REG6 {
+			vcc_1v5_s0: LDO_REG6 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <1500000>;
 				regulator-max-microvolt = <1500000>;
-				regulator-name = "vcc_1v5";
+				regulator-name = "vcc_1v5_s0";
 				regulator-state-mem {
 					regulator-off-in-suspend;
 				};
 			};
 
-			vcc_3v0: LDO_REG7 {
+			vcc_3v0_s0: LDO_REG7 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <3000000>;
 				regulator-max-microvolt = <3000000>;
-				regulator-name = "vcc_3v0";
+				regulator-name = "vcc_3v0_s0";
 				regulator-state-mem {
 					regulator-off-in-suspend;
 				};
 			};
 
-			vccio_sd: LDO_REG8 {
+			vcc_sdio_s0: LDO_REG8 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <3300000>;
-				regulator-name = "vccio_sd";
+				regulator-name = "vcc_sdio_s0";
 				regulator-state-mem {
 					regulator-off-in-suspend;
 				};
@@ -426,10 +447,10 @@ &i2s2 {
 };
 
 &io_domains {
-	bt656-supply = <&vcc_3v0>;
-	audio-supply = <&vcca_1v8>;
-	gpio1830-supply = <&vcc_3v0>;
-	sdmmc-supply = <&vccio_sd>;
+	bt656-supply = <&vcc_3v0_s0>;
+	audio-supply = <&vcc_1v8_s0>;
+	gpio1830-supply = <&vcc_3v0_s0>;
+	sdmmc-supply = <&vcc_sdio_s0>;
 	status = "okay";
 };
 
@@ -513,13 +534,13 @@ wifi_host_wake_l: wifi-host-wake-l {
 };
 
 &pmu_io_domains {
-	pmu1830-supply = <&vcc_3v0>;
+	pmu1830-supply = <&vcc_3v0_s0>;
 	status = "okay";
 };
 
 &saradc {
 	status = "okay";
-	vref-supply = <&vcc_1v8>;
+	vref-supply = <&vcc_1v8_s3>;
 };
 
 &sdhci {
@@ -566,7 +587,7 @@ &sdmmc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
 	cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
-	vqmmc-supply = <&vccio_sd>;
+	vqmmc-supply = <&vcc_sdio_s0>;
 	status = "okay";
 };
 
@@ -620,7 +641,7 @@ bluetooth {
 		pinctrl-names = "default";
 		pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
 		vbat-supply = <&vcc3v3_sys>;
-		vddio-supply = <&vcc_1v8>;
+		vddio-supply = <&vcc_1v8_s3>;
 	};
 };
 
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 3/6] arm64: dts: rockchip: rk3399-rock-4c-plus: sort nodes/properties
  2022-09-09 19:50 [PATCH 1/6] arm64: dts: rockchip: rk3399-rock-4c-plus: connect vcca_1v8 to APIO5_VDD FUKAUMI Naoki
  2022-09-09 19:50 ` [PATCH 2/6] arm64: dts: rockchip: rk3399-rock-4c-plus: fix regulator name FUKAUMI Naoki
@ 2022-09-09 19:50 ` FUKAUMI Naoki
  2022-09-09 19:50 ` [PATCH 4/6] arm64: dts: rockchip: rk3399-rock-4: fix regulator name FUKAUMI Naoki
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: FUKAUMI Naoki @ 2022-09-09 19:50 UTC (permalink / raw)
  To: heiko; +Cc: linux-arm-kernel, linux-rockchip, FUKAUMI Naoki

sort nodes/properties alphabetically

Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
 .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
index c88a7512e296..fdee9d7b2372 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
@@ -23,15 +23,6 @@ chosen {
 		stdout-path = "serial2:1500000n8";
 	};
 
-	sdio_pwrseq: sdio-pwrseq {
-		compatible = "mmc-pwrseq-simple";
-		clocks = <&rk809 1>;
-		clock-names = "ext_clock";
-		pinctrl-names = "default";
-		pinctrl-0 = <&wifi_enable_h>;
-		reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
-	};
-
 	clkin_gmac: external-gmac-clock {
 		compatible = "fixed-clock";
 		clock-frequency = <125000000>;
@@ -61,6 +52,15 @@ led-1 {
 		};
 	};
 
+	sdio_pwrseq: sdio-pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		clocks = <&rk809 1>;
+		clock-names = "ext_clock";
+		pinctrl-names = "default";
+		pinctrl-0 = <&wifi_enable_h>;
+		reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
+	};
+
 	vcc_3v3: vcc-3v3-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc_3v3";
@@ -71,13 +71,14 @@ vcc_3v3: vcc-3v3-regulator {
 		vin-supply = <&vcc3v3_sys>;
 	};
 
-	vcc5v0_sys: vcc5v0-sys-regulator {
+	vcc3v3_phy1: vcc3v3-phy1-regulator {
 		compatible = "regulator-fixed";
-		regulator-name = "vcc5v0_sys";
+		regulator-name = "vcc3v3_phy1";
 		regulator-always-on;
 		regulator-boot-on;
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc_3v3>;
 	};
 
 	vcc5v0_host1: vcc5v0-host-regulator {
@@ -92,6 +93,15 @@ vcc5v0_host1: vcc5v0-host-regulator {
 		vin-supply = <&vcc5v0_host0_s0>;
 	};
 
+	vcc5v0_sys: vcc5v0-sys-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+	};
+
 	vcc5v0_typec: vcc5v0-typec-regulator {
 		compatible = "regulator-fixed";
 		enable-active-high;
@@ -104,16 +114,6 @@ vcc5v0_typec: vcc5v0-typec-regulator {
 		vin-supply = <&vcc5v0_sys>;
 	};
 
-	vcc3v3_phy1: vcc3v3-phy1-regulator {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc3v3_phy1";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		vin-supply = <&vcc_3v3>;
-	};
-
 	vdd_log: vdd-log-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "vdd_log";
@@ -447,8 +447,8 @@ &i2s2 {
 };
 
 &io_domains {
-	bt656-supply = <&vcc_3v0_s0>;
 	audio-supply = <&vcc_1v8_s0>;
+	bt656-supply = <&vcc_3v0_s0>;
 	gpio1830-supply = <&vcc_3v0_s0>;
 	sdmmc-supply = <&vcc_sdio_s0>;
 	status = "okay";
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 4/6] arm64: dts: rockchip: rk3399-rock-4: fix regulator name
  2022-09-09 19:50 [PATCH 1/6] arm64: dts: rockchip: rk3399-rock-4c-plus: connect vcca_1v8 to APIO5_VDD FUKAUMI Naoki
  2022-09-09 19:50 ` [PATCH 2/6] arm64: dts: rockchip: rk3399-rock-4c-plus: fix regulator name FUKAUMI Naoki
  2022-09-09 19:50 ` [PATCH 3/6] arm64: dts: rockchip: rk3399-rock-4c-plus: sort nodes/properties FUKAUMI Naoki
@ 2022-09-09 19:50 ` FUKAUMI Naoki
  2022-09-09 19:50 ` [PATCH 5/6] arm64: dts: rockchip: rk3399-rock-4: sort nodes/properties FUKAUMI Naoki
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: FUKAUMI Naoki @ 2022-09-09 19:50 UTC (permalink / raw)
  To: heiko; +Cc: linux-arm-kernel, linux-rockchip, FUKAUMI Naoki

fix regulator name

ref:
 https://dl.radxa.com/rockpi4/docs/hw/rockpi4/rockpi4_v13_sch_20181112.pdf

Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
 .../boot/dts/rockchip/rk3399-rock-pi-4.dtsi   | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
index 6464a6729729..bb1dcf319b02 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
@@ -136,24 +136,25 @@ vcc5v0_host: vcc5v0-host-regulator {
 		vin-supply = <&vcc5v0_sys>;
 	};
 
-	vcc5v0_typec: vcc5v0-typec-regulator {
+	vbus_typec: vbus-typec-regulator {
 		compatible = "regulator-fixed";
 		enable-active-high;
 		gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&vcc5v0_typec_en>;
-		regulator-name = "vcc5v0_typec";
+		regulator-name = "vbus_typec";
 		regulator-always-on;
 		vin-supply = <&vcc5v0_sys>;
 	};
 
-	vcc_lan: vcc3v3-phy-regulator {
+	vcc3v3_lan: vcc3v3-lan-regulator {
 		compatible = "regulator-fixed";
-		regulator-name = "vcc_lan";
+		regulator-name = "vcc3v3_lan";
 		regulator-always-on;
 		regulator-boot-on;
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc3v3_sys>;
 	};
 
 	vdd_log: vdd-log {
@@ -200,7 +201,7 @@ &gmac {
 	assigned-clocks = <&cru SCLK_RMII_SRC>;
 	assigned-clock-parents = <&clkin_gmac>;
 	clock_in_out = "input";
-	phy-supply = <&vcc_lan>;
+	phy-supply = <&vcc3v3_lan>;
 	phy-mode = "rgmii";
 	pinctrl-names = "default";
 	pinctrl-0 = <&rgmii_pins>;
@@ -305,8 +306,8 @@ regulator-state-mem {
 				};
 			};
 
-			vcc1v8_codec: LDO_REG1 {
-				regulator-name = "vcc1v8_codec";
+			vcca1v8_codec: LDO_REG1 {
+				regulator-name = "vcca1v8_codec";
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <1800000>;
@@ -316,8 +317,8 @@ regulator-state-mem {
 				};
 			};
 
-			vcc1v8_hdmi: LDO_REG2 {
-				regulator-name = "vcc1v8_hdmi";
+			vcca1v8_hdmi: LDO_REG2 {
+				regulator-name = "vcca1v8_hdmi";
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <1800000>;
@@ -374,8 +375,8 @@ regulator-state-mem {
 				};
 			};
 
-			vcc0v9_hdmi: LDO_REG7 {
-				regulator-name = "vcc0v9_hdmi";
+			vcca0v9_hdmi: LDO_REG7 {
+				regulator-name = "vcca0v9_hdmi";
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <900000>;
@@ -517,7 +518,7 @@ &io_domains {
 	status = "okay";
 
 	bt656-supply = <&vcc_3v0>;
-	audio-supply = <&vcc1v8_codec>;
+	audio-supply = <&vcca1v8_codec>;
 	sdmmc-supply = <&vcc_sdio>;
 	gpio1830-supply = <&vcc_3v0>;
 };
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 5/6] arm64: dts: rockchip: rk3399-rock-4: sort nodes/properties
  2022-09-09 19:50 [PATCH 1/6] arm64: dts: rockchip: rk3399-rock-4c-plus: connect vcca_1v8 to APIO5_VDD FUKAUMI Naoki
                   ` (2 preceding siblings ...)
  2022-09-09 19:50 ` [PATCH 4/6] arm64: dts: rockchip: rk3399-rock-4: fix regulator name FUKAUMI Naoki
@ 2022-09-09 19:50 ` FUKAUMI Naoki
  2022-09-09 19:50 ` [PATCH 6/6] arm64: dts: rockchip: add avdd-0v9-supply and avdd-1v8-supply FUKAUMI Naoki
  2022-09-23 13:54 ` [PATCH 1/6] arm64: dts: rockchip: rk3399-rock-4c-plus: connect vcca_1v8 to APIO5_VDD Heiko Stuebner
  5 siblings, 0 replies; 7+ messages in thread
From: FUKAUMI Naoki @ 2022-09-09 19:50 UTC (permalink / raw)
  To: heiko; +Cc: linux-arm-kernel, linux-rockchip, FUKAUMI Naoki

sort nodes/properties alphabetically

Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
 .../boot/dts/rockchip/rk3399-rock-pi-4.dtsi   | 124 +++++++++---------
 1 file changed, 61 insertions(+), 63 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
index bb1dcf319b02..485277f7ed17 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
@@ -74,32 +74,33 @@ dit_p0_0: endpoint {
 		};
 	};
 
-	vcc12v_dcin: dc-12v {
+	vbus_typec: vbus-typec-regulator {
 		compatible = "regulator-fixed";
-		regulator-name = "vcc12v_dcin";
+		enable-active-high;
+		gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&vcc5v0_typec_en>;
+		regulator-name = "vbus_typec";
 		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <12000000>;
-		regulator-max-microvolt = <12000000>;
+		vin-supply = <&vcc5v0_sys>;
 	};
 
-	vcc5v0_sys: vcc-sys {
+	vcc12v_dcin: dc-12v {
 		compatible = "regulator-fixed";
-		regulator-name = "vcc5v0_sys";
+		regulator-name = "vcc12v_dcin";
 		regulator-always-on;
 		regulator-boot-on;
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		vin-supply = <&vcc12v_dcin>;
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
 	};
 
-	vcc_0v9: vcc-0v9 {
+	vcc3v3_lan: vcc3v3-lan-regulator {
 		compatible = "regulator-fixed";
-		regulator-name = "vcc_0v9";
+		regulator-name = "vcc3v3_lan";
 		regulator-always-on;
 		regulator-boot-on;
-		regulator-min-microvolt = <900000>;
-		regulator-max-microvolt = <900000>;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
 		vin-supply = <&vcc3v3_sys>;
 	};
 
@@ -136,24 +137,23 @@ vcc5v0_host: vcc5v0-host-regulator {
 		vin-supply = <&vcc5v0_sys>;
 	};
 
-	vbus_typec: vbus-typec-regulator {
+	vcc5v0_sys: vcc-sys {
 		compatible = "regulator-fixed";
-		enable-active-high;
-		gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&vcc5v0_typec_en>;
-		regulator-name = "vbus_typec";
+		regulator-name = "vcc5v0_sys";
 		regulator-always-on;
-		vin-supply = <&vcc5v0_sys>;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc12v_dcin>;
 	};
 
-	vcc3v3_lan: vcc3v3-lan-regulator {
+	vcc_0v9: vcc-0v9 {
 		compatible = "regulator-fixed";
-		regulator-name = "vcc3v3_lan";
+		regulator-name = "vcc_0v9";
 		regulator-always-on;
 		regulator-boot-on;
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
+		regulator-min-microvolt = <900000>;
+		regulator-max-microvolt = <900000>;
 		vin-supply = <&vcc3v3_sys>;
 	};
 
@@ -515,21 +515,10 @@ &i2s2 {
 };
 
 &io_domains {
-	status = "okay";
-
-	bt656-supply = <&vcc_3v0>;
 	audio-supply = <&vcca1v8_codec>;
-	sdmmc-supply = <&vcc_sdio>;
+	bt656-supply = <&vcc_3v0>;
 	gpio1830-supply = <&vcc_3v0>;
-};
-
-&pmu_io_domains {
-	status = "okay";
-
-	pmu1830-supply = <&vcc_3v0>;
-};
-
-&pcie_phy {
+	sdmmc-supply = <&vcc_sdio>;
 	status = "okay";
 };
 
@@ -544,6 +533,10 @@ &pcie0 {
 	status = "okay";
 };
 
+&pcie_phy {
+	status = "okay";
+};
+
 &pinctrl {
 	bt {
 		bt_enable_h: bt-enable-h {
@@ -581,6 +574,20 @@ pcie_pwr_en: pcie-pwr-en {
 		};
 	};
 
+	pmic {
+		pmic_int_l: pmic-int-l {
+			rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		vsel1_pin: vsel1-pin {
+			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+
+		vsel2_pin: vsel2-pin {
+			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+	};
+
 	sdio0 {
 		sdio0_bus4: sdio0-bus4 {
 			rockchip,pins = <2 RK_PC4 1 &pcfg_pull_up_20ma>,
@@ -598,20 +605,6 @@ sdio0_clk: sdio0-clk {
 		};
 	};
 
-	pmic {
-		pmic_int_l: pmic-int-l {
-			rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
-		};
-
-		vsel1_pin: vsel1-pin {
-			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
-		};
-
-		vsel2_pin: vsel2-pin {
-			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
-		};
-	};
-
 	usb-typec {
 		vcc5v0_typec_en: vcc5v0-typec-en {
 			rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
@@ -635,6 +628,11 @@ wifi_host_wake_l: wifi-host-wake-l {
 	};
 };
 
+&pmu_io_domains {
+	pmu1830-supply = <&vcc_3v0>;
+	status = "okay";
+};
+
 &pwm2 {
 	status = "okay";
 };
@@ -645,6 +643,14 @@ &saradc {
 	vref-supply = <&vcc_1v8>;
 };
 
+&sdhci {
+	bus-width = <8>;
+	mmc-hs400-1_8v;
+	mmc-hs400-enhanced-strobe;
+	non-removable;
+	status = "okay";
+};
+
 &sdio0 {
 	#address-cells = <1>;
 	#size-cells = <0>;
@@ -672,14 +678,6 @@ &sdmmc {
 	status = "okay";
 };
 
-&sdhci {
-	bus-width = <8>;
-	mmc-hs400-1_8v;
-	mmc-hs400-enhanced-strobe;
-	non-removable;
-	status = "okay";
-};
-
 &spdif {
 
 	spdif_p0: port {
@@ -761,13 +759,13 @@ &usbdrd3_0 {
 	status = "okay";
 };
 
-&usbdrd_dwc3_0 {
+&usbdrd3_1 {
 	status = "okay";
-	dr_mode = "host";
 };
 
-&usbdrd3_1 {
+&usbdrd_dwc3_0 {
 	status = "okay";
+	dr_mode = "host";
 };
 
 &usbdrd_dwc3_1 {
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 6/6] arm64: dts: rockchip: add avdd-0v9-supply and avdd-1v8-supply
  2022-09-09 19:50 [PATCH 1/6] arm64: dts: rockchip: rk3399-rock-4c-plus: connect vcca_1v8 to APIO5_VDD FUKAUMI Naoki
                   ` (3 preceding siblings ...)
  2022-09-09 19:50 ` [PATCH 5/6] arm64: dts: rockchip: rk3399-rock-4: sort nodes/properties FUKAUMI Naoki
@ 2022-09-09 19:50 ` FUKAUMI Naoki
  2022-09-23 13:54 ` [PATCH 1/6] arm64: dts: rockchip: rk3399-rock-4c-plus: connect vcca_1v8 to APIO5_VDD Heiko Stuebner
  5 siblings, 0 replies; 7+ messages in thread
From: FUKAUMI Naoki @ 2022-09-09 19:50 UTC (permalink / raw)
  To: heiko; +Cc: linux-arm-kernel, linux-rockchip, FUKAUMI Naoki

this patch adds avdd-0v9-supply and avdd-1v8-supply to hdmi node for
Radxa ROCK 4 series.

Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
 arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts | 2 ++
 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
index fdee9d7b2372..f9884902f874 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
@@ -175,6 +175,8 @@ &gpu {
 };
 
 &hdmi {
+	avdd-0v9-supply = <&vcc_0v9_s0>;
+	avdd-1v8-supply = <&vcc_1v8_s0>;
 	ddc-i2c-bus = <&i2c3>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&hdmi_cec>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
index 485277f7ed17..645ced6617a6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
@@ -219,6 +219,8 @@ &gpu {
 };
 
 &hdmi {
+	avdd-0v9-supply = <&vcca0v9_hdmi>;
+	avdd-1v8-supply = <&vcca1v8_hdmi>;
 	ddc-i2c-bus = <&i2c3>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&hdmi_cec>;
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/6] arm64: dts: rockchip: rk3399-rock-4c-plus: connect vcca_1v8 to APIO5_VDD
  2022-09-09 19:50 [PATCH 1/6] arm64: dts: rockchip: rk3399-rock-4c-plus: connect vcca_1v8 to APIO5_VDD FUKAUMI Naoki
                   ` (4 preceding siblings ...)
  2022-09-09 19:50 ` [PATCH 6/6] arm64: dts: rockchip: add avdd-0v9-supply and avdd-1v8-supply FUKAUMI Naoki
@ 2022-09-23 13:54 ` Heiko Stuebner
  5 siblings, 0 replies; 7+ messages in thread
From: Heiko Stuebner @ 2022-09-23 13:54 UTC (permalink / raw)
  To: FUKAUMI Naoki; +Cc: Heiko Stuebner, linux-rockchip, linux-arm-kernel

On Fri, 9 Sep 2022 19:50:01 +0000, FUKAUMI Naoki wrote:
> GPIO pins for LEDs on ROCK 4C+ are in APIO5

Applied, thanks!

[1/6] arm64: dts: rockchip: rk3399-rock-4c-plus: connect vcca_1v8 to APIO5_VDD
      commit: 110a1f0eea148a4c444e2327483e0e765d26704e
[2/6] arm64: dts: rockchip: rk3399-rock-4c-plus: fix regulator name
      commit: a088c855acb85ab52fdbffd9b3473f6c9a3f0b35
[3/6] arm64: dts: rockchip: rk3399-rock-4c-plus: sort nodes/properties
      commit: b153f26d2c557ca49b5f98d256b3e44bc37244cd
[4/6] arm64: dts: rockchip: rk3399-rock-4: fix regulator name
      commit: 69448624b770aa88a71536a16900dd3cc6002919
[5/6] arm64: dts: rockchip: rk3399-rock-4: sort nodes/properties
      commit: 06c5b5690a578514b3fe8f11a47a3c37d3af3696
[6/6] arm64: dts: rockchip: add avdd-0v9-supply and avdd-1v8-supply
      commit: b6047ba2caaca41da8706c66c55f7b34e0714e21

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2022-09-23 13:55 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-09 19:50 [PATCH 1/6] arm64: dts: rockchip: rk3399-rock-4c-plus: connect vcca_1v8 to APIO5_VDD FUKAUMI Naoki
2022-09-09 19:50 ` [PATCH 2/6] arm64: dts: rockchip: rk3399-rock-4c-plus: fix regulator name FUKAUMI Naoki
2022-09-09 19:50 ` [PATCH 3/6] arm64: dts: rockchip: rk3399-rock-4c-plus: sort nodes/properties FUKAUMI Naoki
2022-09-09 19:50 ` [PATCH 4/6] arm64: dts: rockchip: rk3399-rock-4: fix regulator name FUKAUMI Naoki
2022-09-09 19:50 ` [PATCH 5/6] arm64: dts: rockchip: rk3399-rock-4: sort nodes/properties FUKAUMI Naoki
2022-09-09 19:50 ` [PATCH 6/6] arm64: dts: rockchip: add avdd-0v9-supply and avdd-1v8-supply FUKAUMI Naoki
2022-09-23 13:54 ` [PATCH 1/6] arm64: dts: rockchip: rk3399-rock-4c-plus: connect vcca_1v8 to APIO5_VDD Heiko Stuebner

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).