[U-Boot] [PATCH 1/2] ARM: tegra: add function to clear pinmux CLAMPING bit

[Stephen Warren]

From: Stephen Warren <swarren at nvidia.com>

This is needed to correctly apply the new Jetson TK1 pinmux config.

Signed-off-by: Stephen Warren <swarren at nvidia.com>
---
 arch/arm/cpu/tegra-common/pinmux-common.c | 10 ++++++++++
 arch/arm/include/asm/arch-tegra/pinmux.h  |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/arch/arm/cpu/tegra-common/pinmux-common.c b/arch/arm/cpu/tegra-common/pinmux-common.c
index 6e3ab0c14ca2..692de7629b9b 100644
--- a/arch/arm/cpu/tegra-common/pinmux-common.c
+++ b/arch/arm/cpu/tegra-common/pinmux-common.c
@@ -100,6 +100,16 @@ void pinmux_set_tristate_input_clamping(void)
 	val |= CLAMP_INPUTS_WHEN_TRISTATED;
 	writel(val, reg);
 }
+
+void pinmux_clear_tristate_input_clamping(void)
+{
+	u32 *reg = _R(APB_MISC_PP_PINMUX_GLOBAL_0);
+	u32 val;
+
+	val = readl(reg);
+	val &= ~CLAMP_INPUTS_WHEN_TRISTATED;
+	writel(val, reg);
+}
 #endif
 
 void pinmux_set_func(enum pmux_pingrp pin, enum pmux_func func)
diff --git a/arch/arm/include/asm/arch-tegra/pinmux.h b/arch/arm/include/asm/arch-tegra/pinmux.h
index da477697bf02..ab764960fa7f 100644
--- a/arch/arm/include/asm/arch-tegra/pinmux.h
+++ b/arch/arm/include/asm/arch-tegra/pinmux.h
@@ -81,8 +81,9 @@ struct pmux_pingrp_config {
 };
 
 #if !defined(CONFIG_TEGRA20) && !defined(CONFIG_TEGRA30)
-/* Set the pinmux CLAMP_INPUTS_WHEN_TRISTATED bit */
+/* Set/clear the pinmux CLAMP_INPUTS_WHEN_TRISTATED bit */
 void pinmux_set_tristate_input_clamping(void);
+void pinmux_clear_tristate_input_clamping(void);
 #endif
 
 /* Set the mux function for a pin group */
-- 
1.9.1