• Arnd Bergmann's avatar
    Merge tag 'imx-dt-3.11' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt · ed2ca6ee
    Arnd Bergmann authored
    From Shawn Guo:
    
    imx device tree changes for 3.11:
    
    * A bunch of new board additions, imx6sl-evk, vf610-twr, imx53-tx53,
      imx53-m53evk and imx27-phytec-phycore
    * Various pinctrl setting updates and additions
    * Enable various on board peripherals, usb, audio, nor, display etc.
    * Configure L2 cache data and tag latency from device tree
    * Add imx-weim bus driver
    
    * tag 'imx-dt-3.11' of git://git.linaro.org/people/shawnguo/linux-2.6: (82 commits)
      ARM: dts: imx27: Add VPU devicetree node
      ARM: mxc: fix gpio-ranges for VF610
      ARM: dtsi: imx6qdl-sabresd: Enable WM8962 audio support
      ARM: dtsi: imx6qdl-sabresd: Enable SSI2 and AUDMUX
      ARM: dtsi: imx6qdl-sabresd: Add WM8962 CODEC support
      ARM: dtsi: imx6qdl-sabresd: add a fixed regulator for WM8962
      ARM: dtsi: imx6dl: Add a pinctrl for AUDMUX
      ARM: dtsi: imx6q/imx6dl: Add a pinctrl for I2C1
      ARM: dts: imx6qdl-sabresd: add clko1 iomux configuration
      ARM: dts: Phytec imx6q pfla02 and pbab01 support
      ARM: dts: imx6q: Add pinctrl for usdhc2 and enet
      ARM: dts: imx27-phytec-phycore-rdk: Add MTD name for NOR flash
      ARM: dts: imx27-phytec-phycore-rdk: Add SDHC support
      ARM: dts: i.MX27: Add SDHC devicetree nodes
      ARM: dts: i.MX27: Add DMA devicetree node
      ARM: dts: imx6qdl-sabreauto: enable the WEIM NOR
      ARM: dts: imx6dl: add pinctrls for WEIM NOR
      ARM: dts: imx6q: add pinctrls for WEIM NOR
      ARM: dts: imx6qdl: add more information for WEIM
      ARM: dts: imx6q{dl}: fix the pin conflict between SPI and WEIM
      ...
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    ed2ca6ee
imx6q.dtsi 12.9 KB