| Message ID | 20190410230023.4113-1-delroth@gmail.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | [U-Boot] turris_omnia: fix eeprom/mcu device names | expand |
Hi Pierre, On 11.04.19 01:00, Pierre Bourdon wrote: > Commit c4bd12a7dad4 ("i2c: mux: Generate longer i2c mux name") changed > the naming scheme of i2c devices within a mux. This broke references to > i2c@0 in the Turris Omnia board initialization code. > > Signed-off-by: Pierre Bourdon <delroth@gmail.com> > Cc: Marek Behún <marek.behun@nic.cz> > --- > board/CZ.NIC/turris_omnia/turris_omnia.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c > index c7f6479a0c..c54cd047c1 100644 > --- a/board/CZ.NIC/turris_omnia/turris_omnia.c > +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c > @@ -32,13 +32,13 @@ > > DECLARE_GLOBAL_DATA_PTR; > > -#define OMNIA_I2C_EEPROM_DM_NAME "i2c@0" > +#define OMNIA_I2C_EEPROM_DM_NAME "i2c@11000->i2cmux@70->i2c@0" > #define OMNIA_I2C_EEPROM 0x54 > #define OMNIA_I2C_EEPROM_CONFIG_ADDR 0x0 > #define OMNIA_I2C_EEPROM_ADDRLEN 2 > #define OMNIA_I2C_EEPROM_MAGIC 0x0341a034 > > -#define OMNIA_I2C_MCU_DM_NAME "i2c@0" > +#define OMNIA_I2C_MCU_DM_NAME "i2c@11000->i2cmux@70->i2c@0" > #define OMNIA_I2C_MCU_ADDR_STATUS 0x1 > #define OMNIA_I2C_MCU_SATA 0x20 > #define OMNIA_I2C_MCU_CARDDET 0x10 > Look good, so: Reviewed-by: Stefan Roese <sr@denx.de> Please use "arm: mvebu: turris_omnia: ..." as the patch subject next time and Cc me (or the corresponding subsystem maintainer) next time. No need to re-send now. Thanks, Stefan
Pierre, please add Reviewed-by: Marek Behún <marek.behun@nic.cz> and send also to Stefan Roese <sr@denx.de> Marek On Thu, 11 Apr 2019 01:00:23 +0200 Pierre Bourdon <delroth@gmail.com> wrote: > Commit c4bd12a7dad4 ("i2c: mux: Generate longer i2c mux name") changed > the naming scheme of i2c devices within a mux. This broke references > to i2c@0 in the Turris Omnia board initialization code. > > Signed-off-by: Pierre Bourdon <delroth@gmail.com> > Cc: Marek Behún <marek.behun@nic.cz> > --- > board/CZ.NIC/turris_omnia/turris_omnia.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c > b/board/CZ.NIC/turris_omnia/turris_omnia.c index > c7f6479a0c..c54cd047c1 100644 --- > a/board/CZ.NIC/turris_omnia/turris_omnia.c +++ > b/board/CZ.NIC/turris_omnia/turris_omnia.c @@ -32,13 +32,13 @@ > > DECLARE_GLOBAL_DATA_PTR; > > -#define OMNIA_I2C_EEPROM_DM_NAME "i2c@0" > +#define OMNIA_I2C_EEPROM_DM_NAME "i2c@11000->i2cmux@70->i2c@0" > #define OMNIA_I2C_EEPROM 0x54 > #define OMNIA_I2C_EEPROM_CONFIG_ADDR 0x0 > #define OMNIA_I2C_EEPROM_ADDRLEN 2 > #define OMNIA_I2C_EEPROM_MAGIC 0x0341a034 > > -#define OMNIA_I2C_MCU_DM_NAME "i2c@0" > +#define > OMNIA_I2C_MCU_DM_NAME "i2c@11000->i2cmux@70->i2c@0" > #define OMNIA_I2C_MCU_ADDR_STATUS 0x1 #define > OMNIA_I2C_MCU_SATA 0x20 #define > OMNIA_I2C_MCU_CARDDET 0x10
On 11.04.19 01:00, Pierre Bourdon wrote: > Commit c4bd12a7dad4 ("i2c: mux: Generate longer i2c mux name") changed > the naming scheme of i2c devices within a mux. This broke references to > i2c@0 in the Turris Omnia board initialization code. > > Signed-off-by: Pierre Bourdon <delroth@gmail.com> > Cc: Marek Behún <marek.behun@nic.cz> Applied to u-boot-marvell/master. Thanks, Stefan
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c index c7f6479a0c..c54cd047c1 100644 --- a/board/CZ.NIC/turris_omnia/turris_omnia.c +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c @@ -32,13 +32,13 @@ DECLARE_GLOBAL_DATA_PTR; -#define OMNIA_I2C_EEPROM_DM_NAME "i2c@0" +#define OMNIA_I2C_EEPROM_DM_NAME "i2c@11000->i2cmux@70->i2c@0" #define OMNIA_I2C_EEPROM 0x54 #define OMNIA_I2C_EEPROM_CONFIG_ADDR 0x0 #define OMNIA_I2C_EEPROM_ADDRLEN 2 #define OMNIA_I2C_EEPROM_MAGIC 0x0341a034 -#define OMNIA_I2C_MCU_DM_NAME "i2c@0" +#define OMNIA_I2C_MCU_DM_NAME "i2c@11000->i2cmux@70->i2c@0" #define OMNIA_I2C_MCU_ADDR_STATUS 0x1 #define OMNIA_I2C_MCU_SATA 0x20 #define OMNIA_I2C_MCU_CARDDET 0x10
Commit c4bd12a7dad4 ("i2c: mux: Generate longer i2c mux name") changed the naming scheme of i2c devices within a mux. This broke references to i2c@0 in the Turris Omnia board initialization code. Signed-off-by: Pierre Bourdon <delroth@gmail.com> Cc: Marek Behún <marek.behun@nic.cz> --- board/CZ.NIC/turris_omnia/turris_omnia.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)