ARM: dts: add a alias for rockchip_suspend

Since we need overwrite this rockchip_suspend node in sub dts file,
sometimes. Add a alias for before it.

Change-Id: I6d951d1c0bfff1cde619906eb9f11256d057a9fe
Signed-off-by: Chris Zhong <zyw@rock-chips.com>

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index c16880880762e0f581e7c8bc86d59e75bbf46a17..c65533362ad79d9516a1b5735ea73a672cbd1ad7 100755 (executable)
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -735,7 +735,7 @@
                interrupt-names = "vpu_mmu";
        };
 
-       rockchip_suspend {
+       rockchip_suspend: rockchip_suspend {
                rockchip,ctrbits = <
                        (0
                         //|RKPM_CTR_PWR_DMNS

diff --git a/arch/arm/boot/dts/rk3126-86v.dts b/arch/arm/boot/dts/rk3126-86v.dts
index a1820d15b32f9e5839e8498049e03019e7195dff..633dc603fc4a4590ba63546f5168670b9f5092c9 100755 (executable)
--- a/arch/arm/boot/dts/rk3126-86v.dts
+++ b/arch/arm/boot/dts/rk3126-86v.dts
@@ -24,12 +24,12 @@
        usb_control {
                compatible = "rockchip,rk3126-usb-control";
                //host_drv_gpio = <&gpio2 GPIO_B4 GPIO_ACTIVE_LOW>;
-               //otg_drv_gpio = <&gpio2 GPIO_B6 GPIO_ACTIVE_LOW>; 
+               //otg_drv_gpio = <&gpio2 GPIO_B6 GPIO_ACTIVE_LOW>;
 
                rockchip,remote_wakeup;
                rockchip,usb_irq_wakeup;
                };
-               
+
         wireless-wlan {
         compatible = "wlan-platdata";
 
@@ -50,9 +50,9 @@
         //WIFI,reset_gpio = <&gpio0 GPIO_A2 GPIO_ACTIVE_LOW>;
 
         status = "okay";
-    }; 
-    
-       rockchip_suspend {
+    };
+
+       rockchip_suspend: rockchip_suspend {
                 rockchip,ctrbits = <
                         (0
                         |RKPM_CTR_PWR_DMNS
@@ -68,7 +68,7 @@
                 >;
                 rockchip,pmic-suspend_gpios = <0>;
         };
-       
+
     chosen {
        bootargs = "vmalloc=496M cma=4M rockchip_jtag";
        };

diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts
index ff2228d3bcfc1c79f200cc8c1a54d75a101631a4..5173e4b44e1cefb6cad662bbe81d2305f4db9157 100755 (executable)
--- a/arch/arm/boot/dts/rk3126-sdk.dts
+++ b/arch/arm/boot/dts/rk3126-sdk.dts
@@ -39,7 +39,8 @@
               
               satus = "okay";  
         };
-       rockchip_suspend {
+
+       rockchip_suspend: rockchip_suspend {
                 rockchip,ctrbits = <
                         (0
                         |RKPM_CTR_PWR_DMNS

diff --git a/arch/arm/boot/dts/rk3128-86v.dts b/arch/arm/boot/dts/rk3128-86v.dts
index 86edff03378533f0ce39aa1e52426b0f44866cbb..112f5ddf8bf4faf6d40c2aee0ba64b0358d7933b 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-86v.dts
+++ b/arch/arm/boot/dts/rk3128-86v.dts
@@ -69,7 +69,7 @@
                status = "okay";
        };
 
-      rockchip_suspend {
+       rockchip_suspend: rockchip_suspend {
                            rockchip,ctrbits = <
                            (0
                            |RKPM_CTR_PWR_DMNS

diff --git a/arch/arm/boot/dts/rk3128-box-rk88.dts b/arch/arm/boot/dts/rk3128-box-rk88.dts
index 4c265eee23c0a3366a3559c501e703472de42ca3..3158daa638e49567ee989e534ea48e271ec8b23c 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-box-rk88.dts
+++ b/arch/arm/boot/dts/rk3128-box-rk88.dts
@@ -93,7 +93,8 @@
                /*0 - Normal, 1 - Force Host, 2 - Force Device*/
                rockchip,usb-mode = <1>;
        };
-        rockchip_suspend {
+
+       rockchip_suspend: rockchip_suspend {
                 rockchip,ctrbits = <
                         (0
                         |RKPM_CTR_PWR_DMNS

diff --git a/arch/arm/boot/dts/rk3128-box.dts b/arch/arm/boot/dts/rk3128-box.dts
index c42731ffe9da545fee35f52ab5d1b594392f4735..bcc676e9a6e809f852344c934e8c581a8003b6a1 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-box.dts
+++ b/arch/arm/boot/dts/rk3128-box.dts
@@ -90,7 +90,8 @@
                /*0 - Normal, 1 - Force Host, 2 - Force Device*/
 //             rockchip,usb-mode = <1>;
        };
-        rockchip_suspend {
+
+       rockchip_suspend: rockchip_suspend {
                 rockchip,ctrbits = <
                         (0
                         |RKPM_CTR_PWR_DMNS

diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 74d67bf7a936d8c5a7fed8692886b5d41f15cdb9..e71892813580473a35ac8d0a4dcd727730f80ff5 100755 (executable)
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -501,23 +501,24 @@
                        <&clk_gpu 200000000>, <&aclk_lcdc0 300000000>,
                        <&aclk_lcdc1 300000000>;
        };
-       rockchip_suspend {     
+
+       rockchip_suspend: rockchip_suspend {
                 //compatible = "rockchip,rkpm_suspend";
                 // define value is in dt-bindint/suspend/rockchip-pm.h
-                rockchip,ctrbits = <   
+                rockchip,ctrbits = <
                                                (
                                                RKPM_CTR_PWR_DMNS
                                                |RKPM_CTR_GTCLKS
                                                |RKPM_CTR_PLLS
                                                |RKPM_CTR_SYSCLK_DIV
                                                )
-                                       >;              
+                                       >;
               rockchip,pmic-gpios=<
-                                                RKPM_PINGPIO_BITS_OUTPUT(GPIO0_A0,RKPM_GPIO_OUT_L) 
-                                                RKPM_PINGPIO_BITS_INTPUT(GPIO0_A1,RKPM_GPIO_PULL_UP)                           
+                                                RKPM_PINGPIO_BITS_OUTPUT(GPIO0_A0,RKPM_GPIO_OUT_L)
+                                                RKPM_PINGPIO_BITS_INTPUT(GPIO0_A1,RKPM_GPIO_PULL_UP)
                                                 >;
-       
         };
+
        fb: fb{
                compatible = "rockchip,rk-fb";
                rockchip,disp-mode = <DUAL>;

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index d3a4563730e5b125a9c2d03b7e0c75cb77723a06..5fb9529c7666331f1cd347eacd29ab5cbee41f12 100755 (executable)
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -1272,7 +1272,7 @@
                interrupt-names = "isp_mmu";
        };
 
-       rockchip_suspend {
+       rockchip_suspend: rockchip_suspend {
                rockchip,ctrbits = <
                        (0
                         |RKPM_CTR_PWR_DMNS