Merge branch 'imx/dt/for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6.git...

Shawn Guo <shawn.guo@linaro.org> writes:

  I chose to base it on Sascha's imx-common-clk series than -rc, because
  otherwise it will keep patching clock file that has been removed by
  imx-common-clk series.  It also depends on imx-pinctrl pull-request
  I just sent to be functional.

  Note: when imx-common-clk and imx-pinctrl get merged together, the
  following files will have conflicts.  But the conflicts should not be
  so hard to resolve.

[arnd: resolved those merge conflicts by pulling pinctrl branch]

* imx/dt: (24 commits)
  ARM: dts: imx53-qsb: enable audio support
  ARM: dts: imx51-babbage: enable audio support
  ARM: imx: add audio codec clk lookup for imx53-qsb
  ARM: imx: add audmux pad setting for imx51-babbage
  ARM: imx: add more imx5 ssi clocks
  ARM: dts: imx53-qsb: Add Dialog DA9053 PMIC support
  ARM: dts: imx6q-sabrelite: add serial2 pinctrl support
  ARM: dts: imx6q-sabrelite: add sound device imx6q-sabrelite-sgtl5000
  ARM: imx6q_sabrelite: clk_register_clkdev cko1 for sgtl5000
  ARM: imx6q: add ssi1_ipg clk_lookup
  ARM: dts: imx6q-sabrelite: add audmux pinctrl support
  ARM: dts: imx6q-sabrelite: add i2c1 pinctrl support
  ARM: dts: imx6q-sabrelite: add audmux device
  ARM: dts: imx6q-sabrelite: add ssi device
  ARM: dts: imx6q-arm2: add pinctrl state for usdhc
  ARM: imx6: Add UART2 for low-level debug
  ARM: imx6q: register phy fixup only when CONFIG_PHYLIB is enabled
  ARM: imx6q: move imx6q_sabrelite specific code to a dedicated function
  ARM: dts: imx6q-sabrelite: Add SPI NOR support
  ARM: dts: Add basic support for imx6q-sabresd
  ...

Pulls in imx/pinctrl and imx/clock as dependencies.

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

diff --combined Documentation/devicetree/bindings/arm/fsl.txt
index 1708df5a873781fab29754e8047d48b8ad2f3bb9,2e86e4db6b2ba5f6827cc5284d9d9b2a312a37a8..ac9e7516756e62a3817d1b9ac8338c1f47a45440
--- 1/Documentation/devicetree/bindings/arm/fsl.txt
--- 2/Documentation/devicetree/bindings/arm/fsl.txt
+++ b/Documentation/devicetree/bindings/arm/fsl.txt
@@@ -1,14 -1,6 +1,14 @@@
  Freescale i.MX Platforms Device Tree Bindings
  -----------------------------------------------
  
 +i.MX23 Evaluation Kit
 +Required root node properties:
 +    - compatible = "fsl,imx23-evk", "fsl,imx23";
 +
 +i.MX28 Evaluation Kit
 +Required root node properties:
 +    - compatible = "fsl,imx28-evk", "fsl,imx28";
 +
  i.MX51 Babbage Board
  Required root node properties:
      - compatible = "fsl,imx51-babbage", "fsl,imx51";
@@@ -37,6 -29,10 +37,10 @@@ i.MX6 Quad SABRE Lite Boar
  Required root node properties:
      - compatible = "fsl,imx6q-sabrelite", "fsl,imx6q";
  
+ i.MX6 Quad SABRE Smart Device Board
+ Required root node properties:
+     - compatible = "fsl,imx6q-sabresd", "fsl,imx6q";
+ 
  Generic i.MX boards
  -------------------