• Olof Johansson's avatar
    Merge tag 'imx-dt-3.18' of... · 9cd70164
    Olof Johansson authored
    Merge tag 'imx-dt-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
    
    Merge "ARM: imx: device tree changes for 3.18" from Shawn Guo:
    
    The i.MX device tree changes for 3.18:
     - Device tree support for i.MX ADS and Armadeus APF9328 boards
     - Enable thermal sensor support for i.MX6SL
     - Add LCD support for i.MX6SL EVK board
     - Fix display duplicate name for a bunch of board dts files
     - Configure imx6qdl-sabresd board pins locally to remove the dependency
       on bootloader
     - A set of imx28-tx28 board dts updates from Lothar
     - Add pci config space as platform resource
     - Enable devices RTC, I2C and HDMI for nitrogen6x board
     - Split HummingBoard DT to support s/dl and d/q
     - mSATA and IR input support for HummingBoard
     - Add SSI baud clock for i.MX6 device trees
     - Add USB support for vf610-colibri and vf610-twr boards
     - A set of cleanup and updates on Gateworks boards
    
    * tag 'imx-dt-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (86 commits)
      ARM: dts: imx6: make gpt per clock can be from OSC
      ARM: dts: imx: ventana: add canbus support for GW52xx
      ARM: dts: imx: ventana: cleanup pinctrl groups
      ARM: dts: imx: ventana: configure padconf for all pins
      ARM: dts: imx: ventana: use gpio constants
      ARM: dts: imx: ventana: remove unused aliases
      ARM: dts: imx: ventana: remove unsupported dt nodes
      ARM: dts: imx28-tx28: add alias for CAN XCVR regulator
      ARM: dts: imx28-tx28: add spi-gpio as alternative for spi-mxs
      ARM: dts: imx28-tx28: use GPIO flags
      ARM: dts: imx28-tx28: remove spidev labels and add third instance of spidev
      ARM: dts: imx6sl: add baud clock and clock-names for ssi
      ARM: dts: imx6qdl: add baud clock and clock-names for ssi
      ARM: dts: imx6qdl-sabresd: Configure the pins locally
      ARM: dts: imx28-m28evk: Fix display duplicate name warning
      ARM: dts: imx28-tx28: Fix display duplicate name warning
      ARM: dts: imx28-m28cu: Fix display duplicate name warning
      ARM: dts: imx28-cfa100: Fix display duplicate name warning
      ARM: dts: imx28-apf28dev: Fix display duplicate name warning
      ARM: dts: imx28-apx4devkit: Fix display duplicate name warning
      ...
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    9cd70164
Makefile 14.1 KB