[S1 BSP] Change i2c device

Author: JcZou

target/sieon/s1/board/board.c

@@ -458,7 +458,7 @@ void bsp_initialize(void)
     RT_CHECK(drv_bmi088_init("spi4_dev1", "spi4_dev2", "gyro0", "accel0", 0));
     RT_CHECK(drv_icm42688_init("spi4_dev3", "gyro1", "accel1", 0));
     RT_CHECK(drv_bmm150_init("spi4_dev4", "mag0"));
-    // RT_CHECK(drv_qmc5883l_init("i2c3_dev1", "mag0"));
+    // RT_CHECK(drv_qmc5883l_init("i2c1_dev2", "mag0"));
     RT_CHECK(drv_spl06_init("spi1_dev1", "barometer"));
     RT_CHECK(gps_ubx_init("serial3", "gps"));
     // RT_CHECK(drv_tofsense_init("serial5"));

target/sieon/s1/drivers/drv_i2c.c

@@ -353,16 +353,14 @@ static struct stm32_i2c_bus stm32_i2c4 = { .parent.ops = &i2c_bus_ops, .I2C = I2
 /* i2c device instances */
 static struct rt_i2c_device i2c1_dev1 = { .slave_addr = IST8310_ADDRESS, /* 7 bit address */
                                           .flags = 0 };
-static struct rt_i2c_device i2c2_dev1 = { .slave_addr = IST8310_ADDRESS, /* 7 bit address */
+static struct rt_i2c_device i2c1_dev2 = { .slave_addr = QMC5883L_ADDRESS, /* 7 bit address */
                                           .flags = 0 };
-static struct rt_i2c_device i2c1_dev2 = { .slave_addr = 0x0D, /* 7 bit address */
+static struct rt_i2c_device i2c2_dev1 = { .slave_addr = IST8310_ADDRESS, /* 7 bit address */
                                           .flags = 0 };
-static struct rt_i2c_device i2c2_dev2 = { .slave_addr = 0x0D, /* 7 bit address */
-                                          .flags = 0 };          
-static struct rt_i2c_device i2c3_dev1 = { .slave_addr = 0x0D, /* 7 bit address */
-                                          .flags = 0 };      
-static struct rt_i2c_device i2c4_dev1 = { .slave_addr = 0x0D, /* 7 bit address */
-                                          .flags = 0 };                                                                                                     
+static struct rt_i2c_device i2c2_dev2 = { .slave_addr = QMC5883L_ADDRESS, /* 7 bit address */
+                                          .flags = 0 };       
+static struct rt_i2c_device i2c3_dev1 = { .slave_addr = QMC5883L_ADDRESS, /* 7 bit address */
+                                          .flags = 0 };                                                                                                                                              
 
 rt_err_t drv_i2c_init(void)
 {
@@ -376,16 +374,16 @@ rt_err_t drv_i2c_init(void)
     RT_TRY(rt_i2c_bus_device_register(&stm32_i2c1.parent, "i2c1"));
     RT_TRY(rt_i2c_bus_device_register(&stm32_i2c2.parent, "i2c2"));
     RT_TRY(rt_i2c_bus_device_register(&stm32_i2c3.parent, "i2c3"));
-    RT_TRY(rt_i2c_bus_device_register(&stm32_i2c4.parent, "i2c4"));
+    RT_TRY(rt_i2c_bus_device_register(&stm32_i2c4.parent, "i2c4")); // I2C4 is exported
 
     /* attach i2c devices */
     RT_TRY(rt_i2c_bus_attach_device(&i2c1_dev1, "i2c1_dev1", "i2c1", RT_NULL));
-    RT_TRY(rt_i2c_bus_attach_device(&i2c2_dev1, "i2c2_dev1", "i2c2", RT_NULL));
-
     RT_TRY(rt_i2c_bus_attach_device(&i2c1_dev2, "i2c1_dev2", "i2c1", RT_NULL));
+
+    RT_TRY(rt_i2c_bus_attach_device(&i2c2_dev1, "i2c2_dev1", "i2c2", RT_NULL));
     RT_TRY(rt_i2c_bus_attach_device(&i2c2_dev2, "i2c2_dev2", "i2c2", RT_NULL));
+
     RT_TRY(rt_i2c_bus_attach_device(&i2c3_dev1, "i2c3_dev1", "i2c3", RT_NULL));
-    RT_TRY(rt_i2c_bus_attach_device(&i2c4_dev1, "i2c4_dev1", "i2c4", RT_NULL));
 
     return RT_EOK;
 }

target/sieon/s1/drivers/drv_i2c.h

@@ -24,6 +24,7 @@ extern "C" {
 
 /* i2c slave device addresses */
 #define IST8310_ADDRESS  0x0E
+#define QMC5883L_ADDRESS 0x0D
 #define NCP5623C_ADDRESS 0x39
 
 rt_err_t drv_i2c_init(void);