Merge tag 'platform-drivers-x86-v4.11-2' of git://git.infradead.org/linux-platform...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / keystone-k2g.dtsi

diff --git a/arch/arm/boot/dts/keystone-k2g.dtsi b/arch/arm/boot/dts/keystone-k2g.dtsi
index 63c7cf0..f59567f 100644 (file)
--- a/arch/arm/boot/dts/keystone-k2g.dtsi
+++ b/arch/arm/boot/dts/keystone-k2g.dtsi
@@ -40,12 +40,12 @@
        };
 
        gic: interrupt-controller@02561000 {
-               compatible = "arm,cortex-a15-gic";
+               compatible = "arm,gic-400", "arm,cortex-a15-gic";
                #interrupt-cells = <3>;
                interrupt-controller;
                reg = <0x0 0x02561000 0x0 0x1000>,
                      <0x0 0x02562000 0x0 0x2000>,
-                     <0x0 0x02564000 0x0 0x1000>,
+                     <0x0 0x02564000 0x0 0x2000>,
                      <0x0 0x02566000 0x0 0x2000>;
                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) |
                                IRQ_TYPE_LEVEL_HIGH)>;
@@ -77,6 +77,18 @@
                ranges = <0x0 0x0 0x0 0xc0000000>;
                dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>;
 
+               msm_ram: msmram@0c000000 {
+                       compatible = "mmio-sram";
+                       reg = <0x0c000000 0x100000>;
+                       ranges = <0x0 0x0c000000 0x100000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       sram-bm@f7000 {
+                               reg = <0x000f7000 0x8000>;
+                       };
+               };
+
                k2g_pinctrl: pinmux@02621000 {
                        compatible = "pinctrl-single";
                        reg = <0x02621000 0x410>;
@@ -90,7 +102,7 @@
                };
 
                uart0: serial@02530c00 {
-                       compatible = "ns16550a";
+                       compatible = "ti,da830-uart", "ns16550a";
                        current-speed = <115200>;
                        reg-shift = <2>;
                        reg-io-width = <4>;