arm: tegra: norrin: update Norrin pinmux table

Change-Id: I2ee46fbb7b497ab32c2f32b804342db7a657031a
Signed-off-by: Hayden Du <haydend@nvidia.com>
Reviewed-on: http://git-master/r/345144
Reviewed-by: Alexander Van Brunt <avanbrunt@nvidia.com>

1 files changed, 122 insertions, 124 deletions

diff --git a/arch/arm/boot/dts/tegra124-platforms/tegra124-pm374-pinmux.dtsi b/arch/arm/boot/dts/tegra124-platforms/tegra124-pm374-pinmux.dtsi
index bcec140d3862..3746f206457c 100644
--- a/arch/arm/boot/dts/tegra124-platforms/tegra124-pm374-pinmux.dtsi
+++ b/arch/arm/boot/dts/tegra124-platforms/tegra124-pm374-pinmux.dtsi
@@ -202,6 +202,14 @@
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
 
+		pbb4 {
+			nvidia,pins = "pbb4";
+			nvidia,function = "vgp4";
+			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
+			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+			nvidia,tristate = <TEGRA_PIN_NORMAL>;
+		};
+
 		gen2_i2c_scl_pt5 {
 			nvidia,pins = "gen2_i2c_scl_pt5";
 			nvidia,function = "i2c2";
@@ -326,38 +334,6 @@
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
 
-		pex_l0_clkreq_n_pdd2 {
-			nvidia,pins = "pex_l0_clkreq_n_pdd2";
-			nvidia,function = "pe0";
-			nvidia,enable-input = <TEGRA_PIN_INPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-			nvidia,tristate = <TEGRA_PIN_NORMAL>;
-		};
-
-		pex_l0_rst_n_pdd1 {
-			nvidia,pins = "pex_l0_rst_n_pdd1";
-			nvidia,function = "pe0";
-			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-			nvidia,tristate = <TEGRA_PIN_NORMAL>;
-		};
-
-		pex_l1_rst_n_pdd5 {
-			nvidia,pins = "pex_l1_rst_n_pdd5";
-			nvidia,function = "pe1";
-			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-			nvidia,tristate = <TEGRA_PIN_NORMAL>;
-		};
-
-		pex_wake_n_pdd3 {
-			nvidia,pins = "pex_wake_n_pdd3";
-			nvidia,function = "pe";
-			nvidia,enable-input = <TEGRA_PIN_INPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-			nvidia,tristate = <TEGRA_PIN_NORMAL>;
-		};
-
 		sdmmc1_clk_pz0 {
 			nvidia,pins = "sdmmc1_clk_pz0";
 			nvidia,function = "sdmmc1";
@@ -635,7 +611,7 @@
 		clk2_out_pw5 {
 			nvidia,pins = "clk2_out_pw5";
 			nvidia,function = "extperiph2";
-			nvidia,enable-input = <TEGRA_PIN_INPUT>;
+			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
 			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
@@ -684,7 +660,7 @@
 			nvidia,pins = "dp_hpd_pff0";
 			nvidia,function = "dp";
 			nvidia,enable-input = <TEGRA_PIN_INPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+			nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
 
@@ -835,8 +811,8 @@
 			nvidia,enable-input = <TEGRA_PIN_INPUT>;
 			nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
-			nvidia,lock = <TEGRA_PIN_LOCK_DISABLE>;
-			nvidia,open-drain = <TEGRA_PIN_OPEN_DRAIN_DISABLE>;
+			nvidia,lock = <TEGRA_PIN_LOCK_ENABLE>;
+			nvidia,open-drain = <TEGRA_PIN_OPEN_DRAIN_ENABLE>;
 		};
 
 		usb_vbus_en1_pn5 {
@@ -845,24 +821,22 @@
 			nvidia,enable-input = <TEGRA_PIN_INPUT>;
 			nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
-			nvidia,lock = <TEGRA_PIN_LOCK_DISABLE>;
-			nvidia,open-drain = <TEGRA_PIN_OPEN_DRAIN_DISABLE>;
+			nvidia,lock = <TEGRA_PIN_LOCK_ENABLE>;
+			nvidia,open-drain = <TEGRA_PIN_OPEN_DRAIN_ENABLE>;
 		};
 
 		usb_vbus_en2_pff1 {
 			nvidia,pins = "usb_vbus_en2_pff1";
-			nvidia,function = "usb";
-			nvidia,enable-input = <TEGRA_PIN_INPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
+			nvidia,function = "safe";
+			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
+			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
-			nvidia,lock = <TEGRA_PIN_LOCK_DISABLE>;
-			nvidia,open-drain = <TEGRA_PIN_OPEN_DRAIN_DISABLE>;
 		};
 
 		gpio_x4_aud_px4 {
 			nvidia,pins = "gpio_x4_aud_px4";
 			nvidia,function = "safe";
-			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
+			nvidia,enable-input = <TEGRA_PIN_INPUT>;
 			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
@@ -910,7 +884,7 @@
 		gpio_x1_aud_px1 {
 			nvidia,pins = "gpio_x1_aud_px1";
 			nvidia,function = "safe";
-			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
+			nvidia,enable-input = <TEGRA_PIN_INPUT>;
 			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
@@ -923,14 +897,6 @@
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
 
-		dap3_din_pp1 {
-			nvidia,pins = "dap3_din_pp1";
-			nvidia,function = "safe";
-			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-			nvidia,tristate = <TEGRA_PIN_NORMAL>;
-		};
-
 		dap3_dout_pp2 {
 			nvidia,pins = "dap3_dout_pp2";
 			nvidia,function = "safe";
@@ -939,14 +905,6 @@
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
 
-		dap3_fs_pp0 {
-			nvidia,pins = "dap3_fs_pp0";
-			nvidia,function = "safe";
-			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-			nvidia,tristate = <TEGRA_PIN_NORMAL>;
-		};
-
 		pv0 {
 			nvidia,pins = "pv0";
 			nvidia,function = "safe";
@@ -1003,14 +961,6 @@
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
 
-		pbb4 {
-			nvidia,pins = "pbb4";
-			nvidia,function = "safe";
-			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-			nvidia,tristate = <TEGRA_PIN_NORMAL>;
-		};
-
 		pbb5 {
 			nvidia,pins = "pbb5";
 			nvidia,function = "safe";
@@ -1107,6 +1057,14 @@
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
 
+		ph7 {
+			nvidia,pins = "ph7";
+			nvidia,function = "safe";
+			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
+			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+			nvidia,tristate = <TEGRA_PIN_NORMAL>;
+		};
+
 		pg2 {
 			nvidia,pins = "pg2";
 			nvidia,function = "safe";
@@ -1139,14 +1097,6 @@
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
 
-		pj2 {
-			nvidia,pins = "pj2";
-			nvidia,function = "safe";
-			nvidia,enable-input = <TEGRA_PIN_INPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-			nvidia,tristate = <TEGRA_PIN_NORMAL>;
-		};
-
 		pk3 {
 			nvidia,pins = "pk3";
 			nvidia,function = "safe";
@@ -1190,8 +1140,8 @@
 		pi5 {
 			nvidia,pins = "pi5";
 			nvidia,function = "safe";
-			nvidia,enable-input = <TEGRA_PIN_INPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
+			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
+			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
 
@@ -1219,19 +1169,11 @@
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
 
-		pex_l1_clkreq_n_pdd6 {
-			nvidia,pins = "pex_l1_clkreq_n_pdd6";
-			nvidia,function = "safe";
-			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-			nvidia,tristate = <TEGRA_PIN_NORMAL>;
-		};
-
 		pff2 {
 			nvidia,pins = "pff2";
 			nvidia,function = "safe";
-			nvidia,enable-input = <TEGRA_PIN_INPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
+			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
+			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
 
@@ -1243,6 +1185,14 @@
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
 
+		sdmmc1_wp_n_pv3 {
+			nvidia,pins = "sdmmc1_wp_n_pv3";
+			nvidia,function = "safe";
+			nvidia,enable-input = <TEGRA_PIN_INPUT>;
+			nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
+			nvidia,tristate = <TEGRA_PIN_NORMAL>;
+		};
+
 		kb_col0_pq0 {
 			nvidia,pins = "kb_col0_pq0";
 			nvidia,function = "safe";
@@ -1323,14 +1273,6 @@
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
 
-		kb_row13_ps5 {
-			nvidia,pins = "kb_row13_ps5";
-			nvidia,function = "safe";
-			nvidia,enable-input = <TEGRA_PIN_INPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-			nvidia,tristate = <TEGRA_PIN_NORMAL>;
-		};
-
 		kb_row14_ps6 {
 			nvidia,pins = "kb_row14_ps6";
 			nvidia,function = "safe";
@@ -1339,14 +1281,6 @@
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
 
-		kb_row16_pt0 {
-			nvidia,pins = "kb_row16_pt0";
-			nvidia,function = "safe";
-			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-			nvidia,tristate = <TEGRA_PIN_NORMAL>;
-		};
-
 		kb_row17_pt1 {
 			nvidia,pins = "kb_row17_pt1";
 			nvidia,function = "safe";
@@ -1371,14 +1305,6 @@
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
 
-		kb_row5_pr5 {
-			nvidia,pins = "kb_row5_pr5";
-			nvidia,function = "safe";
-			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-			nvidia,tristate = <TEGRA_PIN_NORMAL>;
-		};
-
 		kb_row7_pr7 {
 			nvidia,pins = "kb_row7_pr7";
 			nvidia,function = "safe";
@@ -1469,7 +1395,7 @@
 
 		spdif_out_pk5 {
 			nvidia,pins = "spdif_out_pk5";
-			nvidia,function = "safe";
+			nvidia,function = "spdif";
 			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
 			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
 			nvidia,tristate = <TEGRA_PIN_NORMAL>;
@@ -1484,16 +1410,24 @@
 		};
 	};
 	pinmux_unused_lowpower: unused_lowpower {
-		dap3_sclk_pp3 {
-			nvidia,pins = "dap3_sclk_pp3";
+		dap3_din_pp1 {
+			nvidia,pins = "dap3_din_pp1";
 			nvidia,function = "safe";
 			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_PULL_DOWN>;
-			nvidia,tristate = <TEGRA_PIN_TRISTATE>;
+			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
 
-		ph7 {
-			nvidia,pins = "ph7";
+		dap3_fs_pp0 {
+			nvidia,pins = "dap3_fs_pp0";
+			nvidia,function = "safe";
+			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
+			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+			nvidia,tristate = <TEGRA_PIN_NORMAL>;
+		};
+
+		dap3_sclk_pp3 {
+			nvidia,pins = "dap3_sclk_pp3";
 			nvidia,function = "safe";
 			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
 			nvidia,pull = <TEGRA_PIN_PUPD_PULL_DOWN>;
@@ -1508,6 +1442,14 @@
 			nvidia,tristate = <TEGRA_PIN_TRISTATE>;
 		};
 
+		pj2 {
+			nvidia,pins = "pj2";
+			nvidia,function = "safe";
+			nvidia,enable-input = <TEGRA_PIN_INPUT>;
+			nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
+			nvidia,tristate = <TEGRA_PIN_NORMAL>;
+		};
+
 		pi1 {
 			nvidia,pins = "pi1";
 			nvidia,function = "safe";
@@ -1524,12 +1466,44 @@
 			nvidia,tristate = <TEGRA_PIN_TRISTATE>;
 		};
 
-		sdmmc1_wp_n_pv3 {
-			nvidia,pins = "sdmmc1_wp_n_pv3";
+		pex_l0_clkreq_n_pdd2 {
+			nvidia,pins = "pex_l0_clkreq_n_pdd2";
+			nvidia,function = "pe0";
+			nvidia,enable-input = <TEGRA_PIN_INPUT>;
+			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+			nvidia,tristate = <TEGRA_PIN_NORMAL>;
+		};
+
+		pex_l0_rst_n_pdd1 {
+			nvidia,pins = "pex_l0_rst_n_pdd1";
+			nvidia,function = "pe0";
+			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
+			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+			nvidia,tristate = <TEGRA_PIN_NORMAL>;
+		};
+
+		pex_l1_rst_n_pdd5 {
+			nvidia,pins = "pex_l1_rst_n_pdd5";
+			nvidia,function = "pe1";
+			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
+			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+			nvidia,tristate = <TEGRA_PIN_NORMAL>;
+		};
+
+		pex_l1_clkreq_n_pdd6 {
+			nvidia,pins = "pex_l1_clkreq_n_pdd6";
 			nvidia,function = "safe";
 			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
-			nvidia,pull = <TEGRA_PIN_PUPD_PULL_DOWN>;
-			nvidia,tristate = <TEGRA_PIN_TRISTATE>;
+			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+			nvidia,tristate = <TEGRA_PIN_NORMAL>;
+		};
+
+		pex_wake_n_pdd3 {
+			nvidia,pins = "pex_wake_n_pdd3";
+			nvidia,function = "pe";
+			nvidia,enable-input = <TEGRA_PIN_INPUT>;
+			nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
+			nvidia,tristate = <TEGRA_PIN_NORMAL>;
 		};
 
 		kb_col3_pq3 {
@@ -1540,6 +1514,30 @@
 			nvidia,tristate = <TEGRA_PIN_TRISTATE>;
 		};
 
+		kb_row13_ps5 {
+			nvidia,pins = "kb_row13_ps5";
+			nvidia,function = "safe";
+			nvidia,enable-input = <TEGRA_PIN_INPUT>;
+			nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
+			nvidia,tristate = <TEGRA_PIN_NORMAL>;
+		};
+
+		kb_row16_pt0 {
+			nvidia,pins = "kb_row16_pt0";
+			nvidia,function = "safe";
+			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
+			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+			nvidia,tristate = <TEGRA_PIN_NORMAL>;
+		};
+
+		kb_row5_pr5 {
+			nvidia,pins = "kb_row5_pr5";
+			nvidia,function = "safe";
+			nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
+			nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+			nvidia,tristate = <TEGRA_PIN_NORMAL>;
+		};
+
 		owr {
 			nvidia,pins = "owr";
 			nvidia,function = "safe";