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

Commit b57ab763 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c: Convert most new-style drivers to use module aliasing
  i2c: Add support for device alias names
  i2c-amd756-s4882: Fix an error path
  i2c: Drop unused RTC driver IDs
  i2c/tps65010: Add missing intialization of client data
  i2c-sis5595: Minor cleanups in sis5595_access
  i2c-piix4: Minor cleanups
  i2c: Spelling fix (successful)
  i2c-stub: No newline in parameter description
parents f12c0372 3760f736

Documentation/i2c/writing-clients

+2 −1
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ I2C device drivers using this binding model work just like any other 
kind of driver in Linux:  they provide a probe() method to bind to

those devices, and a remove() method to unbind.



	static int foo_probe(struct i2c_client *client);

	static int foo_probe(struct i2c_client *client,

			     const struct i2c_device_id *id);

	static int foo_remove(struct i2c_client *client);



Remember that the i2c_driver does not create those client handles.  The

arch/arm/mach-at91/board-csb337.c

+1 −2
Original line number Diff line number Diff line
@@ -79,8 +79,7 @@ static struct at91_udc_data __initdata csb337_udc_data = { 


static struct i2c_board_info __initdata csb337_i2c_devices[] = {

	{

		I2C_BOARD_INFO("rtc-ds1307", 0x68),

		.type	= "ds1307",

		I2C_BOARD_INFO("ds1307", 0x68),

	},

};

arch/arm/mach-at91/board-dk.c

+1 −2
Original line number Diff line number Diff line
@@ -132,8 +132,7 @@ static struct i2c_board_info __initdata dk_i2c_devices[] = { 
		I2C_BOARD_INFO("x9429", 0x28),

	},

	{

		I2C_BOARD_INFO("at24c", 0x50),

		.type	= "24c1024",

		I2C_BOARD_INFO("24c1024", 0x50),

	}

};

arch/arm/mach-at91/board-eb9200.c

+1 −2
Original line number Diff line number Diff line
@@ -93,8 +93,7 @@ static struct at91_mmc_data __initdata eb9200_mmc_data = { 


static struct i2c_board_info __initdata eb9200_i2c_devices[] = {

	{

		I2C_BOARD_INFO("at24c", 0x50),

		.type	= "24c512",

		I2C_BOARD_INFO("24c512", 0x50),

	},

};

arch/arm/mach-iop32x/em7210.c

+1 −2
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ static struct sys_timer em7210_timer = { 
 */

static struct i2c_board_info __initdata em7210_i2c_devices[] = {

	{

		I2C_BOARD_INFO("rtc-rs5c372", 0x32),

		.type = "rs5c372a",

		I2C_BOARD_INFO("rs5c372a", 0x32),

	},

};