Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf87a6e2 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

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: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
parent a961bf38

arch/arm/mach-mx1/mx1ads.c

+2 −4
Original line number Diff line number Diff line
@@ -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],

	},

};

arch/arm/mach-mx2/eukrea_cpuimx27.c

+1 −2
Original line number Diff line number Diff line
@@ -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),

	},

};

arch/arm/mach-mx2/pcm038.c

+4 −8
Original line number Diff line number Diff line
@@ -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"

	}

};

arch/arm/mach-mx3/pcm037.c

+1 −2
Original line number Diff line number Diff line
@@ -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),

	}

};

arch/arm/mach-mx3/pcm043.c

+1 −2
Original line number Diff line number Diff line
@@ -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