ARM: dts: rockchip: remove soc subnodes

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3066a-bqcurie2.dts

diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
index afb327322a4a6d40538f30cdfca33aa3b25b39e3..6131675695ebcdaa6258ec33dc11d26bec40c71e 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
+++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
@@ -24,87 +24,85 @@
                reg = <0x60000000 0x40000000>;
        };
 
-       soc {
-               uart0: serial@10124000 {
-                       status = "okay";
-               };
+       uart0: serial@10124000 {
+               status = "okay";
+       };
 
-               uart1: serial@10126000 {
-                       status = "okay";
-               };
+       uart1: serial@10126000 {
+               status = "okay";
+       };
 
-               uart2: serial@20064000 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&uart2_xfer>;
-                       status = "okay";
-               };
+       uart2: serial@20064000 {
+               pinctrl-names = "default";
+               pinctrl-0 = <&uart2_xfer>;
+               status = "okay";
+       };
 
-               uart3: serial@20068000 {
-                       status = "okay";
-               };
+       uart3: serial@20068000 {
+               status = "okay";
+       };
 
-               vcc_sd0: fixed-regulator {
-                       compatible = "regulator-fixed";
-                       regulator-name = "sdmmc-supply";
-                       regulator-min-microvolt = <3000000>;
-                       regulator-max-microvolt = <3000000>;
-                       gpio = <&gpio3 7 GPIO_ACTIVE_LOW>;
-                       startup-delay-us = <100000>;
-               };
+       vcc_sd0: fixed-regulator {
+               compatible = "regulator-fixed";
+               regulator-name = "sdmmc-supply";
+               regulator-min-microvolt = <3000000>;
+               regulator-max-microvolt = <3000000>;
+               gpio = <&gpio3 7 GPIO_ACTIVE_LOW>;
+               startup-delay-us = <100000>;
+       };
 
-               dwmmc@10214000 { /* sdmmc */
-                       num-slots = <1>;
-                       status = "okay";
+       dwmmc@10214000 { /* sdmmc */
+               num-slots = <1>;
+               status = "okay";
 
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4>;
-                       vmmc-supply = <&vcc_sd0>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4>;
+               vmmc-supply = <&vcc_sd0>;
 
-                       slot@0 {
-                               reg = <0>;
-                               bus-width = <4>;
-                               disable-wp;
-                       };
+               slot@0 {
+                       reg = <0>;
+                       bus-width = <4>;
+                       disable-wp;
                };
+       };
 
-               dwmmc@10218000 { /* wifi */
-                       num-slots = <1>;
-                       status = "okay";
-                       non-removable;
+       dwmmc@10218000 { /* wifi */
+               num-slots = <1>;
+               status = "okay";
+               non-removable;
 
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
 
-                       slot@0 {
-                               reg = <0>;
-                               bus-width = <4>;
-                               disable-wp;
-                       };
+               slot@0 {
+                       reg = <0>;
+                       bus-width = <4>;
+                       disable-wp;
                };
+       };
 
-               gpio-keys {
-                       compatible = "gpio-keys";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       autorepeat;
-
-                       button@0 {
-                               gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; /* GPIO6_A2 */
-                               linux,code = <116>;
-                               label = "GPIO Key Power";
-                               linux,input-type = <1>;
-                               gpio-key,wakeup = <1>;
-                               debounce-interval = <100>;
-                       };
-                       button@1 {
-                               gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; /* GPIO4_C5 */
-                               linux,code = <104>;
-                               label = "GPIO Key Vol-";
-                               linux,input-type = <1>;
-                               gpio-key,wakeup = <0>;
-                               debounce-interval = <100>;
-                       };
-                       /* VOL+ comes somehow thru the ADC */
+       gpio-keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               autorepeat;
+
+               button@0 {
+                       gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; /* GPIO6_A2 */
+                       linux,code = <116>;
+                       label = "GPIO Key Power";
+                       linux,input-type = <1>;
+                       gpio-key,wakeup = <1>;
+                       debounce-interval = <100>;
+               };
+               button@1 {
+                       gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; /* GPIO4_C5 */
+                       linux,code = <104>;
+                       label = "GPIO Key Vol-";
+                       linux,input-type = <1>;
+                       gpio-key,wakeup = <0>;
+                       debounce-interval = <100>;
                };
+               /* VOL+ comes somehow thru the ADC */
        };
 };