[PATCH] arm64: dts: rockchip: convert rk3562 to their dt-binding constants

Heiko Stuebner heiko at sntech.de
Sat May 10 09:15:31 PDT 2025


Now that the binding head has been merged, convert the power-domain ids
back to these constants for easier handling.

Signed-off-by: Heiko Stuebner <heiko at sntech.de>
---
 arch/arm64/boot/dts/rockchip/rk3562.dtsi | 37 ++++++++++++------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3562.dtsi b/arch/arm64/boot/dts/rockchip/rk3562.dtsi
index 0156f969c4bc..412ecad79b0d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3562.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3562.dtsi
@@ -7,6 +7,7 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/phy/phy.h>
+#include <dt-bindings/power/rockchip,rk3562-power.h>
 #include <dt-bindings/pinctrl/rockchip.h>
 #include <dt-bindings/reset/rockchip,rk3562-cru.h>
 #include <dt-bindings/soc/rockchip,boot-mode.h>
@@ -546,48 +547,48 @@ power: power-controller {
 				#size-cells = <0>;
 				status = "okay";
 
-				power-domain at 8 {
-					reg = <8>;
+				power-domain at RK3562_PD_GPU {
+					reg = <RK3562_PD_GPU>;
 					pm_qos = <&qos_gpu>;
 					#power-domain-cells = <0>;
 				};
 
-				power-domain at 7 {
-					reg = <7>;
+				power-domain at RK3562_PD_NPU {
+					reg = <RK3562_PD_NPU>;
 					pm_qos = <&qos_npu>;
 					#power-domain-cells = <0>;
 				};
 
-				power-domain at 11 {
-					reg = <11>;
+				power-domain at RK3562_PD_VDPU {
+					reg = <RK3562_PD_VDPU>;
 					pm_qos = <&qos_rkvdec>;
 					#power-domain-cells = <0>;
 				};
 
-				power-domain at 12 {
-					reg = <12>;
+				power-domain at RK3562_PD_VI {
+					reg = <RK3562_PD_VI>;
 					#power-domain-cells = <1>;
 					#address-cells = <1>;
 					#size-cells = <0>;
 					pm_qos = <&qos_isp>,
 						 <&qos_vicap>;
 
-					power-domain at 10 {
-						reg = <10>;
+					power-domain at RK3562_PD_VEPU {
+						reg = <RK3562_PD_VEPU>;
 						pm_qos = <&qos_vepu>;
 					#power-domain-cells = <0>;
 					};
 				};
 
-				power-domain at 13 {
-					reg = <13>;
+				power-domain at RK3562_PD_VO {
+					reg = <RK3562_PD_VO>;
 					#power-domain-cells = <1>;
 					#address-cells = <1>;
 					#size-cells = <0>;
 					pm_qos = <&qos_vop>;
 
-					power-domain at 14 {
-						reg = <14>;
+					power-domain at RK3562_PD_RGA {
+						reg = <RK3562_PD_RGA>;
 						pm_qos = <&qos_rga_rd>,
 							 <&qos_rga_wr>,
 							 <&qos_jpeg>;
@@ -595,8 +596,8 @@ power-domain at 14 {
 					};
 				};
 
-				power-domain at 15 {
-					reg = <15>;
+				power-domain at RK3562_PD_PHP {
+					reg = <RK3562_PD_PHP>;
 					pm_qos = <&qos_pcie>,
 						 <&qos_usb3>;
 					#power-domain-cells = <0>;
@@ -616,7 +617,7 @@ gpu: gpu at ff320000 {
 				     <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "job", "mmu", "gpu";
 			operating-points-v2 = <&gpu_opp_table>;
-			power-domains = <&power 8>;
+			power-domains = <&power RK3562_PD_GPU>;
 			#cooling-cells = <2>;
 			status = "disabled";
 		};
@@ -653,7 +654,7 @@ pcie2x1: pcie at ff500000 {
 			num-lanes = <1>;
 			phys = <&combphy_pu PHY_TYPE_PCIE>;
 			phy-names = "pcie-phy";
-			power-domains = <&power 15>;
+			power-domains = <&power RK3562_PD_PHP>;
 			ranges = <0x01000000 0x0 0xfc100000 0x0 0xfc100000 0x0 0x100000
 				  0x02000000 0x0 0xfc200000 0x0 0xfc200000 0x0 0x1e00000
 				  0x03000000 0x3 0x00000000 0x3 0x00000000 0x0 0x40000000>;
-- 
2.47.2




More information about the linux-arm-kernel mailing list