aboutsummaryrefslogtreecommitdiff
path: root/src/soc/nvidia/tegra
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/nvidia/tegra')
-rw-r--r--src/soc/nvidia/tegra/apbmisc.c8
-rw-r--r--src/soc/nvidia/tegra/apbmisc.h6
-rw-r--r--src/soc/nvidia/tegra/gpio.c2
3 files changed, 14 insertions, 2 deletions
diff --git a/src/soc/nvidia/tegra/apbmisc.c b/src/soc/nvidia/tegra/apbmisc.c
index fea10b5dbe..5983d546d2 100644
--- a/src/soc/nvidia/tegra/apbmisc.c
+++ b/src/soc/nvidia/tegra/apbmisc.c
@@ -22,8 +22,14 @@
#include "apbmisc.h"
+static struct apbmisc *misc = (struct apbmisc *)TEGRA_APB_MISC_BASE;
+
void enable_jtag(void)
{
- struct apbmisc *misc = (struct apbmisc *)TEGRA_APB_MISC_BASE;
write32(PP_CONFIG_CTL_JTAG, &misc->pp_config_ctl);
}
+
+void clamp_tristate_inputs(void)
+{
+ write32(PP_PINMUX_CLAMP_INPUTS, &misc->pp_pinmux_global);
+}
diff --git a/src/soc/nvidia/tegra/apbmisc.h b/src/soc/nvidia/tegra/apbmisc.h
index 805d0bf18b..2f1811a1dd 100644
--- a/src/soc/nvidia/tegra/apbmisc.h
+++ b/src/soc/nvidia/tegra/apbmisc.h
@@ -25,11 +25,17 @@
struct apbmisc {
u32 reserved0[9]; /* ABP_MISC_PP_ offsets 00-20 */
u32 pp_config_ctl; /* _CONFIG_CTL_0, offset 24 */
+ u32 reserved1[6]; /* APB_MISC_PP_ offsets 28-3C */
+ u32 pp_pinmux_global; /* _PINMUX_GLOBAL_0, offset 40 */
};
#define PP_CONFIG_CTL_TBE (1 << 7)
#define PP_CONFIG_CTL_JTAG (1 << 6)
+#define PP_PINMUX_CLAMP_INPUTS (1 << 0)
+
+
void enable_jtag(void);
+void clamp_tristate_inputs(void);
#endif /* __SOC_NVIDIA_TEGRA_APBMISC_H__ */
diff --git a/src/soc/nvidia/tegra/gpio.c b/src/soc/nvidia/tegra/gpio.c
index ac0fc3f986..b10cded12d 100644
--- a/src/soc/nvidia/tegra/gpio.c
+++ b/src/soc/nvidia/tegra/gpio.c
@@ -29,7 +29,7 @@
void __gpio_input(gpio_t gpio, u32 pull)
{
- u32 pinmux_config = PINMUX_INPUT_ENABLE | PINMUX_TRISTATE | pull;
+ u32 pinmux_config = PINMUX_INPUT_ENABLE | pull;
gpio_set_int_enable(gpio, 0);
gpio_set_out_enable(gpio, 0);