From: Martyn Welch Date: Wed, 10 Jan 2018 19:31:28 +0000 (+0100) Subject: board: ge: Enable access to i2c bus 1 and 2 X-Git-Tag: v2018.03-rc2~47^2~32 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=87da89e803610770390d81dc6d8b6edb909f16d6;p=oweals%2Fu-boot.git board: ge: Enable access to i2c bus 1 and 2 The change in i2c configuration added to support access to the VPD has inadvertantly caused access to i2c buses 1 & 2 to be lost. This has resulted in the configuration for the PMIC to be attempted on the wrong bus and thus isn't taking effect. Add the required configuration to return access to buses 1 & 2. In order to ensure that any users of the bus numbering prior to addition in VPD patches work, add buses before configuration related to mux on bus 0 and tweak VPD bus usage to fit new numbering scheme. Signed-off-by: Martyn Welch Signed-off-by: Sebastian Reichel --- diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c index 37de990176..cb4deb0434 100644 --- a/board/ge/bx50v3/bx50v3.c +++ b/board/ge/bx50v3/bx50v3.c @@ -37,7 +37,7 @@ DECLARE_GLOBAL_DATA_PTR; #endif #ifndef CONFIG_SYS_I2C_EEPROM_BUS -#define CONFIG_SYS_I2C_EEPROM_BUS 2 +#define CONFIG_SYS_I2C_EEPROM_BUS 4 #endif #define NC_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 694aa8ae76..aa7772c201 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -296,9 +296,11 @@ #define CONFIG_SYS_I2C_MXC_I2C2 #define CONFIG_SYS_I2C_MXC_I2C3 -#define CONFIG_SYS_NUM_I2C_BUSES 9 +#define CONFIG_SYS_NUM_I2C_BUSES 11 #define CONFIG_SYS_I2C_MAX_HOPS 1 #define CONFIG_SYS_I2C_BUSES { {0, {I2C_NULL_HOP} }, \ + {1, {I2C_NULL_HOP} }, \ + {2, {I2C_NULL_HOP} }, \ {0, {{I2C_MUX_PCA9547, 0x70, 0} } }, \ {0, {{I2C_MUX_PCA9547, 0x70, 1} } }, \ {0, {{I2C_MUX_PCA9547, 0x70, 2} } }, \