diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-02 16:32:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-02 16:32:05 -0500 |
| commit | 516457013e5a88f65f9d6c11e9171cb03871cc92 (patch) | |
| tree | 583cfafeddbacd1d1a456f49f1e687c4eb8e062c /board/udoo | |
| parent | 99b02b4dce0b2fc759fb8ced5701c0d4fb7b2200 (diff) | |
| parent | 7c4f0ff81e6fc3b58b8af5f64c3da98624e40132 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'board/udoo')
| -rw-r--r-- | board/udoo/neo/neo.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c index 688b522ce3..530c45f600 100644 --- a/board/udoo/neo/neo.c +++ b/board/udoo/neo/neo.c @@ -349,9 +349,9 @@ int board_init(void) /* Active high for ncp692 */ gpio_direction_output(IMX_GPIO_NR(4, 16) , 1); - #ifdef CONFIG_SYS_I2C_MXC +#ifdef CONFIG_SYS_I2C_MXC setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); - #endif +#endif return 0; } @@ -389,9 +389,8 @@ int board_early_init_f(void) return 0; } -static struct fsl_esdhc_cfg usdhc_cfg[2] = { +static struct fsl_esdhc_cfg usdhc_cfg[1] = { {USDHC2_BASE_ADDR, 0, 4}, - {USDHC3_BASE_ADDR, 0, 4}, }; #define USDHC2_PWR_GPIO IMX_GPIO_NR(6, 1) |