MLK-21682-4 arm64: dts: imx8m: Remove domain-id from gpc-psci

We can rely on the reg property instead and be more compliant with DT
rules.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Acked-by: Jacky Bai <ping.bai@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi
index b7869b4..3a748a8 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi
@@ -203,7 +203,6 @@
                        reg = <0>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       domain-id = <0>;
                        #power-domain-cells = <0>;
                        domain-name = "HSIO_PD";
                        clocks = <&clk IMX8MM_CLK_USB1_CTRL_ROOT>,
@@ -211,7 +210,6 @@
 
                        pcie0_pd: power-domain@1 {
                                reg = <1>;
-                               domain-id = <1>;
                                #power-domain-cells = <0>;
                                domain-name = "PCIE0_PD";
                                clocks = <&clk IMX8MM_CLK_PCIE1_ROOT>;
@@ -219,14 +217,12 @@
 
                        usb_otg1_pd: power-domain@2 {
                                reg = <2>;
-                               domain-id = <2>;
                                #power-domain-cells = <0>;
                                domain-name = "USB_OTG1_PD";
                        };
 
                        usb_otg2_pd: power-domain@3 {
                                reg = <3>;
-                               domain-id = <3>;
                                #power-domain-cells = <0>;
                                domain-name = "USB_OTG2_PD";
                        };
@@ -236,7 +232,6 @@
                gpumix_pd: power-domain@4 {
                        compatible = "fsl,imx8mm-pm-domain";
                        reg = <4>;
-                       domain-id = <4>;
                        #power-domain-cells = <0>;
                        domain-name = "GPUMIX_PD";
                        clocks = <&clk IMX8MM_CLK_GPU_BUS_ROOT>,
@@ -250,14 +245,12 @@
                        reg = <5>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       domain-id = <5>;
                        #power-domain-cells = <0>;
                        domain-name = "VPUMIX_PD";
                        clocks =  <&clk IMX8MM_CLK_VPU_DEC_ROOT>;
 
                        vpu_g1_pd: power-domain@6 {
                                reg = <6>;
-                               domain-id = <6>;
                                #power-domain-cells = <0>;
                                domain-name = "VPU_G1_PD";
                                clocks = <&clk IMX8MM_CLK_VPU_G1_ROOT>;
@@ -265,7 +258,6 @@
 
                        vpu_g2_pd: power-domain@7 {
                                reg = <7>;
-                               domain-id = <7>;
                                #power-domain-cells = <0>;
                                domain-name = "VPU_G2_PD";
                                clocks = <&clk IMX8MM_CLK_VPU_G2_ROOT>;
@@ -273,7 +265,6 @@
 
                        vpu_h1_pd: power-domain@8 {
                                reg = <8>;
-                               domain-id = <8>;
                                #power-domain-cells = <0>;
                                domain-name = "VPU_H1_PD";
                                clocks = <&clk IMX8MM_CLK_VPU_H1_ROOT>;
@@ -285,14 +276,12 @@
                        reg = <9>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       domain-id = <9>;
                        #power-domain-cells = <0>;
                        domain-name = "DISPMIX_PD";
                        clocks = <&clk IMX8MM_CLK_DISP_ROOT>;
 
                        mipi_pd: power-domain@10 {
                                reg = <10>;
-                               domain-id = <10>;
                                #power-domain-cells = <0>;
                                domain-name = "MIPI_PD";
                        };

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mq.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8mq.dtsi
index 8bba312..a312041 100755 (executable)
--- a/arch/arm64/boot/dts/freescale/fsl-imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8mq.dtsi
@@ -205,7 +205,6 @@
                        compatible = "fsl,imx8mq-pm-domain";
                        reg = <0>;
                        #power-domain-cells = <0>;
-                       domain-id = <0>;
                        domain-name = "MIPI_PD";
                };
 
@@ -213,7 +212,6 @@
                        compatible = "fsl,imx8mq-pm-domain";
                        reg = <1>;
                        #power-domain-cells = <0>;
-                       domain-id = <1>;
                        domain-name = "PCIE0_PD";
                };
 
@@ -221,7 +219,6 @@
                        compatible = "fsl,imx8mq-pm-domain";
                        reg = <2>;
                        #power-domain-cells = <0>;
-                       domain-id = <2>;
                        domain-name = "USB_OTG1_PD";
                };
 
@@ -229,7 +226,6 @@
                        compatible = "fsl,imx8mq-pm-domain";
                        reg = <3>;
                        #power-domain-cells = <0>;
-                       domain-id = <3>;
                        domain-name = "USB_OTG2_PD";
                };
 
@@ -237,7 +233,6 @@
                        compatible = "fsl,imx8mq-pm-domain";
                        reg = <4>;
                        #power-domain-cells = <0>;
-                       domain-id = <4>;
                        domain-name = "GPU_PD";
                        clocks = <&clk IMX8MQ_CLK_GPU_AXI>, <&clk IMX8MQ_CLK_GPU_SHADER_DIV>,
                                 <&clk IMX8MQ_CLK_GPU_ROOT>, <&clk IMX8MQ_CLK_GPU_AHB>;
@@ -247,7 +242,6 @@
                        compatible = "fsl,imx8mq-pm-domain";
                        reg = <5>;
                        #power-domain-cells = <0>;
-                       domain-id = <5>;
                        domain-name = "VPU_PD";
                        clocks = <&clk IMX8MQ_CLK_VPU_G1_ROOT>, <&clk IMX8MQ_CLK_VPU_G2_ROOT>,
                                 <&clk IMX8MQ_CLK_VPU_DEC_ROOT>;
@@ -257,7 +251,6 @@
                        compatible = "fsl,imx8mq-pm-domain";
                        reg = <8>;
                        #power-domain-cells = <0>;
-                       domain-id = <8>;
                        domain-name = "MIPI_CSI1_PD";
                };
 
@@ -265,7 +258,6 @@
                        compatible = "fsl,imx8mq-pm-domain";
                        reg = <9>;
                        #power-domain-cells = <0>;
-                       domain-id = <9>;
                        domain-name = "MIPI_CSI2_PD";
                };
 
@@ -273,7 +265,6 @@
                        compatible = "fsl,imx8mq-pm-domain";
                        reg = <10>;
                        #power-domain-cells = <0>;
-                       domain-id = <10>;
                        domain-name = "PCIE1_PD";
                };
        };