mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 18:13:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'tegra-for-4.15-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt

Browse Source 
Pull "ARM: tegra: Device tree changes for v4.15-rc1" from Thierry Reding:

Adds support for the CEC controller found on Tegra124 and enables it on
Tegra K1.

* tag 'tegra-for-4.15-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Enable CEC support on Jetson TK1
  ARM: tegra: Add CEC support for Tegra124
This commit is contained in:
Arnd Bergmann
2017-10-30 12:07:10 +01:00
parent c4db01edba 33dfb1e18d
commit d524dc30a5
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/tegra124-jetson-tk1.dts
View File

@@ -67,6 +67,10 @@ hdmi@54280000 {
};
};
cec@70015000 {
status = "okay";
};
gpu@0,57000000 {
/*
* Node left disabled on purpose - the bootloader will enable

12
arch/arm/boot/dts/tegra124.dtsi
View File

@@ -124,7 +124,7 @@ dc@54240000 {
nvidia,head = <1>;
};
hdmi@54280000 {
hdmi: hdmi@54280000 {
compatible = "nvidia,tegra124-hdmi";
reg = <0x0 0x54280000 0x0 0x00040000>;
interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
@@ -852,6 +852,16 @@ sdhci@700b0600 {
status = "disabled";
};
cec@70015000 {
compatible = "nvidia,tegra124-cec";
reg = <0x0 0x70015000 0x0 0x00001000>;
interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA124_CLK_CEC>;
clock-names = "cec";
status = "disabled";
hdmi-phandle = <&hdmi>;
};
soctherm: thermal-sensor@700e2000 {
compatible = "nvidia,tegra124-soctherm";
reg = <0x0 0x700e2000 0x0 0x600 /* SOC_THERM reg_base */