Merge git://git.denx.de/u-boot-x86

[oweals/u-boot.git] / arch / arm / dts / keystone.dtsi

diff --git a/arch/arm/dts/keystone.dtsi b/arch/arm/dts/keystone.dtsi
index 72816d65f7ec3fcf5d7c47ce792ae57db369754b..9a2e1f69bba6d725f17f0488c4b902cc405cfbe0 100644 (file)
--- a/arch/arm/dts/keystone.dtsi
+++ b/arch/arm/dts/keystone.dtsi
@@ -13,26 +13,36 @@
 
 / {
        model = "Texas Instruments Keystone 2 SoC";
-       #address-cells = <2>;
-       #size-cells = <2>;
+       #address-cells = <1>;
+       #size-cells = <1>;
        interrupt-parent = <&gic>;
 
        aliases {
                serial0 = &uart0;
+               spi0 = &spi0;
+               spi1 = &spi1;
+               spi2 = &spi2;
+               i2c0 = &i2c0;
+               i2c1 = &i2c1;
+               i2c2 = &i2c2;
+       };
+
+       chosen {
+               stdout-path = &uart0;
        };
 
        memory {
-               reg = <0x00000000 0x80000000 0x00000000 0x40000000>;
+               reg = <0x80000000 0x40000000>;
        };
 
        gic: interrupt-controller {
                compatible = "arm,cortex-a15-gic";
                #interrupt-cells = <3>;
                interrupt-controller;
-               reg = <0x0 0x02561000 0x0 0x1000>,
-                     <0x0 0x02562000 0x0 0x2000>,
-                     <0x0 0x02564000 0x0 0x1000>,
-                     <0x0 0x02566000 0x0 0x2000>;
+               reg = <0x02561000 0x1000>,
+                     <0x02562000 0x2000>,
+                     <0x02564000 0x1000>,
+                     <0x02566000 0x2000>;
                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) |
                                IRQ_TYPE_LEVEL_HIGH)>;
        };
@@ -63,8 +73,7 @@
                #size-cells = <1>;
                compatible = "ti,keystone","simple-bus";
                interrupt-parent = <&gic>;
-               ranges = <0x0 0x0 0x0 0xc0000000>;
-               dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>;
+               ranges;
 
                pllctrl: pll-controller@02310000 {
                        compatible = "ti,keystone-pllctrl", "syscon";