summaryrefslogtreecommitdiffstats
path: root/arch/score
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2013-08-23 11:58:01 -0700
committerKevin Hilman <khilman@linaro.org>2013-08-23 11:58:18 -0700
commit334b0f0913a1a980d3167c3bc4415a788225125f (patch)
tree676d3bbd924fc9c7b1cc0bbf054c3259d4be4bcb /arch/score
parent579673ee1ad62604910c6b8f431aa2a0951589b6 (diff)
parentd45393cd32016ea76a364d1f2e7b58720b2f8135 (diff)
downloadblackbird-obmc-linux-334b0f0913a1a980d3167c3bc4415a788225125f.tar.gz
blackbird-obmc-linux-334b0f0913a1a980d3167c3bc4415a788225125f.zip
Merge tag 'imx-dt-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc
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: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/score')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud