diff options
| author | Tom Rini <trini@ti.com> | 2013-07-12 10:36:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-12 10:36:48 -0400 |
| commit | fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc (patch) | |
| tree | 9c91526cefd027d9bd964572d4f92bd2d1376c5d /board/samsung/smdk5250/smdk5250.c | |
| parent | d72da1582895ca226b995758426ec3769b54a9b8 (diff) | |
| parent | efc284e32503b240dbd35c6e8b8d098d702b4be7 (diff) | |
| download | u-boot-imx-fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc.zip u-boot-imx-fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc.tar.gz u-boot-imx-fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.
Conflicts:
arch/arm/dts/exynos5250.dtsi
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'board/samsung/smdk5250/smdk5250.c')
| -rw-r--r-- | board/samsung/smdk5250/smdk5250.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c index 276fd41..f1d3d97 100644 --- a/board/samsung/smdk5250/smdk5250.c +++ b/board/samsung/smdk5250/smdk5250.c @@ -144,7 +144,7 @@ int power_init_board(void) /* VDD_MIF */ if (pmic_reg_write(p, MAX77686_REG_PMIC_BUCK1OUT, - MAX77686_BUCK1OUT_1V)) { + MAX77686_BUCK1OUT_1_05V)) { debug("%s: PMIC %d register write failed\n", __func__, MAX77686_REG_PMIC_BUCK1OUT); return -1; @@ -332,6 +332,16 @@ static int board_uart_init(void) return ret; } +void board_i2c_init(const void *blob) +{ + int i; + + for (i = 0; i < CONFIG_MAX_I2C_NUM; i++) { + exynos_pinmux_config((PERIPH_ID_I2C0 + i), + PINMUX_FLAG_NONE); + } +} + #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { |