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

Commit 254172cc authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-4.10-arm-dt' of... 

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

ARM: tegra: Device tree changes for v4.10-rc1

Adds support for GMI on Tegra20 and Tegra30 and enables the GPU on Nyan
Chromebooks. It also enables sound support on various Toradex devices.

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

:
  ARM: tegra: apalis-tk1: Drop leading 0 from unit-address
  ARM: tegra: apalis/colibri t30: Integrate audio
  ARM: tegra: nyan: Enable GPU node and related supply
  ARM: tegra: Add Tegra30 GMI support
  ARM: tegra: Add Tegra20 GMI support

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1630ae0a 5e8a724d

arch/arm/boot/dts/tegra124-apalis.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1595,7 +1595,7 @@ 
		clock-frequency = <400000>;



		/* SGTL5000 audio codec */

		sgtl5000: codec@0a {

		sgtl5000: codec@a {

			compatible = "fsl,sgtl5000";

			reg = <0x0a>;

			VDDA-supply = <&reg_3v3>;

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

+7 −1
Original line number Diff line number Diff line
@@ -42,6 +42,12 @@ 
		};

	};



	gpu@0,57000000 {

		status = "okay";



		vdd-supply = <&vdd_gpu>;

	};



	serial@70006000 {

		/* Debug connector on the bottom of the board near SD card. */

		status = "okay";
@@ -214,7 +220,7 @@ 
					regulator-always-on;

				};



				sd6 {

				vdd_gpu: sd6 {

					regulator-name = "+VDD_GPU_AP";

					regulator-min-microvolt = <650000>;

					regulator-max-microvolt = <1200000>;

arch/arm/boot/dts/tegra20.dtsi

+13 −0
Original line number Diff line number Diff line
@@ -376,6 +376,19 @@ 
		status = "disabled";

	};



	gmi@70009000 {

		compatible = "nvidia,tegra20-gmi";

		reg = <0x70009000 0x1000>;

		#address-cells = <2>;

		#size-cells = <1>;

		ranges = <0 0 0xd0000000 0xfffffff>;

		clocks = <&tegra_car TEGRA20_CLK_NOR>;

		clock-names = "gmi";

		resets = <&tegra_car 42>;

		reset-names = "gmi";

		status = "disabled";

	};



	pwm: pwm@7000a000 {

		compatible = "nvidia,tegra20-pwm";

		reg = <0x7000a000 0x100>;

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

+49 −0
Original line number Diff line number Diff line
@@ -48,6 +48,24 @@ 
		pinctrl-0 = <&state_default>;



		state_default: pinmux {

			/* Analogue Audio (On-module) */

			clk1_out_pw4 {

				nvidia,pins = "clk1_out_pw4";

				nvidia,function = "extperiph1";

				nvidia,pull = <TEGRA_PIN_PULL_NONE>;

				nvidia,tristate = <TEGRA_PIN_DISABLE>;

				nvidia,enable-input = <TEGRA_PIN_DISABLE>;

			};

			dap3_fs_pp0 {

				nvidia,pins =	"dap3_fs_pp0",

						"dap3_sclk_pp3",

						"dap3_din_pp1",

						"dap3_dout_pp2";

				nvidia,function = "i2s2";

				nvidia,pull = <TEGRA_PIN_PULL_NONE>;

				nvidia,tristate = <TEGRA_PIN_DISABLE>;

			};



			/* Apalis BKL1_ON */

			pv2 {

				nvidia,pins = "pv2";
@@ -429,6 +447,15 @@ 
		status = "okay";

		clock-frequency = <100000>;



		/* SGTL5000 audio codec */

		sgtl5000: codec@a {

			compatible = "fsl,sgtl5000";

			reg = <0x0a>;

			VDDA-supply = <&sys_3v3_reg>;

			VDDIO-supply = <&sys_3v3_reg>;

			clocks = <&tegra_car TEGRA30_CLK_EXTERN1>;

		};



		pmic: tps65911@2d {

			compatible = "ti,tps65911";

			reg = <0x2d>;
@@ -660,6 +687,12 @@ 
		nvidia,sys-clock-req-active-high;

	};



	ahub@70080000 {

		i2s@70080500 {

			status = "okay";

		};

	};



	/* eMMC */

	sdhci@78000600 {

		status = "okay";
@@ -733,4 +766,20 @@ 
			regulator-always-on;

		};

	};



	sound {

		compatible = "toradex,tegra-audio-sgtl5000-apalis_t30",

			     "nvidia,tegra-audio-sgtl5000";

		nvidia,model = "Toradex Apalis T30";

		nvidia,audio-routing =

			"Headphone Jack", "HP_OUT",

			"LINE_IN", "Line In Jack",

			"MIC_IN", "Mic Jack";

		nvidia,i2s-controller = <&tegra_i2s2>;

		nvidia,audio-codec = <&sgtl5000>;

		clocks = <&tegra_car TEGRA30_CLK_PLL_A>,

			 <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,

			 <&tegra_car TEGRA30_CLK_EXTERN1>;

		clock-names = "pll_a", "pll_a_out0", "mclk";

	};

};

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

+49 −0
Original line number Diff line number Diff line
@@ -29,6 +29,24 @@ 
		pinctrl-0 = <&state_default>;



		state_default: pinmux {

			/* Analogue Audio (On-module) */

			clk1_out_pw4 {

				nvidia,pins = "clk1_out_pw4";

				nvidia,function = "extperiph1";

				nvidia,pull = <TEGRA_PIN_PULL_NONE>;

				nvidia,tristate = <TEGRA_PIN_DISABLE>;

				nvidia,enable-input = <TEGRA_PIN_DISABLE>;

			};

			dap3_fs_pp0 {

				nvidia,pins =	"dap3_fs_pp0",

						"dap3_sclk_pp3",

						"dap3_din_pp1",

						"dap3_dout_pp2";

				nvidia,function = "i2s2";

				nvidia,pull = <TEGRA_PIN_PULL_NONE>;

				nvidia,tristate = <TEGRA_PIN_DISABLE>;

			};



			/* Colibri BL_ON */

			pv2 {

				nvidia,pins = "pv2";
@@ -207,6 +225,15 @@ 
		status = "okay";

		clock-frequency = <100000>;



		/* SGTL5000 audio codec */

		sgtl5000: codec@a {

			compatible = "fsl,sgtl5000";

			reg = <0x0a>;

			VDDA-supply = <&sys_3v3_reg>;

			VDDIO-supply = <&sys_3v3_reg>;

			clocks = <&tegra_car TEGRA30_CLK_EXTERN1>;

		};



		pmic: tps65911@2d {

			compatible = "ti,tps65911";

			reg = <0x2d>;
@@ -396,6 +423,12 @@ 
		nvidia,sys-clock-req-active-high;

	};



	ahub@70080000 {

		i2s@70080500 {

			status = "okay";

		};

	};



	/* eMMC */

	sdhci@78000600 {

		status = "okay";
@@ -471,4 +504,20 @@ 
			regulator-always-on;

		};

	};



	sound {

		compatible = "toradex,tegra-audio-sgtl5000-colibri_t30",

			     "nvidia,tegra-audio-sgtl5000";

		nvidia,model = "Toradex Colibri T30";

		nvidia,audio-routing =

			"Headphone Jack", "HP_OUT",

			"LINE_IN", "Line In Jack",

			"MIC_IN", "Mic Jack";

		nvidia,i2s-controller = <&tegra_i2s2>;

		nvidia,audio-codec = <&sgtl5000>;

		clocks = <&tegra_car TEGRA30_CLK_PLL_A>,

			 <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,

			 <&tegra_car TEGRA30_CLK_EXTERN1>;

		clock-names = "pll_a", "pll_a_out0", "mclk";

	};

};