Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client

[cascardo/linux.git] / arch / arm / boot / dts / omap4.dtsi

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 421fe9f..0ced079 100644 (file)
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -10,11 +10,11 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/pinctrl/omap.h>
 
-#include "skeleton.dtsi"
-
 / {
        compatible = "ti,omap4430", "ti,omap4";
        interrupt-parent = <&wakeupgen>;
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        aliases {
                i2c0 = &i2c1;
@@ -198,7 +198,7 @@
                                        #size-cells = <1>;
                                        ranges = <0 0x5a0 0x170>;
 
-                                       pbias_regulator: pbias_regulator {
+                                       pbias_regulator: pbias_regulator@60 {
                                                compatible = "ti,pbias-omap4", "ti,pbias-omap";
                                                reg = <0x60 0x4>;
                                                syscon = <&omap4_padconf_global>;
@@ -370,6 +370,10 @@
                        ti,no-idle-on-init;
                        clocks = <&l3_div_ck>;
                        clock-names = "fck";
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
                };
 
                uart1: serial@4806a000 {