summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/arm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-07-19 12:51:26 -0700
committerOlof Johansson <olof@lixom.net>2014-07-19 12:51:26 -0700
commit223f93ed7e8942a250c1a7ea99ede72f5fd4cc70 (patch)
tree8bf79b1a7bb77d4cc0ef95353b140a44c3547625 /Documentation/devicetree/bindings/arm
parent58cd070a8441507292604e17a505848add9b2760 (diff)
parent2236927d9820199bb6f29f2a89b1783c4513d34f (diff)
downloadop-kernel-dev-223f93ed7e8942a250c1a7ea99ede72f5fd4cc70.zip
op-kernel-dev-223f93ed7e8942a250c1a7ea99ede72f5fd4cc70.tar.gz
Merge tag 'tegra-for-3.17-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt
Merge "ARM: tegra: device tree changes for 3.17" from Thierry Reding: - New board support: * Apalis T30 - HDA support for Tegra124 and Venice2 - Display on Medcom Wide and Roth - GK20A support on Tegra124 - XUSB pad controller for Tegra124 and Jetson TK1 - Various cleanups This pulls in the for-3.17/fuse-move, for-3.17/dt-cros-ec-kbd and for-3.17/xusb-padctl branches to resolve dependencies. Note that the Apalis T30 support has a runtime dependency on the for-3.17/pcie-regulators branch, so they should preferably be applied in that order. I didn't merge that branch into this because Apalis T30 support is new, therefore can't regress, and because the dependency exists only at runtime. * tag 'tegra-for-3.17-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: (28 commits) ARM: tegra: roth: add display DT node ARM: tegra: Fix typoed ams,ext-control properties ARM: tegra: jetson-tk1: Add XUSB pad controller ARM: tegra: tegra124: Add XUSB pad controller ARM: tegra: add GK20A GPU to Tegra124 DT ARM: tegra: of: add GK20A device tree binding ARM: tegra: roth: enable input on mmc clock pins ARM: tegra: roth: fix unsupported pinmux properties ARM: tegra: Migrate Apalis T30 PCIe power supply scheme ARM: tegra: tamonten: add the display to the Medcom Wide ARM: tegra: tamonten: add the base board regulators ARM: tegra: initial support for apalis t30 ARM: tegra: jetson-tk1: mark eMMC as non-removable ARM: tegra: venice2 - Enable HDA ARM: tegra: Add Tegra124 HDA support ARM: tegra: Add the EC i2c tunnel to tegra124-venice2 soc/tegra: fuse: fix dummy functions soc/tegra: fuse: move APB DMA into Tegra20 fuse driver soc/tegra: Add efuse and apbmisc bindings soc/tegra: Add efuse driver for Tegra ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
-rw-r--r--Documentation/devicetree/bindings/arm/tegra.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/tegra.txt b/Documentation/devicetree/bindings/arm/tegra.txt
index 558ed4b..73278c6 100644
--- a/Documentation/devicetree/bindings/arm/tegra.txt
+++ b/Documentation/devicetree/bindings/arm/tegra.txt
@@ -30,6 +30,8 @@ board-specific compatible values:
nvidia,seaboard
nvidia,ventana
nvidia,whistler
+ toradex,apalis_t30
+ toradex,apalis_t30-eval
toradex,colibri_t20-512
toradex,iris
OpenPOWER on IntegriCloud