Merge tag 'ntb-3.13' of git://github.com/jonmason/ntb

[linux-drm-fsl-dcu.git] / arch / arm / boot / dts / prima2.dtsi

diff --git a/arch/arm/boot/dts/prima2.dtsi b/arch/arm/boot/dts/prima2.dtsi
index 27ed9f5144bcb927d777cf4468c1ddaa5c11c837..daee58944e153dac7d2583a849400790daafdb14 100644 (file)
--- a/arch/arm/boot/dts/prima2.dtsi
+++ b/arch/arm/boot/dts/prima2.dtsi
@@ -76,6 +76,11 @@
                                compatible = "sirf,prima2-rsc";
                                reg = <0x88020000 0x1000>;
                        };
+
+                       cphifbg@88030000 {
+                               compatible = "sirf,prima2-cphifbg";
+                               reg = <0x88030000 0x1000>;
+                       };
                };
 
                mem-iobg {
@@ -86,10 +91,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 {
@@ -287,7 +299,13 @@
                                compatible = "sirf,prima2-spi";
                                reg = <0xb00d0000 0x10000>;
                                interrupts = <15>;
+                               sirf,spi-num-chipselects = <1>;
+                               sirf,spi-dma-rx-channel = <25>;
+                               sirf,spi-dma-tx-channel = <20>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                clocks = <&clks 19>;
+                               status = "disabled";
                        };
 
                        spi1: spi@b0170000 {
@@ -295,7 +313,13 @@
                                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";
                        };
 
                        i2c0: i2c@b00e0000 {
@@ -304,6 +328,8 @@
                                reg = <0xb00e0000 0x10000>;
                                interrupts = <24>;
                                clocks = <&clks 17>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                        };
 
                        i2c1: i2c@b00f0000 {
@@ -312,6 +338,8 @@
                                reg = <0xb00f0000 0x10000>;
                                interrupts = <25>;
                                clocks = <&clks 18>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                        };
 
                        tsc@b0110000 {
@@ -360,6 +388,12 @@
                                                sirf,function = "uart0";
                                        };
                                };
+                               uart0_noflow_pins_a: uart0@1 {
+                                       uart {
+                                               sirf,pins = "uart0_nostreamctrlgrp";
+                                               sirf,function = "uart0_nostreamctrl";
+                                       };
+                               };
                                uart1_pins_a: uart1@0 {
                                        uart {
                                                sirf,pins = "uart1grp";
@@ -498,18 +532,42 @@
                                                 sirf,function = "usp0";
                                         };
                                 };
+                               usp0_uart_nostreamctrl_pins_a: usp0@1 {
+                                        usp0 {
+                                                sirf,pins =
+                                                       "usp0_uart_nostreamctrl_grp";
+                                                sirf,function =
+                                                       "usp0_uart_nostreamctrl";
+                                        };
+                                };
                                 usp1_pins_a: usp1@0 {
                                         usp1 {
                                                 sirf,pins = "usp1grp";
                                                 sirf,function = "usp1";
                                         };
                                 };
+                               usp1_uart_nostreamctrl_pins_a: usp1@1 {
+                                        usp1 {
+                                                sirf,pins =
+                                                       "usp1_uart_nostreamctrl_grp";
+                                                sirf,function =
+                                                       "usp1_uart_nostreamctrl";
+                                        };
+                                };
                                 usp2_pins_a: usp2@0 {
                                         usp2 {
                                                 sirf,pins = "usp2grp";
                                                 sirf,function = "usp2";
                                         };
                                 };
+                               usp2_uart_nostreamctrl_pins_a: usp2@1 {
+                                        usp2 {
+                                                sirf,pins =
+                                                       "usp2_uart_nostreamctrl_grp";
+                                                sirf,function =
+                                                       "usp2_uart_nostreamctrl";
+                                        };
+                                };
                                 usb0_utmi_drvbus_pins_a: usb0_utmi_drvbus@0 {
                                         usb0_utmi_drvbus {
                                                 sirf,pins = "usb0_utmi_drvbusgrp";
@@ -522,6 +580,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";