diff options
author | Tom Rini <trini@ti.com> | 2014-05-09 11:18:45 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-05-09 11:18:45 -0400 |
commit | bcb879c0e37db1cf527ff408df93918f155012ea (patch) | |
tree | c092b7e27e69b3c419b6cd238768ceb73f793644 /board/nvidia/venice2/venice2.c | |
parent | 146b468eb0203c9b1aa1de93723ffc82c85d1dc1 (diff) | |
parent | d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19 (diff) | |
download | u-boot-imx-bcb879c0e37db1cf527ff408df93918f155012ea.zip u-boot-imx-bcb879c0e37db1cf527ff408df93918f155012ea.tar.gz u-boot-imx-bcb879c0e37db1cf527ff408df93918f155012ea.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/nvidia/venice2/venice2.c')
-rw-r--r-- | board/nvidia/venice2/venice2.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/board/nvidia/venice2/venice2.c b/board/nvidia/venice2/venice2.c index 1ed2fd7..15082c4 100644 --- a/board/nvidia/venice2/venice2.c +++ b/board/nvidia/venice2/venice2.c @@ -19,15 +19,16 @@ */ void pinmux_init(void) { - pinmux_config_table(tegra124_pinmux_set_nontristate, - ARRAY_SIZE(tegra124_pinmux_set_nontristate)); + pinmux_config_pingrp_table(tegra124_pinmux_set_nontristate, + ARRAY_SIZE(tegra124_pinmux_set_nontristate)); - pinmux_config_table(tegra124_pinmux_common, - ARRAY_SIZE(tegra124_pinmux_common)); + pinmux_config_pingrp_table(tegra124_pinmux_common, + ARRAY_SIZE(tegra124_pinmux_common)); - pinmux_config_table(unused_pins_lowpower, - ARRAY_SIZE(unused_pins_lowpower)); + pinmux_config_pingrp_table(unused_pins_lowpower, + ARRAY_SIZE(unused_pins_lowpower)); /* Initialize any non-default pad configs (APB_MISC_GP regs) */ - padgrp_config_table(venice2_padctrl, ARRAY_SIZE(venice2_padctrl)); + pinmux_config_drvgrp_table(venice2_padctrl, + ARRAY_SIZE(venice2_padctrl)); } |