Skip to contentSkip to conversation

turris_omnia: fix eeprom/mcu device names

PATCH New Pierre Bourdon 4 participants 4 messages Apr 10, 2019 – Apr 26, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 turris_omnia: fix eeprom/mcu device names

Commit c4bd12a7dad4 ("i2c: mux: Generate longer i2c mux name") changed the naming scheme of i2c devices within a mux. This broke references to i2c at 0 in the Turris Omnia board initialization code.

---
 board/CZ.NIC/turris_omnia/turris_omnia.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
board/CZ.NIC/turris_omnia/turris_omnia.c +2 -2
index c7f6479a0c..c54cd047c1 100644
@@ -32,13 +32,13 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define OMNIA_I2C_EEPROM_DM_NAME	"i2c at 0"
+#define OMNIA_I2C_EEPROM_DM_NAME	"i2c at 11000->i2cmux at 70->i2c at 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 at 0"
+#define OMNIA_I2C_MCU_DM_NAME		"i2c at 11000->i2cmux at 70->i2c at 0"
 #define OMNIA_I2C_MCU_ADDR_STATUS	0x1
 #define OMNIA_I2C_MCU_SATA		0x20
 #define OMNIA_I2C_MCU_CARDDET		0x10
Signature · 1 line
2.19.2
#1 lore raw

PATCH 1/1 turris_omnia: fix eeprom/mcu device names

Hi Pierre,

Quoted 21 lines · Pierre Bourdon

Commit c4bd12a7dad4 ("i2c: mux: Generate longer i2c mux name") changed the naming scheme of i2c devices within a mux. This broke references to i2c at 0 in the Turris Omnia board initialization code.

---
  board/CZ.NIC/turris_omnia/turris_omnia.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
board/CZ.NIC/turris_omnia/turris_omnia.c +1 -1
index c7f6479a0c..c54cd047c1 100644
@@ -32,13 +32,13 @@
 
  DECLARE_GLOBAL_DATA_PTR;
 
-#define OMNIA_I2C_EEPROM_DM_NAME	"i2c at 0"
+#define OMNIA_I2C_EEPROM_DM_NAME	"i2c at 11000->i2cmux at 70->i2c at 0"

board/CZ.NIC/turris_omnia/turris_omnia.c line 44

Quoted 10 lines
board/CZ.NIC/turris_omnia/turris_omnia.c +1 -1
  #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 at 0"
+#define OMNIA_I2C_MCU_DM_NAME		"i2c at 11000->i2cmux at 70->i2c at 0"
  #define OMNIA_I2C_MCU_ADDR_STATUS	0x1
  #define OMNIA_I2C_MCU_SATA		0x20
  #define OMNIA_I2C_MCU_CARDDET		0x10

Look good, so:

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

#2 lore raw

PATCH 1/1 turris_omnia: fix eeprom/mcu device names

In reply to Pierre Bourdon

Pierre, please add

and send also to Stefan Roese <[email protected]>

Marek

Quoted 31 lines · On Thu, 11 Apr 2019 01:00:23 +0200 Pierre Bourdon <[email protected]> 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 at 0 in the Turris Omnia board initialization code.

---
 board/CZ.NIC/turris_omnia/turris_omnia.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

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;

board/CZ.NIC/turris_omnia/turris_omnia.c +2 -2
-#define OMNIA_I2C_EEPROM_DM_NAME	"i2c at 0"
+#define OMNIA_I2C_EEPROM_DM_NAME	"i2c at 11000->i2cmux at 70->i2c at 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 at 0"
+#define

OMNIA_I2C_MCU_DM_NAME "i2c at 11000->i2cmux at 70->i2c at 0"
#define OMNIA_I2C_MCU_ADDR_STATUS 0x1 #define
OMNIA_I2C_MCU_SATA 0x20 #define
OMNIA_I2C_MCU_CARDDET 0x10