Merge tag 'tegra-for-4.15-arm-dt' of... (d524dc30) · Commits · 戴 / test

Merge tag 'tegra-for-4.15-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt 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

arch/arm/boot/dts/tegra124-jetson-tk1.dts

+4 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,10 @@
		};
		};

		cec@70015000 {
		status = "okay";
		};

		gpu@0,57000000 {
		/*
		* Node left disabled on purpose - the bootloader will enable

+11 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@
		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 @@
		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 */