Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12fd7496 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-3.20-dt' of... 

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

Merge "ARM: tegra: Device tree changes for v3.20" from Thierry Reding:

A couple of unit addresses fixes in device trees, addition of microphone
detection on Chromebook 13 and a vendor prefix update.

* tag 'tegra-for-3.20-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux

:
  ARM: tegra: Update isl29028 compatible string to use isil vendor prefix
  ARM: tegra: Fix unit address for Cortex-A9 TWD timer
  ARM: dts: tegra20: fix GR3D, DSI unit and reg base addresses
  ARM: tegra: Enable the mic-detect gpio on Acer Chromebook 13

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e8b1029d 62981239

arch/arm/boot/dts/tegra124-nyan-big.dts

+2 −0
Original line number Diff line number Diff line
@@ -1131,6 +1131,8 @@ 
		clock-names = "pll_a", "pll_a_out0", "mclk";



		nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(I, 7) GPIO_ACTIVE_HIGH>;

		nvidia,mic-det-gpios =

				<&gpio TEGRA_GPIO(R, 7) GPIO_ACTIVE_HIGH>;

	};

};

arch/arm/boot/dts/tegra20.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@ 
			reset-names = "2d";

		};



		gr3d@54140000 {

		gr3d@54180000 {

			compatible = "nvidia,tegra20-gr3d";

			reg = <0x54140000 0x00040000>;

			reg = <0x54180000 0x00040000>;

			clocks = <&tegra_car TEGRA20_CLK_GR3D>;

			resets = <&tegra_car 24>;

			reset-names = "3d";
@@ -130,9 +130,9 @@ 
			status = "disabled";

		};



		dsi@542c0000 {

		dsi@54300000 {

			compatible = "nvidia,tegra20-dsi";

			reg = <0x542c0000 0x00040000>;

			reg = <0x54300000 0x00040000>;

			clocks = <&tegra_car TEGRA20_CLK_DSI>;

			resets = <&tegra_car 48>;

			reset-names = "dsi";
@@ -140,7 +140,7 @@ 
		};

	};



	timer@50004600 {

	timer@50040600 {

		compatible = "arm,cortex-a9-twd-timer";

		reg = <0x50040600 0x20>;

		interrupts = <GIC_PPI 13

arch/arm/boot/dts/tegra30-cardhu.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ 


		/* ALS and Proximity sensor */

		isl29028@44 {

			compatible = "isl,isl29028";

			compatible = "isil,isl29028";

			reg = <0x44>;

			interrupt-parent = <&gpio>;

			interrupts = <TEGRA_GPIO(L, 0) IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/tegra30.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ 
		};

	};



	timer@50004600 {

	timer@50040600 {

		compatible = "arm,cortex-a9-twd-timer";

		reg = <0x50040600 0x20>;

		interrupts = <GIC_PPI 13