ARM: rockchip: rk3188: rk3188.dtsi include more common files

diff --git a/arch/arm/boot/dts/rk3188-lr097.dts b/arch/arm/boot/dts/rk3188-lr097.dts
index cc1e7ac6756d0a84b68b71f82db81e99aad5c42f..51af9b197aa524afa27cc7f345ba7e01cc6486aa 100644 (file)
--- a/arch/arm/boot/dts/rk3188-lr097.dts
+++ b/arch/arm/boot/dts/rk3188-lr097.dts
@@ -1,10 +1,8 @@
 /dts-v1/;
 
 #include "rk3188.dtsi"
-#include "rk3188-clocks.dtsi"
 #include "lcd-LP097Qx1.dtsi"
-#include "rk3188-mmc.dtsi"
-#include <dt-bindings/clock/ddr.h>
+
 / {
        memory {
                device_type = "memory";

diff --git a/arch/arm/boot/dts/rk3188-tb.dts b/arch/arm/boot/dts/rk3188-tb.dts
index 2d9de7a0a443794697fa663ab53df0647f45d7cf..87ebb1ae4d3868262e9f307677744ceca072e437 100644 (file)
--- a/arch/arm/boot/dts/rk3188-tb.dts
+++ b/arch/arm/boot/dts/rk3188-tb.dts
@@ -1,10 +1,6 @@
 /dts-v1/;
 
 #include "rk3188.dtsi"
-#include "rk3188-clocks.dtsi"
-#include <dt-bindings/clock/ddr.h>
-
-#include "rk3188-mmc.dtsi"
 #include "lcd-b101ew05.dtsi"
 
 / {
@@ -21,44 +17,44 @@
                status = "okay";
        };
 
-    wireless-wlan {
-        compatible = "wlan-platdata";
+       wireless-wlan {
+               compatible = "wlan-platdata";
 
-        wifi_chip_type = "";
-        sdio_vref = <28000>;
+               wifi_chip_type = "";
+               sdio_vref = <28000>;
 
-        //power_ctrl_by_pmu;
-        pmu_regulator = "act_ldo3";
-        pmu_enable_level = <1>; //1->HIGH, 0->LOW
+               //power_ctrl_by_pmu;
+               pmu_regulator = "act_ldo3";
+               pmu_enable_level = <1>; //1->HIGH, 0->LOW
 
-        WIFI,poweren_gpio = <&gpio3 GPIO_D0 GPIO_ACTIVE_HIGH>;
-        WIFI,host_wake_irq = <&gpio3 GPIO_D2 GPIO_ACTIVE_HIGH>;
-        //WIFI,reset_gpio = <&gpio0 GPIO_A2 GPIO_ACTIVE_LOW>;
+               WIFI,poweren_gpio = <&gpio3 GPIO_D0 GPIO_ACTIVE_HIGH>;
+               WIFI,host_wake_irq = <&gpio3 GPIO_D2 GPIO_ACTIVE_HIGH>;
+               //WIFI,reset_gpio = <&gpio0 GPIO_A2 GPIO_ACTIVE_LOW>;
 
-        status = "okay";
-    };
+               status = "okay";
+       };
 
-    wireless-bluetooth {
-        compatible = "bluetooth-platdata";
+       wireless-bluetooth {
+               compatible = "bluetooth-platdata";
 
-        uart_rts_gpios = <&gpio1 GPIO_A3 GPIO_ACTIVE_LOW>;
-        pinctrl-names = "default","rts_gpio";
-        pinctrl-0 = <&uart0_rts>;
-        pinctrl-1 = <&uart0_rts_gpio>;
+               uart_rts_gpios = <&gpio1 GPIO_A3 GPIO_ACTIVE_LOW>;
+               pinctrl-names = "default","rts_gpio";
+               pinctrl-0 = <&uart0_rts>;
+               pinctrl-1 = <&uart0_rts_gpio>;
 
-        BT,power_gpio = <&gpio3 GPIO_C7 GPIO_ACTIVE_HIGH>;
-        BT,reset_gpio = <&gpio3 GPIO_D1 GPIO_ACTIVE_HIGH>;
-        BT,wake_gpio = <&gpio3 GPIO_C6 GPIO_ACTIVE_HIGH>;
-        BT,wake_host_irq = <&gpio0 GPIO_A5 GPIO_ACTIVE_LOW>;
+               BT,power_gpio = <&gpio3 GPIO_C7 GPIO_ACTIVE_HIGH>;
+               BT,reset_gpio = <&gpio3 GPIO_D1 GPIO_ACTIVE_HIGH>;
+               BT,wake_gpio = <&gpio3 GPIO_C6 GPIO_ACTIVE_HIGH>;
+               BT,wake_host_irq = <&gpio0 GPIO_A5 GPIO_ACTIVE_LOW>;
 
-        status = "okay";
-    };
+               status = "okay";
+       };
 
        backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm3 0 25000>;
+               compatible = "pwm-backlight";
+               pwms = <&pwm3 0 25000>;
                brightness-levels = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255>;
-               default-brightness-level = <128>;
+               default-brightness-level = <128>;
                enable-gpios = <&gpio0 GPIO_A2 GPIO_ACTIVE_HIGH>;
        };
 
@@ -121,7 +117,7 @@
        rockchip-hdmi-spdif {
                compatible = "rockchip-hdmi-spdif";
        };
-       
+
        vmac-phy {
                compatible = "rockchip,vmac-phy";
                power-gpios = <&gpio0 GPIO_C0 GPIO_ACTIVE_HIGH>;
@@ -131,19 +127,18 @@
 &uart0 {
        status = "okay";
        dma-names = "!tx", "!rx";
-    pinctrl-0 = <&uart0_xfer &uart0_cts>;
+       pinctrl-0 = <&uart0_xfer &uart0_cts>;
 };
 
-
 &uart3 {
        status = "okay";
        dma-names = "!tx", "!rx";
 };
 
 &watchdog {
-               rockchip,timeout = <50>;
-               rockchip,debug = <1>;
-               status = "disabled";
+       rockchip,timeout = <50>;
+       rockchip,debug = <1>;
+       status = "disabled";
 };
 
 &i2c0 {
@@ -186,7 +181,7 @@
                compatible = "nxp,pcf8563";
                reg = <0x51>;
        };
-       
+
        act8846: act8846@5a {
                reg = <0x5a>;
                status = "okay";
@@ -280,59 +275,59 @@
 };
 
 &adc {
-        status = "okay";
-
-        key {
-                compatible = "rockchip,key";
-               io-channels = <&adc 1>; 
-
-                vol-up-key {
-                        linux,code = <115>;
-                        label = "volume up";
-                        rockchip,adc_value = <1>;
-                };
-
-                vol-down-key {
-                        linux,code = <114>;
-                        label = "volume down";
-                        rockchip,adc_value = <170>;
-                };
-
-                power-key {
-                        gpios = <&gpio0 GPIO_A4 GPIO_ACTIVE_LOW>;
-                        linux,code = <116>;
-                        label = "power";
-                        gpio-key,wakeup;
-                };
-
-                menu-key {
-                        linux,code = <139>;
-                        label = "menu";
-                        rockchip,adc_value = <355>;
-                };
-
-                home-key {
-                        linux,code = <102>;
-                        label = "home";
-                        rockchip,adc_value = <746>;
-                };
-
-                back-key {
-                        linux,code = <158>;
-                        label = "back";
-                        rockchip,adc_value = <560>;
-                };
-
-                camera-key {
-                        linux,code = <212>;
-                        label = "camera";
-                        rockchip,adc_value = <450>;
-                };       
-        };
+       status = "okay";
+
+       key {
+               compatible = "rockchip,key";
+               io-channels = <&adc 1>;
+
+               vol-up-key {
+                       linux,code = <115>;
+                       label = "volume up";
+                       rockchip,adc_value = <1>;
+               };
+
+               vol-down-key {
+                       linux,code = <114>;
+                       label = "volume down";
+                       rockchip,adc_value = <170>;
+               };
+
+               power-key {
+                       gpios = <&gpio0 GPIO_A4 GPIO_ACTIVE_LOW>;
+                       linux,code = <116>;
+                       label = "power";
+                       gpio-key,wakeup;
+               };
+
+               menu-key {
+                       linux,code = <139>;
+                       label = "menu";
+                       rockchip,adc_value = <355>;
+               };
+
+               home-key {
+                       linux,code = <102>;
+                       label = "home";
+                       rockchip,adc_value = <746>;
+               };
+
+               back-key {
+                       linux,code = <158>;
+                       label = "back";
+                       rockchip,adc_value = <560>;
+               };
+
+               camera-key {
+                       linux,code = <212>;
+                       label = "camera";
+                       rockchip,adc_value = <450>;
+               };
+       };
 };
 
 &pwm3 {
-        status = "okay";
+       status = "okay";
 };
 
 &clk_core_dvfs_table {
@@ -376,11 +371,11 @@
 
 /include/ "act8846.dtsi"
 &act8846 {
-       gpios =<&gpio3 GPIO_D3 GPIO_ACTIVE_LOW>; 
+       gpios =<&gpio3 GPIO_D3 GPIO_ACTIVE_LOW>;
 
-regulators {
+       regulators {
                
-                dcdc1_reg: regulator@0{
+               dcdc1_reg: regulator@0{
                        regulator-name= "act_dcdc1";
                        regulator-min-microvolt = <1200000>;
                        regulator-max-microvolt = <1200000>;
@@ -473,13 +468,14 @@ regulators {
                };
        };
 };
+
 /include/ "rk808.dtsi"
-&rk808{
-       gpios =<&gpio0 GPIO_B3 GPIO_ACTIVE_HIGH>,<&gpio0 GPIO_A1 GPIO_ACTIVE_LOW>; 
+&rk808 {
+       gpios =<&gpio0 GPIO_B3 GPIO_ACTIVE_HIGH>,<&gpio0 GPIO_A1 GPIO_ACTIVE_LOW>;
 
-regulators {
+       regulators {
                
-                rk808_dcdc1_reg: regulator@0{
+               rk808_dcdc1_reg: regulator@0{
                        regulator-name= "vdd_arm";      
                        regulator-always-on;
                        regulator-boot-on;
@@ -573,4 +569,3 @@ regulators {
        };
 };
 
-

diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 0b66a18eb7aace33733b302d1267636bd9feb39d..3558d477ea22f8ce3cb2797082dbe5aa79ae8c71 100755 (executable)
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -1,11 +1,13 @@
+#include <dt-bindings/clock/ddr.h>
+#include <dt-bindings/rkfb/rk_fb.h>
+#include <dt-bindings/suspend/rockchip-pm.h>
+#include <dt-bindings/sensor-dev.h>
 
 #include "skeleton.dtsi"
 #include "rk3188-pinctrl.dtsi"
-#include <dt-bindings/rkfb/rk_fb.h>
-#include <dt-bindings/suspend/rockchip-pm.h>
+#include "rk3188-clocks.dtsi"
 #include "rk3188_io_vol_domain.dtsi"
-
-#include <dt-bindings/sensor-dev.h>
+#include "rk3188-mmc.dtsi"
 
 / {
        compatible = "rockchip,rk3188";
@@ -443,10 +445,10 @@
                        <&aclk_lcdc1 300000000>;
        };
        rkpm_suspend {
-                compatible = "rockchip,rkpm_suspend";
-                
-                // define value is in dt-bindint/suspend/rockchip-pm.h
-                rockchip,ctrbits = <   
+               compatible = "rockchip,rkpm_suspend";
+
+               // define value is in dt-bindint/suspend/rockchip-pm.h
+               rockchip,ctrbits = <    
                                                (
                                                RKPM_CTR_PWR_DMNS
                                                |RKPM_CTR_GTCLKS
@@ -457,10 +459,10 @@
                                        >;
               rockchip,pmic-gpios=<
                                                 RKPM_GPIOS_SETTING(GPIO0_A0,RKPM_GPIOS_OUTPUT,RKPM_GPIOS_OUT_H) 
-                                                RKPM_GPIOS_SETTING(GPIO0_A1,RKPM_GPIOS_OUTPUT,RKPM_GPIOS_OUT_H)                           
+                                                RKPM_GPIOS_SETTING(GPIO0_A1,RKPM_GPIOS_OUTPUT,RKPM_GPIOS_OUT_H) 
                                                 >;
-       
-        };
+
+       };
        fb: fb{
                compatible = "rockchip,rk-fb";
                rockchip,disp-mode = <DUAL>;
@@ -496,26 +498,27 @@
                pinctrl-1 = <&lcdc1_gpio>;
                status = "disabled";
        };
-  rga@10114000 {
+
+       rga@10114000 {
                compatible = "rockchip,rga";
                reg = <0x10114000 0x1000>;
                interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&clk_gates6 10>, <&clk_gates6 11>;
-    clock-names = "hclk_rga", "aclk_rga";              
-  };
-
-    adc: adc@2006c000 {
-          compatible = "rockchip,saradc";
-          reg = <0x2006c000 0x100>;
-          interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
-           #io-channel-cells = <1>;
-          io-channel-ranges;
-           rockchip,adc-vref = <1800>;
-           clock-frequency = <1000000>;
-           clocks = <&clk_saradc>, <&clk_gates7 14>;
-           clock-names = "saradc", "pclk_saradc"; 
-           status = "disabled";
-    };
+               clock-names = "hclk_rga", "aclk_rga";           
+       };
+
+       adc: adc@2006c000 {
+               compatible = "rockchip,saradc";
+               reg = <0x2006c000 0x100>;
+               interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+               #io-channel-cells = <1>;
+               io-channel-ranges;
+               rockchip,adc-vref = <1800>;
+               clock-frequency = <1000000>;
+               clocks = <&clk_saradc>, <&clk_gates7 14>;
+               clock-names = "saradc", "pclk_saradc";
+               status = "disabled";
+       };
 
        spdif: rockchip-spdif@0x1011e000 {
                compatible = "rockchip-spdif";
@@ -545,7 +548,7 @@
 
        pwm0: pwm@20030000{
                 compatible = "rockchip,pwm";
-                reg = <0x20030000 0x10>; 
+                reg = <0x20030000 0x10>;
                 #pwm-cells = <2>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&pwm0_pin>;