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

Commit a6b69a76 authored by Andreas Obergschwandtner's avatar Andreas Obergschwandtner Committed by Greg Kroah-Hartman
Browse files

ARM: tegra: tamonten: Fix UART pad setting 



[ Upstream commit 2270ad2f4e123336af685ecedd1618701cb4ca1e ]

This patch fixes the tristate and pullup configuration for UART 1 to 3
on the Tamonten SOM.

Signed-off-by: default avatarAndreas Obergschwandtner <andreas.obergschwandtner@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a66049c5

arch/arm/boot/dts/tegra20-tamonten.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -185,8 +185,9 @@ 
				nvidia,pins = "ata", "atb", "atc", "atd", "ate",

					"cdev1", "cdev2", "dap1", "dtb", "gma",

					"gmb", "gmc", "gmd", "gme", "gpu7",

					"gpv", "i2cp", "pta", "rm", "slxa",

					"slxk", "spia", "spib", "uac";

					"gpv", "i2cp", "irrx", "irtx", "pta",

					"rm", "slxa", "slxk", "spia", "spib",

					"uac";

				nvidia,pull = <TEGRA_PIN_PULL_NONE>;

				nvidia,tristate = <TEGRA_PIN_DISABLE>;

			};
@@ -211,7 +212,7 @@ 
			conf_ddc {

				nvidia,pins = "ddc", "dta", "dtd", "kbca",

					"kbcb", "kbcc", "kbcd", "kbce", "kbcf",

					"sdc";

					"sdc", "uad", "uca";

				nvidia,pull = <TEGRA_PIN_PULL_UP>;

				nvidia,tristate = <TEGRA_PIN_DISABLE>;

			};
@@ -221,10 +222,9 @@ 
					"lvp0", "owc", "sdb";

				nvidia,tristate = <TEGRA_PIN_ENABLE>;

			};

			conf_irrx {

				nvidia,pins = "irrx", "irtx", "sdd", "spic",

					"spie", "spih", "uaa", "uab", "uad",

					"uca", "ucb";

			conf_sdd {

				nvidia,pins = "sdd", "spic", "spie", "spih",

					"uaa", "uab", "ucb";

				nvidia,pull = <TEGRA_PIN_PULL_UP>;

				nvidia,tristate = <TEGRA_PIN_ENABLE>;

			};