diff options
| author | Tom Rini <trini@ti.com> | 2015-02-02 10:11:44 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-02 10:11:44 -0500 |
| commit | be8ddad9c85935569a00b72f92cdc34e4386850f (patch) | |
| tree | 9cfff8c5cc13f0518f3dfe3a35f558e2a5637f95 /include | |
| parent | 358b8bc204f365be28fed94f23e53e04183a8c7f (diff) | |
| parent | 5abdb156bb5c2685744be3620c4bdb1875bd81ce (diff) | |
| download | blackbird-obmc-uboot-be8ddad9c85935569a00b72f92cdc34e4386850f.tar.gz blackbird-obmc-uboot-be8ddad9c85935569a00b72f92cdc34e4386850f.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'include')
| -rw-r--r-- | include/axp221.h | 1 | ||||
| -rw-r--r-- | include/configs/sunxi-common.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/axp221.h b/include/axp221.h index 6f24a617b6..a20e25c2f8 100644 --- a/include/axp221.h +++ b/include/axp221.h @@ -12,7 +12,6 @@ #define AXP223_DEVICE_ADDR 0x3a3 #define AXP223_RUNTIME_ADDR 0x2d -#define AXP223_DEVICE_MODE_DATA 0x7c3e00 /* Page 0 addresses */ #define AXP221_CHIP_ID 0x03 diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 4a5cab25d4..6cfd7e1489 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -181,7 +181,10 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x00080000 /* 512 KiB */ /* I2C */ +#if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER #define CONFIG_SPL_I2C_SUPPORT +#endif + #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MVTWSI #define CONFIG_SYS_I2C_SPEED 400000 |
