ARM: mxc: Fix i2c_board_info definitions
Fix i2c_board_info definitions - we were defining the 'type' field of these structures twice since the first argument of I2C_BOARD_INFO sets this field. Move the second definition into I2C_BOARD_INFO(). Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
parent
a961bf380b
commit
cf87a6e2fe
|
@ -104,12 +104,10 @@ static struct imxi2c_platform_data mx1ads_i2c_data = {
|
|||
|
||||
static struct i2c_board_info mx1ads_i2c_devices[] = {
|
||||
{
|
||||
I2C_BOARD_INFO("pcf857x", 0x22),
|
||||
.type = "pcf8575",
|
||||
I2C_BOARD_INFO("pcf8575", 0x22),
|
||||
.platform_data = &pcf857x_data[0],
|
||||
}, {
|
||||
I2C_BOARD_INFO("pcf857x", 0x24),
|
||||
.type = "pcf8575",
|
||||
I2C_BOARD_INFO("pcf8575", 0x24),
|
||||
.platform_data = &pcf857x_data[1],
|
||||
},
|
||||
};
|
||||
|
|
|
@ -135,8 +135,7 @@ static struct imxi2c_platform_data eukrea_cpuimx27_i2c_1_data = {
|
|||
|
||||
static struct i2c_board_info eukrea_cpuimx27_i2c_devices[] = {
|
||||
{
|
||||
I2C_BOARD_INFO("rtc-pcf8563", 0x51),
|
||||
.type = "pcf8563"
|
||||
I2C_BOARD_INFO("pcf8563", 0x51),
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
@ -186,17 +186,13 @@ static struct at24_platform_data board_eeprom = {
|
|||
};
|
||||
|
||||
static struct i2c_board_info pcm038_i2c_devices[] = {
|
||||
[0] = {
|
||||
{
|
||||
I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */
|
||||
.platform_data = &board_eeprom,
|
||||
},
|
||||
[1] = {
|
||||
I2C_BOARD_INFO("rtc-pcf8563", 0x51),
|
||||
.type = "pcf8563"
|
||||
},
|
||||
[2] = {
|
||||
}, {
|
||||
I2C_BOARD_INFO("pcf8563", 0x51),
|
||||
}, {
|
||||
I2C_BOARD_INFO("lm75", 0x4a),
|
||||
.type = "lm75"
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
@ -339,8 +339,7 @@ static struct i2c_board_info pcm037_i2c_devices[] = {
|
|||
I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */
|
||||
.platform_data = &board_eeprom,
|
||||
}, {
|
||||
I2C_BOARD_INFO("rtc-pcf8563", 0x51),
|
||||
.type = "pcf8563",
|
||||
I2C_BOARD_INFO("pcf8563", 0x51),
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
@ -133,8 +133,7 @@ static struct i2c_board_info pcm043_i2c_devices[] = {
|
|||
I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */
|
||||
.platform_data = &board_eeprom,
|
||||
}, {
|
||||
I2C_BOARD_INFO("rtc-pcf8563", 0x51),
|
||||
.type = "pcf8563",
|
||||
I2C_BOARD_INFO("pcf8563", 0x51),
|
||||
}
|
||||
};
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue