summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-21 09:29:21 +0100
committerOlof Johansson <olof@lixom.net>2012-11-21 09:29:21 +0100
commit90919bf2149a2e988ab295d7266b1608d42f21af (patch)
tree996e257f3e9f2fd9db6fc32e1a4c8489bc9be2f9 /Documentation
parentMerge tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91 into ne... (diff)
parentARM: tegra: whistler: enable HDMI port (diff)
downloadlinux-90919bf2149a2e988ab295d7266b1608d42f21af.tar.xz
linux-90919bf2149a2e988ab295d7266b1608d42f21af.zip
Merge tag 'tegra-for-3.8-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/dt
From Stephen Warren: ARM: tegra: device tree changes A wide variety of device tree additions are made across many Tegra boards: * WiFi is supported on Seaboard, Ventana, and Cardhu. * An I2C mux is added for Ventana, and Tamonten. * SPI flash is added to Cardhu, and TrimSlice. * Temperature sensors are added to Harmony, Tamonten, and Ventana. * host1x (graphics/display controller) is added to the SoC include files. * HDMI displays are enabled on Harmony, TrimSlice, Tamonten, Plutux, Tec, and Whistler. This pull request is based on tegra-for-3.8-soc. * tag 'tegra-for-3.8-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (47 commits) ARM: tegra: whistler: enable HDMI port ARM: tegra: tec: Enable HDMI output ARM: tegra: plutux: Enable HDMI output ARM: tegra: tamonten: Add host1x support ARM: tegra: trimslice: enable HDMI port ARM: tegra: harmony: enable HDMI port ARM: tegra: Add Tegra30 host1x support ARM: tegra: Add Tegra20 host1x support ARM: tegra: trimslice: enable SPI flash ARM: tegra: dts: add sflash controller dt entry ARM: tegra: ventana: Add NCT1008 temperature sensor ARM: tegra: tamonten: Add NCT1008 temperature sensor ARM: tegra: harmony: Add ADT7641 temperature sensor ARM: tegra: tec: Remove redundant DT properties ARM: tegra: tamonten: Add DDC/PTA pinmux ARM: tegra: dts: cardhu: enable SLINK4 ARM: tegra: dts: add slink controller dt entry ARM: dt: tegra: ventana: define pinmux for ddc ARM: dt: t30 cardhu: set pinmux and power for wlan ARM: dt: t20 ventana: set pinmux and power for wlan ...
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/vendor-prefixes.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 9de2b9ff9d6e..ac2c2c416a14 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -51,4 +51,5 @@ ti Texas Instruments
via VIA Technologies, Inc.
wlf Wolfson Microelectronics
wm Wondermedia Technologies, Inc.
+winbond Winbond Electronics corp.
xlnx Xilinx