Merge tag 'soc2-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / keystone.dtsi

diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
index a8052fd657e56b5e65c6d51c64a01c127c728377..c1414cb81fd4ac8e2a58a513e5e0b5fe08a6aeb9 100644 (file)
--- a/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@ -28,8 +28,6 @@
        gic: interrupt-controller {
                compatible = "arm,cortex-a15-gic";
                #interrupt-cells = <3>;
-               #size-cells = <0>;
-               #address-cells = <1>;
                interrupt-controller;
                reg = <0x0 0x02561000 0x0 0x1000>,
                      <0x0 0x02562000 0x0 0x2000>,
@@ -66,6 +64,7 @@
                compatible = "ti,keystone","simple-bus";
                interrupt-parent = <&gic>;
                ranges = <0x0 0x0 0x0 0xc0000000>;
+               dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>;
 
                pllctrl: pll-controller@02310000 {
                        compatible = "ti,keystone-pllctrl", "syscon";
@@ -114,11 +113,6 @@
                        interrupts = <GIC_SPI 283 IRQ_TYPE_EDGE_RISING>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-
-                       dtt@50 {
-                               compatible = "at,24c1024";
-                               reg = <0x50>;
-                       };
                };
 
                i2c1: i2c@2530400 {
@@ -127,6 +121,8 @@
                        clock-frequency = <100000>;
                        clocks = <&clki2c>;
                        interrupts = <GIC_SPI 286 IRQ_TYPE_EDGE_RISING>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                };
 
                i2c2: i2c@2530800 {
@@ -135,6 +131,8 @@
                        clock-frequency = <100000>;
                        clocks = <&clki2c>;
                        interrupts = <GIC_SPI 289 IRQ_TYPE_EDGE_RISING>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                };
 
                spi0: spi@21000400 {
@@ -144,6 +142,8 @@
                        ti,davinci-spi-intr-line = <0>;
                        interrupts = <GIC_SPI 292 IRQ_TYPE_EDGE_RISING>;
                        clocks = <&clkspi>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                };
 
                spi1: spi@21000600 {
@@ -153,6 +153,8 @@
                        ti,davinci-spi-intr-line = <0>;
                        interrupts = <GIC_SPI 296 IRQ_TYPE_EDGE_RISING>;
                        clocks = <&clkspi>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                };
 
                spi2: spi@21000800 {
@@ -162,6 +164,8 @@
                        ti,davinci-spi-intr-line = <0>;
                        interrupts = <GIC_SPI 300 IRQ_TYPE_EDGE_RISING>;
                        clocks = <&clkspi>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                };
 
                usb_phy: usb_phy@2620738 {
@@ -181,6 +185,8 @@
                        clock-names = "usb";
                        interrupts = <GIC_SPI 393 IRQ_TYPE_EDGE_RISING>;
                        ranges;
+                       dma-coherent;
+                       dma-ranges;
                        status = "disabled";
 
                        dwc3@2690000 {