Merge tag 'mxs-dt-3.11' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt

From Shawn Guo:

mxs device tree changes for 3.11:

* A couple of new board support, cfa10055 and cfa10057
* A few updates on cfa10036 device tree source
* Some auart pinctrl data addition
* Adopt soc bus infrastructure for mach-mxs

* tag 'mxs-dt-3.11' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs: dt: Add Crystalfontz CFA-10057 device tree
  ARM: mxs: dt: Add the Crystalfontz CFA-10055 device tree
  ARM: cfa10049: Switch the chip select pin of the LCD controller
  ARM: cfa10036: Add USB0 OTG port
  ARM: dts: apf28dev: Add touchscreen support for APF28dev
  ARM: mxs: Fix UARTs on M28EVK
  ARM: cfa10036: dt: Change i2c0 clock frequency
  ARM: dts: cfa10036: Change the OLED display to SSD1306
  ARM: mx28: add auart4 2 pins pinmux to imx28.dtsi
  ARM: mx28: add auart3 2 pins pinmux to imx28.dtsi
  ARM: mx28: add auart2 2 pins pinmux to imx28.dtsi
  ARM: mxs: Use soc bus infrastructure
  ARM: dts: mx28: Adjust the digctl compatible string
  ARM: mxs: Remove init_irq declaration in machine description

Includes an update to 3.10-rc6

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 34 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 4c10a1968c0e..195451bf7706 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -334,6 +334,17 @@
                                         fsl,pull-up = <0>;
                                 };
 
+                                auart2_2pins_b: auart2-2pins@1 {
+                                        reg = <1>;
+                                        fsl,pinmux-ids = <
+                                                0x3080 /* MX28_PAD_AUART2_RX__AUART2_RX */
+                                                0x3090 /* MX28_PAD_AUART2_TX__AUART2_TX */
+                                        >;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <0>;
+                                };
+
                                 auart3_pins_a: auart3@0 {
                                         reg = <0>;
                                         fsl,pinmux-ids = <
@@ -358,6 +369,28 @@
                                         fsl,pull-up = <0>;
                                 };
 
+                                auart3_2pins_b: auart3-2pins@1 {
+                                        reg = <1>;
+                                        fsl,pinmux-ids = <
+                                                0x30c0 /* MX28_PAD_AUART3_RX__AUART3_RX */
+                                                0x30d0 /* MX28_PAD_AUART3_TX__AUART3_TX */
+                                        >;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <0>;
+                                };
+
+                                auart4_2pins_a: auart4@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <
+                                                0x2181 /* MX28_PAD_SSP3_SCK__AUART4_TX */
+                                                0x2191 /* MX28_PAD_SSP3_MOSI__AUART4_RX */
+                                        >;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <0>;
+                                };
+
                                 mac0_pins_a: mac0@0 {
                                         reg = <0>;
                                         fsl,pinmux-ids = <
@@ -673,7 +706,7 @@
                         };
 
                         digctl@8001c000 {
-                                compatible = "fsl,imx28-digctl";
+                                compatible = "fsl,imx28-digctl", "fsl,imx23-digctl";
                                 reg = <0x8001c000 0x2000>;
                                 interrupts = <89>;
                                 status = "disabled";