projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
[oweals/u-boot.git]
/
board
/
nvidia
/
venice2
/
venice2.c
diff --git
a/board/nvidia/venice2/venice2.c
b/board/nvidia/venice2/venice2.c
index 1ed2fd788ec17042cc5528ec2aee0d8960364104..c56ef129d6c7a5138994e1e3e213a5dd63d30010 100644
(file)
--- a/
board/nvidia/venice2/venice2.c
+++ b/
board/nvidia/venice2/venice2.c
@@
-6,12
+6,9
@@
*/
#include <common.h>
*/
#include <common.h>
-#include <asm-generic/gpio.h>
#include <asm/arch/gpio.h>
#include <asm/arch/gpio.h>
-#include <asm/arch/gp_padctrl.h>
#include <asm/arch/pinmux.h>
#include "pinmux-config-venice2.h"
#include <asm/arch/pinmux.h>
#include "pinmux-config-venice2.h"
-#include <i2c.h>
/*
* Routine: pinmux_init
/*
* Routine: pinmux_init
@@
-19,15
+16,14
@@
*/
void pinmux_init(void)
{
*/
void pinmux_init(void)
{
- pinmux_config_table(tegra124_pinmux_set_nontristate,
- ARRAY_SIZE(tegra124_pinmux_set_nontristate));
+ pinmux_set_tristate_input_clamping();
-
pinmux_config_table(tegra124_pinmux_common
,
-
ARRAY_SIZE(tegra124_pinmux_common
));
+
gpio_config_table(venice2_gpio_inits
,
+
ARRAY_SIZE(venice2_gpio_inits
));
- pinmux_config_
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) */
-
padgrp_config_table(venice2_padctrl, ARRAY_SIZE(venice2_padctrl
));
+ pinmux_config_drvgrp_table(venice2_drvgrps,
+
ARRAY_SIZE(venice2_drvgrps
));
}
}