openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Jean Delvare <khali@linux-fr.org>
Cc: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Brownell 2007-05-10 03:15:52 -07:00 committed by Linus Torvalds
parent dd00a99e7a
commit 6e99806ebb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/i2c/busses/i2c-at91.c
View File

@ -226,13 +226,14 @@ static int __devinit at91_i2c_probe(struct platform_device *pdev)
adapter->algo = &at91_algorithm; adapter->algo = &at91_algorithm;
adapter->class = I2C_CLASS_HWMON; adapter->class = I2C_CLASS_HWMON;
adapter->dev.parent = &pdev->dev; adapter->dev.parent = &pdev->dev;
/* adapter->id == 0 ... only one TWI controller for now */
platform_set_drvdata(pdev, adapter); platform_set_drvdata(pdev, adapter);
clk_enable(twi_clk); /* enable peripheral clock */ clk_enable(twi_clk); /* enable peripheral clock */
at91_twi_hwinit(); /* initialize TWI controller */ at91_twi_hwinit(); /* initialize TWI controller */
rc = i2c_add_adapter(adapter); rc = i2c_add_numbered_adapter(adapter);
if (rc) { if (rc) {
dev_err(&pdev->dev, "Adapter %s registration failed\n", dev_err(&pdev->dev, "Adapter %s registration failed\n",
adapter->name); adapter->name);
@ -295,6 +296,9 @@ static int at91_i2c_resume(struct platform_device *pdev)
#define at91_i2c_resume NULL #define at91_i2c_resume NULL
#endif #endif
/* work with "modprobe at91_i2c" from hotplugging or coldplugging */
MODULE_ALIAS("at91_i2c");
static struct platform_driver at91_i2c_driver = { static struct platform_driver at91_i2c_driver = {
.probe = at91_i2c_probe, .probe = at91_i2c_probe,
.remove = __devexit_p(at91_i2c_remove), .remove = __devexit_p(at91_i2c_remove),