diff options
| author | Tom Rini <trini@konsulko.com> | 2016-02-23 15:35:47 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-02-23 15:35:47 -0500 |
| commit | 52dd704bf8eda7ca039cdb398ec0b6895c3ef939 (patch) | |
| tree | 16218aaacdd67330bfc1a6863a9f9dbcf73170fe /board | |
| parent | b625fab7069cab52fd8e0c3dbb25e0d04d020173 (diff) | |
| parent | dc44fd8ae4be0a88123a90ae2b3acdec45290ecf (diff) | |
| download | talos-obmc-uboot-52dd704bf8eda7ca039cdb398ec0b6895c3ef939.tar.gz talos-obmc-uboot-52dd704bf8eda7ca039cdb398ec0b6895c3ef939.zip | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'board')
| -rw-r--r-- | board/sunxi/Kconfig | 5 | ||||
| -rw-r--r-- | board/sunxi/board.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index a334aa336d..5e9d3af336 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -372,11 +372,14 @@ config I2C3_ENABLE See I2C0_ENABLE help text. endif +if SUNXI_GEN_SUN6I config R_I2C_ENABLE bool "Enable the PRCM I2C/TWI controller" - default n + # This is used for the pmic on H3 + default y if SY8106A_POWER ---help--- Set this to y to enable the I2C controller which is part of the PRCM. +endif if MACH_SUN7I config I2C4_ENABLE diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 420481a9fb..15b7af634c 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -25,6 +25,7 @@ #include <asm/io.h> #include <nand.h> #include <net.h> +#include <sy8106a.h> #if defined CONFIG_VIDEO_LCD_PANEL_I2C && !(defined CONFIG_SPL_BUILD) /* So that we can use pin names in Kconfig and sunxi_name_to_gpio() */ @@ -436,6 +437,10 @@ void sunxi_board_init(void) int power_failed = 0; unsigned long ramsize; +#ifdef CONFIG_SY8106A_POWER + power_failed = sy8106a_set_vout1(CONFIG_SY8106A_VOUT1_VOLT); +#endif + #if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || \ defined CONFIG_AXP221_POWER || defined CONFIG_AXP818_POWER power_failed = axp_init(); |
