diff options
| author | Simon Glass <sjg@chromium.org> | 2017-04-27 04:27:47 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-30 14:29:53 (GMT) |
| commit | 0fd28b1f0ed85fe80e68b112259e21c6275da56f (patch) | |
| tree | 25155621f454bb415ec5ee04f8f7b51a3c028501 | |
| parent | bdf25a5e04078951e5b7fef4f4c432e88263244f (diff) | |
| download | u-boot-0fd28b1f0ed85fe80e68b112259e21c6275da56f.tar.xz | |
power: Drop CONFIG_I2C_PMIC
This is only used by one board and should not be a CONFIG option. Instead
it should use the driver model pmic framework. For now, just move the
setting into the only board that uses it.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | board/gateworks/gw_ventana/common.c | 7 | ||||
| -rw-r--r-- | include/configs/gw_ventana.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c index 56a7b3e..d27bd57 100644 --- a/board/gateworks/gw_ventana/common.c +++ b/board/gateworks/gw_ventana/common.c @@ -1272,14 +1272,15 @@ void setup_pmic(void) struct pmic *p; struct ventana_board_info ventana_info; int board = read_eeprom(CONFIG_I2C_GSC, &ventana_info); + const int i2c_pmic = 1; u32 reg; - i2c_set_bus_num(CONFIG_I2C_PMIC); + i2c_set_bus_num(i2c_pmic); /* configure PFUZE100 PMIC */ if (!i2c_probe(CONFIG_POWER_PFUZE100_I2C_ADDR)) { debug("probed PFUZE100@0x%x\n", CONFIG_POWER_PFUZE100_I2C_ADDR); - power_pfuze100_init(CONFIG_I2C_PMIC); + power_pfuze100_init(i2c_pmic); p = pmic_get("PFUZE100"); if (p && !pmic_probe(p)) { pmic_reg_read(p, PFUZE100_DEVICEID, ®); @@ -1302,7 +1303,7 @@ void setup_pmic(void) /* configure LTC3676 PMIC */ else if (!i2c_probe(CONFIG_POWER_LTC3676_I2C_ADDR)) { debug("probed LTC3676@0x%x\n", CONFIG_POWER_LTC3676_I2C_ADDR); - power_ltc3676_init(CONFIG_I2C_PMIC); + power_ltc3676_init(i2c_pmic); p = pmic_get("LTC3676_PMIC"); if (!p || pmic_probe(p)) return; diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 2b98f53..28289a3 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -95,7 +95,6 @@ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_I2C_GSC 0 -#define CONFIG_I2C_PMIC 1 #define CONFIG_I2C_EDID /* MMC Configs */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f639d2b..b17b87b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1399,7 +1399,6 @@ CONFIG_I2C_MVTWSI_BASE3 CONFIG_I2C_MVTWSI_BASE4 CONFIG_I2C_MVTWSI_BASE5 CONFIG_I2C_MXC -CONFIG_I2C_PMIC CONFIG_I2C_REPEATED_START CONFIG_I2C_RTC_ADDR CONFIG_I2C_TIMEOUT |