Merge tag 'sound-fix2-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / arch / arm / boot / dts / atlas6.dtsi

diff --git a/arch/arm/boot/dts/atlas6.dtsi b/arch/arm/boot/dts/atlas6.dtsi
index 6db4f81d4795d2855b83aac5a72cc3c7b8cb6727..978bab4991dfb03a8a7ce96ea5f7c985ca47daae 100644 (file)
--- a/arch/arm/boot/dts/atlas6.dtsi
+++ b/arch/arm/boot/dts/atlas6.dtsi
@@ -65,6 +65,11 @@
                                compatible = "sirf,prima2-rsc";
                                reg = <0x88020000 0x1000>;
                        };
+
+                       cphifbg@88030000 {
+                               compatible = "sirf,prima2-cphifbg";
+                               reg = <0x88030000 0x1000>;
+                       };
                };
 
                mem-iobg {
@@ -75,10 +80,17 @@
 
                        memory-controller@90000000 {
                                compatible = "sirf,prima2-memc";
-                               reg = <0x90000000 0x10000>;
+                               reg = <0x90000000 0x2000>;
                                interrupts = <27>;
                                clocks = <&clks 5>;
                        };
+
+                       memc-monitor {
+                               compatible = "sirf,prima2-memcmon";
+                               reg = <0x90002000 0x200>;
+                               interrupts = <4>;
+                               clocks = <&clks 32>;
+                       };
                };
 
                disp-iobg {
@@ -120,6 +132,20 @@
                        };
                };
 
+               graphics2d-iobg {
+                       compatible = "simple-bus";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0xa0000000 0xa0000000 0x8000000>;
+
+                       ble@a0000000 {
+                               compatible = "sirf,atlas6-ble";
+                               reg = <0xa0000000 0x2000>;
+                               interrupts = <5>;
+                               clocks = <&clks 33>;
+                       };
+               };
+
                dsp-iobg {
                        compatible = "simple-bus";
                        #address-cells = <1>;
@@ -271,6 +297,11 @@
                                compatible = "sirf,prima2-spi";
                                reg = <0xb0170000 0x10000>;
                                interrupts = <16>;
+                               sirf,spi-num-chipselects = <1>;
+                               sirf,spi-dma-rx-channel = <12>;
+                               sirf,spi-dma-tx-channel = <13>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                clocks = <&clks 20>;
                                status = "disabled";
                        };
@@ -527,6 +558,18 @@
                                                 sirf,function = "usb1_utmi_drvbus";
                                         };
                                 };
+                                usb1_dp_dn_pins_a: usb1_dp_dn@0 {
+                                        usb1_dp_dn {
+                                                sirf,pins = "usb1_dp_dngrp";
+                                                sirf,function = "usb1_dp_dn";
+                                        };
+                                };
+                                uart1_route_io_usb1_pins_a: uart1_route_io_usb1@0 {
+                                        uart1_route_io_usb1 {
+                                                sirf,pins = "uart1_route_io_usb1grp";
+                                                sirf,function = "uart1_route_io_usb1";
+                                        };
+                                };
                                 warm_rst_pins_a: warm_rst@0 {
                                         warm_rst {
                                                 sirf,pins = "warm_rstgrp";