summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/tegra124.dtsi
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-05-21 15:06:16 -0700
committerOlof Johansson <olof@lixom.net>2014-05-21 15:06:16 -0700
commit8b1b57e88e1fa427c01679eaa992bd191b1dfb06 (patch)
tree0e11322a7b243b0ef7017083207ef157066e7f21 /arch/arm/boot/dts/tegra124.dtsi
parent072a4fd2b187a93991ca420dcdf8f9b78659e7bd (diff)
parent446e9c63161519902a251c3670d2fbb455146475 (diff)
Merge tag 'tegra-for-3.16-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt
Merge "ARM: tegra: device tree changes for 3.16" from Stephen Warren: The bulk of Tegra changes for 3.16 are to device trees. Highlights are: - New board support for: - Jetson TK1. - SHIELD. - Tegra Note 7. - Colibri T30 module. - HDMI support on Venice2. - SD card write-protect GPIOs added to some boards. - Numerous regulator cleanups. * tag 'tegra-for-3.16-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: initial add of Colibri T30 ARM: tegra: add device tree for SHIELD ARM: tegra: add SD wp-gpios to Venice2 DT ARM: tegra: add Tegra Note 7 device tree ARM: tegra: add SD wp-gpios to Dalmore DT ARM: tegra: add SD wp-gpios to Jetson TK1 DT ARM: tegra: use correct audio CODEC on Jetson TK1 ARM: tegra: dalmore - Add DSI power supply ARM: tegra: dalmore - Add +5V HDMI supply ARM: tegra: beaver - Add +5V HDMI supply ARM: tegra: harmony - Add +5V HDMI supply ARM: tegra: jetson-tk1 - Enable HDMI support ARM: tegra: venice2 - Enable HDMI ARM: tegra: Add Tegra124 HDMI support ARM: tegra: fix Venice2 SD card VQMMC supply ARM: tegra: make Venice's +3.3V_RUN regulator always on ARM: tegra: fix Jetson TK1 SD card supply ARM: tegra: define Jetson TK1 regulators ARM: tegra: add Jetson TK1 device tree Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/tegra124.dtsi')
-rw-r--r--arch/arm/boot/dts/tegra124.dtsi12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index 6d540a025148..6e6bc4e8185c 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -51,6 +51,18 @@
nvidia,head = <1>;
};
+ hdmi@0,54280000 {
+ compatible = "nvidia,tegra124-hdmi";
+ reg = <0x0 0x54280000 0x0 0x00040000>;
+ interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&tegra_car TEGRA124_CLK_HDMI>,
+ <&tegra_car TEGRA124_CLK_PLL_D2_OUT0>;
+ clock-names = "hdmi", "parent";
+ resets = <&tegra_car 51>;
+ reset-names = "hdmi";
+ status = "disabled";
+ };
+
sor@0,54540000 {
compatible = "nvidia,tegra124-sor";
reg = <0x0 0x54540000 0x0 0x00040000>;