summaryrefslogtreecommitdiffstats
path: root/board/nvidia/venice2/venice2.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2014-04-22 14:37:57 -0600
committerTom Warren <twarren@nvidia.com>2014-05-13 10:41:32 -0700
commit2eba87a30a0a119b21e3a99fa9d49f041722214d (patch)
tree522c2695af42d6fb4c17663ab1c595e8da4f32b8 /board/nvidia/venice2/venice2.c
parent4ff213b8e478ee06feaee3505b4228163661bd3f (diff)
downloadblackbird-obmc-uboot-2eba87a30a0a119b21e3a99fa9d49f041722214d.tar.gz
blackbird-obmc-uboot-2eba87a30a0a119b21e3a99fa9d49f041722214d.zip
ARM: tegra: update Venice2 pinmux
This re-imports the entire Venice2 pinmux data from the board's master spreadsheet, and makes use of the new IO clamping GPIO initialization table features. This makes the board port fully compliant with the required HW-defined pinmux initialization sequence. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'board/nvidia/venice2/venice2.c')
-rw-r--r--board/nvidia/venice2/venice2.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/board/nvidia/venice2/venice2.c b/board/nvidia/venice2/venice2.c
index 15082c4195..c56ef129d6 100644
--- a/board/nvidia/venice2/venice2.c
+++ b/board/nvidia/venice2/venice2.c
@@ -6,12 +6,9 @@
*/
#include <common.h>
-#include <asm-generic/gpio.h>
#include <asm/arch/gpio.h>
-#include <asm/arch/gp_padctrl.h>
#include <asm/arch/pinmux.h>
#include "pinmux-config-venice2.h"
-#include <i2c.h>
/*
* Routine: pinmux_init
@@ -19,16 +16,14 @@
*/
void pinmux_init(void)
{
- pinmux_config_pingrp_table(tegra124_pinmux_set_nontristate,
- ARRAY_SIZE(tegra124_pinmux_set_nontristate));
+ pinmux_set_tristate_input_clamping();
- pinmux_config_pingrp_table(tegra124_pinmux_common,
- ARRAY_SIZE(tegra124_pinmux_common));
+ gpio_config_table(venice2_gpio_inits,
+ ARRAY_SIZE(venice2_gpio_inits));
- pinmux_config_pingrp_table(unused_pins_lowpower,
- ARRAY_SIZE(unused_pins_lowpower));
+ pinmux_config_pingrp_table(venice2_pingrps,
+ ARRAY_SIZE(venice2_pingrps));
- /* Initialize any non-default pad configs (APB_MISC_GP regs) */
- pinmux_config_drvgrp_table(venice2_padctrl,
- ARRAY_SIZE(venice2_padctrl));
+ pinmux_config_drvgrp_table(venice2_drvgrps,
+ ARRAY_SIZE(venice2_drvgrps));
}
OpenPOWER on IntegriCloud