From: Olof Johansson Date: Thu, 26 Dec 2013 19:03:50 +0000 (-0800) Subject: Merge tag 'tegra-for-3.14-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra... X-Git-Tag: v3.14-rc1~112^2~14 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5aceaab3974b64800355500189c66ea6feb88214;p=linux.git Merge tag 'tegra-for-3.14-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt From Stephen Warren: ARM: tegra: device tree changes This branch contains all the changes to Tegra's device tree. The highlights are: * Many patches for Tegra124 SoC support, and the Venice2 board which uses that SoC. * Conversion to use more headers providing named constants for pinctrl and key codes, which improves readability. * A few cleanups. This branch is based on tag tegra-for-3.14-dmas-resets-rework in order to avoid conflicts with the DT changes required to use the common bindings for DMAs and resets. * tag 'tegra-for-3.14-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: (24 commits) ARM: tegra: Add SPI controller nodes for Tegra124 ARM: tegra: Fix misconfiguration of pin PH2 on Venice2 ARM: tegra: fix pinctrl misconfiguration on Venice2 ARM: tegra: add default pinctrl nodes for Venice2 ARM: tegra: correct Colibri T20 regulator settings ARM: tegra: convert dts files of Tegra30 platforms to use pinctrl defines ARM: tegra: convert dts files of Tegra20 platforms to use pinctrl defines ARM: tegra: convert dts files of Tegra114 platforms to use pinctrl defines ARM: tegra: Add header file for pinctrl constants ARM: tegra: convert device tree files to use key defines ARM: tegra: Enable PWM on Venice2 ARM: tegra: Add Tegra124 PWM support ARM: tegra: add sound card to Venice2 DT ARM: tegra: add audio-related device to Tegra124 DT ARM: tegra: enable I2C controllers on Venice2 ARM: tegra: add I2C controllers to Tegra124 DT ARM: tegra: add MMC controllers to Tegra124 DT ARM: tegra: add Tegra124 pinmux node to DT ARM: tegra: add APB DMA controller to Tegra124 DT ARM: tegra: add reset properties to Tegra124 DTs ... Signed-off-by: Olof Johansson --- 5aceaab3974b64800355500189c66ea6feb88214