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

Commit 6e99806e authored by David Brownell's avatar David Brownell Committed by Linus Torvalds
Browse files

i2c-at91 supports new-style i2c drivers 



Make i2c-at91 register as i2c adapter zero (none of these chips seem to
have more than one TWI controllers) to let it kick in any board-specific
device declarations; also make it hotplug/coldplug.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dd00a99e

drivers/i2c/busses/i2c-at91.c

+5 −1
Original line number Diff line number Diff line
@@ -226,13 +226,14 @@ static int __devinit at91_i2c_probe(struct platform_device *pdev) 
	adapter->algo = &at91_algorithm;

	adapter->class = I2C_CLASS_HWMON;

	adapter->dev.parent = &pdev->dev;

	/* adapter->id == 0 ... only one TWI controller for now */



	platform_set_drvdata(pdev, adapter);



	clk_enable(twi_clk);		/* enable peripheral clock */

	at91_twi_hwinit();		/* initialize TWI controller */



	rc = i2c_add_adapter(adapter);

	rc = i2c_add_numbered_adapter(adapter);

	if (rc) {

		dev_err(&pdev->dev, "Adapter %s registration failed\n",

				adapter->name);
@@ -295,6 +296,9 @@ static int at91_i2c_resume(struct platform_device *pdev) 
#define at91_i2c_resume		NULL

#endif



/* work with "modprobe at91_i2c" from hotplugging or coldplugging */

MODULE_ALIAS("at91_i2c");



static struct platform_driver at91_i2c_driver = {

	.probe		= at91_i2c_probe,

	.remove		= __devexit_p(at91_i2c_remove),