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. -----BEGIN PGP SIGNATURE----- iQIwBAABCAAaBQJYLyczExx0cmVkaW5nQG52aWRpYS5jb20ACgkQ3SOs138+s6G3 WxAAos+oFvb2YFW0TNbJHCH/AW17U8kepXhmf8SEScRiiYP3sMgcN6kLK/pCvfBr 49FAHt/enDol3tw73nov0OOTyfXgcDEX/+i42irKwj0GSWeJHbaVqLpqP+ugrfg9 v0UGuycofbmvQyXWd8zF1yE7FtFwwExJHv+t7Rwu8y0Rwh55Q094P+ct5nRZbmpU yUxw01xgguCAISaHVAp4h6l5NXi3m0dzYC2NUISO32wNYLGlV/u0vy8PLWYUEqHf tcISM4sJwQbvl0P8kUvvvrQNRfD55pCXweprEeOzoesPZJOCrClBnRK3sCiXhANw iVt6cpY9BN5xtbTrVNvtQZTKbqECnshRLyX450ZHwD+hIIVRI01W+aZB29WuO3GC 3J+82+TUZrt/BXAXlnpaNmMbzN9OKJs6eqOgs4CTjpFv/CCbnpQsEMOiWgFNoYfg Lz3iz5xcKS9XJ8ImhIJvCLzTzvLuRsSRGcdAGp3BWp330qEZAe/MA2U4sT8dE24W necF/FqJ3qLtVF1b5I6lOK3FPMfSNzQJHDgu469QXRxZKcyJoxuRyKXW0sP4zKp0 mZbuawOMLEIEvt8PCLSZN6MzgNsHXH3eA0sYfriXpdsUBD2/l1AO1GhkuD2MG9p9 24W8av2cpLNmVR7/wsarMX8429mUo1N7rSpHwsvtlTww2bg= =w7VH -----END PGP SIGNATURE----- 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: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
254172cc7a
|
@ -1595,7 +1595,7 @@
|
||||||
clock-frequency = <400000>;
|
clock-frequency = <400000>;
|
||||||
|
|
||||||
/* SGTL5000 audio codec */
|
/* SGTL5000 audio codec */
|
||||||
sgtl5000: codec@0a {
|
sgtl5000: codec@a {
|
||||||
compatible = "fsl,sgtl5000";
|
compatible = "fsl,sgtl5000";
|
||||||
reg = <0x0a>;
|
reg = <0x0a>;
|
||||||
VDDA-supply = <®_3v3>;
|
VDDA-supply = <®_3v3>;
|
||||||
|
|
|
@ -42,6 +42,12 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
gpu@0,57000000 {
|
||||||
|
status = "okay";
|
||||||
|
|
||||||
|
vdd-supply = <&vdd_gpu>;
|
||||||
|
};
|
||||||
|
|
||||||
serial@70006000 {
|
serial@70006000 {
|
||||||
/* Debug connector on the bottom of the board near SD card. */
|
/* Debug connector on the bottom of the board near SD card. */
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
@ -214,7 +220,7 @@
|
||||||
regulator-always-on;
|
regulator-always-on;
|
||||||
};
|
};
|
||||||
|
|
||||||
sd6 {
|
vdd_gpu: sd6 {
|
||||||
regulator-name = "+VDD_GPU_AP";
|
regulator-name = "+VDD_GPU_AP";
|
||||||
regulator-min-microvolt = <650000>;
|
regulator-min-microvolt = <650000>;
|
||||||
regulator-max-microvolt = <1200000>;
|
regulator-max-microvolt = <1200000>;
|
||||||
|
|
|
@ -376,6 +376,19 @@
|
||||||
status = "disabled";
|
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 {
|
pwm: pwm@7000a000 {
|
||||||
compatible = "nvidia,tegra20-pwm";
|
compatible = "nvidia,tegra20-pwm";
|
||||||
reg = <0x7000a000 0x100>;
|
reg = <0x7000a000 0x100>;
|
||||||
|
|
|
@ -48,6 +48,24 @@
|
||||||
pinctrl-0 = <&state_default>;
|
pinctrl-0 = <&state_default>;
|
||||||
|
|
||||||
state_default: pinmux {
|
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 */
|
/* Apalis BKL1_ON */
|
||||||
pv2 {
|
pv2 {
|
||||||
nvidia,pins = "pv2";
|
nvidia,pins = "pv2";
|
||||||
|
@ -429,6 +447,15 @@
|
||||||
status = "okay";
|
status = "okay";
|
||||||
clock-frequency = <100000>;
|
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 {
|
pmic: tps65911@2d {
|
||||||
compatible = "ti,tps65911";
|
compatible = "ti,tps65911";
|
||||||
reg = <0x2d>;
|
reg = <0x2d>;
|
||||||
|
@ -660,6 +687,12 @@
|
||||||
nvidia,sys-clock-req-active-high;
|
nvidia,sys-clock-req-active-high;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ahub@70080000 {
|
||||||
|
i2s@70080500 {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
/* eMMC */
|
/* eMMC */
|
||||||
sdhci@78000600 {
|
sdhci@78000600 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
@ -733,4 +766,20 @@
|
||||||
regulator-always-on;
|
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";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -29,6 +29,24 @@
|
||||||
pinctrl-0 = <&state_default>;
|
pinctrl-0 = <&state_default>;
|
||||||
|
|
||||||
state_default: pinmux {
|
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 */
|
/* Colibri BL_ON */
|
||||||
pv2 {
|
pv2 {
|
||||||
nvidia,pins = "pv2";
|
nvidia,pins = "pv2";
|
||||||
|
@ -207,6 +225,15 @@
|
||||||
status = "okay";
|
status = "okay";
|
||||||
clock-frequency = <100000>;
|
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 {
|
pmic: tps65911@2d {
|
||||||
compatible = "ti,tps65911";
|
compatible = "ti,tps65911";
|
||||||
reg = <0x2d>;
|
reg = <0x2d>;
|
||||||
|
@ -396,6 +423,12 @@
|
||||||
nvidia,sys-clock-req-active-high;
|
nvidia,sys-clock-req-active-high;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ahub@70080000 {
|
||||||
|
i2s@70080500 {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
/* eMMC */
|
/* eMMC */
|
||||||
sdhci@78000600 {
|
sdhci@78000600 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
@ -471,4 +504,20 @@
|
||||||
regulator-always-on;
|
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";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -439,6 +439,19 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
gmi@70009000 {
|
||||||
|
compatible = "nvidia,tegra30-gmi";
|
||||||
|
reg = <0x70009000 0x1000>;
|
||||||
|
#address-cells = <2>;
|
||||||
|
#size-cells = <1>;
|
||||||
|
ranges = <0 0 0x48000000 0x7ffffff>;
|
||||||
|
clocks = <&tegra_car TEGRA30_CLK_NOR>;
|
||||||
|
clock-names = "gmi";
|
||||||
|
resets = <&tegra_car 42>;
|
||||||
|
reset-names = "gmi";
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
|
||||||
pwm: pwm@7000a000 {
|
pwm: pwm@7000a000 {
|
||||||
compatible = "nvidia,tegra30-pwm", "nvidia,tegra20-pwm";
|
compatible = "nvidia,tegra30-pwm", "nvidia,tegra20-pwm";
|
||||||
reg = <0x7000a000 0x100>;
|
reg = <0x7000a000 0x100>;
|
||||||
|
|
Loading…
Reference in New Issue