• Kevin Hilman's avatar
    Merge tag 'imx-dt-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc · 334b0f09
    Kevin Hilman authored
    From Shawn Guo:
    
    It contains the imx device tree updates for 3.12.
    
    - New pinctrl entry additions for various peripherals
    - Devices enabling for imx6, imx5 and imx27 boards
    - Add missing device nodes like iim, owire, audmux and sram, etc.
    - Various updates on boards like phytec, wandboard and sabresd
    - Consolidate pad macros between imx6q and imx6dl
    
    * tag 'imx-dt-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6: (92 commits)
      ARM: dts: vf610-twr: enable i2c0 device
      ARM: dts: i.MX51: Add one more I2C2 pinmux entry
      ARM: dts: i.MX51: Move pins configuration under "iomuxc" label
      ARM: dtsi: imx6qdl-sabresd: Add USB OTG vbus pin to pinctrl_hog
      ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator
      ARM: dts: imx27-phytec-phycore-som: Enable AUDMUX
      ARM: dts: i.MX27: Disable AUDMUX in the template
      ARM: dts: wandboard: Add support for SDIO bcm4329
      ARM: i.MX5 clocks: Remove optional clock setup (CKIH1) from i.MX51 template
      ARM: dts: imx53-qsb: Make USBH1 functional
      ARM i.MX6Q: dts: Enable I2C1 with EEPROM and PMIC on Phytec phyFLEX-i.MX6 Ouad module
      ARM i.MX6Q: dts: Enable SPI NOR flash on Phytec phyFLEX-i.MX6 Ouad module
      ARM: dts: imx6qdl-sabresd: Add touchscreen support
      ARM: imx: add ocram clock for imx53
      ARM: dts: imx: ocram size is different between imx6q and imx6dl
      ARM: dts: imx27-phytec-phycore-som: Fix regulator settings
      ARM: dts: i.MX27: Remove clock name from CPU node
      ARM: dts: i.MX27: Increase "clock-latency" value
      ARM: dts: i.MX27: Add label to CPU node
      ARM: dts: i.MX27: Remove optional "ptp" clock source for FEC
      ...
    Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
    334b0f09
Makefile 7.11 KB