ARM: tegra: update PM375 pinmux setting
Bibek Basu [Wed, 19 Mar 2014 15:46:31 +0000 (20:46 +0530)]
Update PM375 pinmux by tristating the unusued
pins based on pinmux excel
T124_customer_pinmux_PM375_29Oct2013.xlsm

Bug 1483835

Change-Id: I1eaea4f5d40096d9a1d560f59561db2dce2dfda6
Signed-off-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-on: http://git-master/r/383907
Reviewed-by: Winnie Hsu <whsu@nvidia.com>

arch/arm/boot/dts/tegra124-platforms/tegra124-pm375-pinmux.dtsi

index 414f894..aafa28c 100644 (file)
                        nvidia,pins = "dap1_din_pn1";
                        nvidia,function = "i2s0";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
-                       nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+                       nvidia,pull = <TEGRA_PIN_PUPD_PULL_DOWN>;
                        nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                dap1_dout_pn2 {
                        nvidia,pins = "dap1_dout_pn2";
-//                     nvidia,function = "i2s0";
                        nvidia,function = "sata";
-//                     nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-//                     nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                        nvidia,tristate = <TEGRA_PIN_NORMAL>;
                };
 
                        nvidia,pins = "dap1_fs_pn0";
                        nvidia,function = "i2s0";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
-                       nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+                       nvidia,pull = <TEGRA_PIN_PUPD_PULL_DOWN>;
                        nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
                dap1_sclk_pn3 {
                        nvidia,pins = "dap1_sclk_pn3";
                        nvidia,function = "i2s0";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
-                       nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+                       nvidia,pull = <TEGRA_PIN_PUPD_PULL_DOWN>;
                        nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                        nvidia,function = "spi4";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                pg5 {
                        nvidia,function = "soc";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                kb_row15_ps7 {
                sdmmc1_clk_pz0 {
                        nvidia,pins = "sdmmc1_clk_pz0";
                        nvidia,function = "sdmmc1";
-                       nvidia,enable-input = <TEGRA_PIN_INPUT>;
+                       nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                sdmmc1_cmd_pz1 {
                        nvidia,function = "sdmmc1";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                sdmmc1_dat0_py7 {
                        nvidia,function = "sdmmc1";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                sdmmc1_dat1_py6 {
                        nvidia,function = "sdmmc1";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                sdmmc1_dat2_py5 {
                        nvidia,function = "sdmmc1";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                sdmmc1_dat3_py4 {
                        nvidia,function = "sdmmc1";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                sdmmc3_clk_pa6 {
                        nvidia,function = "sys";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                kb_row6_pr6 {
                        nvidia,pins = "dap4_din_pp5";
                        nvidia,function = "i2s3";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
-                       nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+                       nvidia,pull = <TEGRA_PIN_PUPD_PULL_DOWN>;
                        nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                        nvidia,pins = "dap4_dout_pp6";
                        nvidia,function = "i2s3";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
-                       nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+                       nvidia,pull = <TEGRA_PIN_PUPD_PULL_DOWN>;
                        nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                        nvidia,pins = "dap4_fs_pp4";
                        nvidia,function = "i2s3";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
-                       nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+                       nvidia,pull = <TEGRA_PIN_PUPD_PULL_DOWN>;
                        nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                        nvidia,pins = "dap4_sclk_pp7";
                        nvidia,function = "i2s3";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
-                       nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
+                       nvidia,pull = <TEGRA_PIN_PUPD_PULL_DOWN>;
                        nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                        nvidia,pins = "uart3_cts_n_pa1";
                        nvidia,function = "uartc";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
-                       nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                uart3_rts_n_pc0 {
                        nvidia,function = "uartc";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                uart3_rxd_pw7 {
                        nvidia,pins = "uart3_rxd_pw7";
                        nvidia,function = "uartc";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
-                       nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                uart3_txd_pw6 {
                        nvidia,function = "uartc";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                hdmi_cec_pee3 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                gpio_x4_aud_px4 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                gpio_x6_aud_px6 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                gpio_x7_aud_px7 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                gpio_w3_aud_pw3 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                gpio_x1_aud_px1 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                dap3_din_pp1 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                dap3_dout_pp2 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                pv0 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                pv1 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                ulpi_data0_po1 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                        };
 
                ulpi_data2_po3 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                        };
 
                ulpi_data4_po5 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                ulpi_data5_po6 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                ulpi_data6_po7 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                ulpi_data7_po0 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                pbb3 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                ph4 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                ph6 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                pg2 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_DOWN>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                pg3 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_DOWN>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                pk1 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                pj2 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                pk3 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                pk4 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                pi5 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                pi4 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                pc7 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                pi0 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                pex_l1_clkreq_n_pdd6 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                clk2_req_pcc5 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                kb_col0_pq0 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                kb_col2_pq2 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                kb_col5_pq5 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                kb_col7_pq7 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                kb_row0_pr0 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                kb_row11_ps3 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                kb_row12_ps4 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                kb_row13_ps5 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                kb_row16_pt0 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                kb_row5_pr5 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                kb_row7_pr7 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_INPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_PULL_UP>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                clk3_req_pee1 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                pu0 {
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
                        nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
-                       nvidia,tristate = <TEGRA_PIN_NORMAL>;
+                       nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };
 
                spdif_in_pk6 {
                        nvidia,pins = "pi1";
                        nvidia,function = "safe";
                        nvidia,enable-input = <TEGRA_PIN_OUTPUT>;
-                       nvidia,pull = <TEGRA_PIN_PUPD_PULL_DOWN>;
+                       nvidia,pull = <TEGRA_PIN_PUPD_NORMAL>;
                        nvidia,tristate = <TEGRA_PIN_TRISTATE>;
                };