diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-04-22 16:16:49 -0400 |
---|---|---|
committer | Jean Delvare <khali@hyperion.delvare> | 2008-04-22 16:16:49 -0400 |
commit | add8eda7f2be781af0224241e870715cf0cfd75a (patch) | |
tree | 5cbfc6123bf6078f2756c020189efc3f72cdb63e /drivers/i2c/busses | |
parent | da672773d8f8169938ebf53449c99afc09938f66 (diff) |
i2c: Fix platform driver hotplug/coldplug
Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform
modalias is prefixed with "platform:". Add MODULE_ALIAS() to the
hotpluggable I2C platform drivers, to allow module auto loading.
[ db: add some more drivers ]
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/i2c/busses')
-rw-r--r-- | drivers/i2c/busses/i2c-at91.c | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-au1550.c | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-bfin-twi.c | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-davinci.c | 3 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-gpio.c | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-iop3xx.c | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-ixp2000.c | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-mpc.c | 3 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-ocores.c | 3 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-pmcmsp.c | 3 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-pnx.c | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-powermac.c | 3 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-simtec.c | 3 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-versatile.c | 1 |
17 files changed, 29 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c index c09b036913bd..73d61946a534 100644 --- a/drivers/i2c/busses/i2c-at91.c +++ b/drivers/i2c/busses/i2c-at91.c | |||
@@ -298,7 +298,7 @@ static int at91_i2c_resume(struct platform_device *pdev) | |||
298 | #endif | 298 | #endif |
299 | 299 | ||
300 | /* work with "modprobe at91_i2c" from hotplugging or coldplugging */ | 300 | /* work with "modprobe at91_i2c" from hotplugging or coldplugging */ |
301 | MODULE_ALIAS("at91_i2c"); | 301 | MODULE_ALIAS("platform:at91_i2c"); |
302 | 302 | ||
303 | static struct platform_driver at91_i2c_driver = { | 303 | static struct platform_driver at91_i2c_driver = { |
304 | .probe = at91_i2c_probe, | 304 | .probe = at91_i2c_probe, |
diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c index 1953b26da56a..491718fe46b7 100644 --- a/drivers/i2c/busses/i2c-au1550.c +++ b/drivers/i2c/busses/i2c-au1550.c | |||
@@ -472,6 +472,7 @@ i2c_au1550_exit(void) | |||
472 | MODULE_AUTHOR("Dan Malek, Embedded Edge, LLC."); | 472 | MODULE_AUTHOR("Dan Malek, Embedded Edge, LLC."); |
473 | MODULE_DESCRIPTION("SMBus adapter Alchemy pb1550"); | 473 | MODULE_DESCRIPTION("SMBus adapter Alchemy pb1550"); |
474 | MODULE_LICENSE("GPL"); | 474 | MODULE_LICENSE("GPL"); |
475 | MODULE_ALIAS("platform:au1xpsc_smbus"); | ||
475 | 476 | ||
476 | module_init (i2c_au1550_init); | 477 | module_init (i2c_au1550_init); |
477 | module_exit (i2c_au1550_exit); | 478 | module_exit (i2c_au1550_exit); |
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c index 0cd4d36240db..48d084bdf7c8 100644 --- a/drivers/i2c/busses/i2c-bfin-twi.c +++ b/drivers/i2c/busses/i2c-bfin-twi.c | |||
@@ -741,3 +741,4 @@ module_exit(i2c_bfin_twi_exit); | |||
741 | MODULE_AUTHOR("Bryan Wu, Sonic Zhang"); | 741 | MODULE_AUTHOR("Bryan Wu, Sonic Zhang"); |
742 | MODULE_DESCRIPTION("Blackfin BF5xx on-chip I2C TWI Contoller Driver"); | 742 | MODULE_DESCRIPTION("Blackfin BF5xx on-chip I2C TWI Contoller Driver"); |
743 | MODULE_LICENSE("GPL"); | 743 | MODULE_LICENSE("GPL"); |
744 | MODULE_ALIAS("platform:i2c-bfin-twi"); | ||
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index c7dbb9d0423e..7ecbfc429b19 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c | |||
@@ -553,6 +553,9 @@ static int davinci_i2c_remove(struct platform_device *pdev) | |||
553 | return 0; | 553 | return 0; |
554 | } | 554 | } |
555 | 555 | ||
556 | /* work with hotplug and coldplug */ | ||
557 | MODULE_ALIAS("platform:i2c_davinci"); | ||
558 | |||
556 | static struct platform_driver davinci_i2c_driver = { | 559 | static struct platform_driver davinci_i2c_driver = { |
557 | .probe = davinci_i2c_probe, | 560 | .probe = davinci_i2c_probe, |
558 | .remove = davinci_i2c_remove, | 561 | .remove = davinci_i2c_remove, |
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c index 3ca19fc234fb..7c1b762aa681 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c | |||
@@ -220,3 +220,4 @@ module_exit(i2c_gpio_exit); | |||
220 | MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); | 220 | MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); |
221 | MODULE_DESCRIPTION("Platform-independent bitbanging I2C driver"); | 221 | MODULE_DESCRIPTION("Platform-independent bitbanging I2C driver"); |
222 | MODULE_LICENSE("GPL"); | 222 | MODULE_LICENSE("GPL"); |
223 | MODULE_ALIAS("platform:i2c-gpio"); | ||
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c index ab41400c883e..39884e797594 100644 --- a/drivers/i2c/busses/i2c-iop3xx.c +++ b/drivers/i2c/busses/i2c-iop3xx.c | |||
@@ -550,3 +550,4 @@ module_exit (i2c_iop3xx_exit); | |||
550 | MODULE_AUTHOR("D-TACQ Solutions Ltd <www.d-tacq.com>"); | 550 | MODULE_AUTHOR("D-TACQ Solutions Ltd <www.d-tacq.com>"); |
551 | MODULE_DESCRIPTION("IOP3xx iic algorithm and driver"); | 551 | MODULE_DESCRIPTION("IOP3xx iic algorithm and driver"); |
552 | MODULE_LICENSE("GPL"); | 552 | MODULE_LICENSE("GPL"); |
553 | MODULE_ALIAS("platform:IOP3xx-I2C"); | ||
diff --git a/drivers/i2c/busses/i2c-ixp2000.c b/drivers/i2c/busses/i2c-ixp2000.c index 6352121a2827..5af9e6521e6c 100644 --- a/drivers/i2c/busses/i2c-ixp2000.c +++ b/drivers/i2c/busses/i2c-ixp2000.c | |||
@@ -164,4 +164,5 @@ module_exit(ixp2000_i2c_exit); | |||
164 | MODULE_AUTHOR ("Deepak Saxena <dsaxena@plexity.net>"); | 164 | MODULE_AUTHOR ("Deepak Saxena <dsaxena@plexity.net>"); |
165 | MODULE_DESCRIPTION("IXP2000 GPIO-based I2C bus driver"); | 165 | MODULE_DESCRIPTION("IXP2000 GPIO-based I2C bus driver"); |
166 | MODULE_LICENSE("GPL"); | 166 | MODULE_LICENSE("GPL"); |
167 | MODULE_ALIAS("platform:IXP2000-I2C"); | ||
167 | 168 | ||
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index bbe787b243b7..18beb0ad7bf3 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c | |||
@@ -392,6 +392,9 @@ static int fsl_i2c_remove(struct platform_device *pdev) | |||
392 | return 0; | 392 | return 0; |
393 | }; | 393 | }; |
394 | 394 | ||
395 | /* work with hotplug and coldplug */ | ||
396 | MODULE_ALIAS("platform:fsl-i2c"); | ||
397 | |||
395 | /* Structure for a device driver */ | 398 | /* Structure for a device driver */ |
396 | static struct platform_driver fsl_i2c_driver = { | 399 | static struct platform_driver fsl_i2c_driver = { |
397 | .probe = fsl_i2c_probe, | 400 | .probe = fsl_i2c_probe, |
diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c index e417c2c3ca22..f145692cbb76 100644 --- a/drivers/i2c/busses/i2c-ocores.c +++ b/drivers/i2c/busses/i2c-ocores.c | |||
@@ -312,6 +312,9 @@ static int __devexit ocores_i2c_remove(struct platform_device* pdev) | |||
312 | return 0; | 312 | return 0; |
313 | } | 313 | } |
314 | 314 | ||
315 | /* work with hotplug and coldplug */ | ||
316 | MODULE_ALIAS("platform:ocores-i2c"); | ||
317 | |||
315 | static struct platform_driver ocores_i2c_driver = { | 318 | static struct platform_driver ocores_i2c_driver = { |
316 | .probe = ocores_i2c_probe, | 319 | .probe = ocores_i2c_probe, |
317 | .remove = __devexit_p(ocores_i2c_remove), | 320 | .remove = __devexit_p(ocores_i2c_remove), |
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 7ba31770d773..e7eb7bf9ddec 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c | |||
@@ -693,3 +693,4 @@ module_exit(omap_i2c_exit_driver); | |||
693 | MODULE_AUTHOR("MontaVista Software, Inc. (and others)"); | 693 | MODULE_AUTHOR("MontaVista Software, Inc. (and others)"); |
694 | MODULE_DESCRIPTION("TI OMAP I2C bus adapter"); | 694 | MODULE_DESCRIPTION("TI OMAP I2C bus adapter"); |
695 | MODULE_LICENSE("GPL"); | 695 | MODULE_LICENSE("GPL"); |
696 | MODULE_ALIAS("platform:i2c_omap"); | ||
diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c index 9ea0f8aa74f4..63b3e2c11cff 100644 --- a/drivers/i2c/busses/i2c-pmcmsp.c +++ b/drivers/i2c/busses/i2c-pmcmsp.c | |||
@@ -627,6 +627,9 @@ static struct i2c_adapter pmcmsptwi_adapter = { | |||
627 | .name = DRV_NAME, | 627 | .name = DRV_NAME, |
628 | }; | 628 | }; |
629 | 629 | ||
630 | /* work with hotplug and coldplug */ | ||
631 | MODULE_ALIAS("platform:" DRV_NAME); | ||
632 | |||
630 | static struct platform_driver pmcmsptwi_driver = { | 633 | static struct platform_driver pmcmsptwi_driver = { |
631 | .probe = pmcmsptwi_probe, | 634 | .probe = pmcmsptwi_probe, |
632 | .remove = __devexit_p(pmcmsptwi_remove), | 635 | .remove = __devexit_p(pmcmsptwi_remove), |
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c index 6695d5902ed4..1ca21084ffcf 100644 --- a/drivers/i2c/busses/i2c-pnx.c +++ b/drivers/i2c/busses/i2c-pnx.c | |||
@@ -697,6 +697,7 @@ static void __exit i2c_adap_pnx_exit(void) | |||
697 | MODULE_AUTHOR("Vitaly Wool, Dennis Kovalev <source@mvista.com>"); | 697 | MODULE_AUTHOR("Vitaly Wool, Dennis Kovalev <source@mvista.com>"); |
698 | MODULE_DESCRIPTION("I2C driver for Philips IP3204-based I2C busses"); | 698 | MODULE_DESCRIPTION("I2C driver for Philips IP3204-based I2C busses"); |
699 | MODULE_LICENSE("GPL"); | 699 | MODULE_LICENSE("GPL"); |
700 | MODULE_ALIAS("platform:pnx-i2c"); | ||
700 | 701 | ||
701 | /* We need to make sure I2C is initialized before USB */ | 702 | /* We need to make sure I2C is initialized before USB */ |
702 | subsys_initcall(i2c_adap_pnx_init); | 703 | subsys_initcall(i2c_adap_pnx_init); |
diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c index 7813127649a1..22f6d5c00d80 100644 --- a/drivers/i2c/busses/i2c-powermac.c +++ b/drivers/i2c/busses/i2c-powermac.c | |||
@@ -263,6 +263,9 @@ static int __devexit i2c_powermac_probe(struct platform_device *dev) | |||
263 | } | 263 | } |
264 | 264 | ||
265 | 265 | ||
266 | /* work with hotplug and coldplug */ | ||
267 | MODULE_ALIAS("platform:i2c-powermac"); | ||
268 | |||
266 | static struct platform_driver i2c_powermac_driver = { | 269 | static struct platform_driver i2c_powermac_driver = { |
267 | .probe = i2c_powermac_probe, | 270 | .probe = i2c_powermac_probe, |
268 | .remove = __devexit_p(i2c_powermac_remove), | 271 | .remove = __devexit_p(i2c_powermac_remove), |
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 330fff464ea9..eb69fbadc9cb 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c | |||
@@ -1132,6 +1132,7 @@ static void __exit i2c_adap_pxa_exit(void) | |||
1132 | } | 1132 | } |
1133 | 1133 | ||
1134 | MODULE_LICENSE("GPL"); | 1134 | MODULE_LICENSE("GPL"); |
1135 | MODULE_ALIAS("platform:pxa2xx-i2c"); | ||
1135 | 1136 | ||
1136 | module_init(i2c_adap_pxa_init); | 1137 | module_init(i2c_adap_pxa_init); |
1137 | module_exit(i2c_adap_pxa_exit); | 1138 | module_exit(i2c_adap_pxa_exit); |
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 5ece33ea5e22..1305ef190fc1 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
@@ -948,3 +948,4 @@ module_exit(i2c_adap_s3c_exit); | |||
948 | MODULE_DESCRIPTION("S3C24XX I2C Bus driver"); | 948 | MODULE_DESCRIPTION("S3C24XX I2C Bus driver"); |
949 | MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>"); | 949 | MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>"); |
950 | MODULE_LICENSE("GPL"); | 950 | MODULE_LICENSE("GPL"); |
951 | MODULE_ALIAS("platform:s3c2410-i2c"); | ||
diff --git a/drivers/i2c/busses/i2c-simtec.c b/drivers/i2c/busses/i2c-simtec.c index 10af8d31e12a..042fda295f3a 100644 --- a/drivers/i2c/busses/i2c-simtec.c +++ b/drivers/i2c/busses/i2c-simtec.c | |||
@@ -159,6 +159,9 @@ static int simtec_i2c_remove(struct platform_device *dev) | |||
159 | 159 | ||
160 | /* device driver */ | 160 | /* device driver */ |
161 | 161 | ||
162 | /* work with hotplug and coldplug */ | ||
163 | MODULE_ALIAS("platform:simtec-i2c"); | ||
164 | |||
162 | static struct platform_driver simtec_i2c_driver = { | 165 | static struct platform_driver simtec_i2c_driver = { |
163 | .driver = { | 166 | .driver = { |
164 | .name = "simtec-i2c", | 167 | .name = "simtec-i2c", |
diff --git a/drivers/i2c/busses/i2c-versatile.c b/drivers/i2c/busses/i2c-versatile.c index 081d9578ce10..4678babd3ce6 100644 --- a/drivers/i2c/busses/i2c-versatile.c +++ b/drivers/i2c/busses/i2c-versatile.c | |||
@@ -151,3 +151,4 @@ module_exit(i2c_versatile_exit); | |||
151 | 151 | ||
152 | MODULE_DESCRIPTION("ARM Versatile I2C bus driver"); | 152 | MODULE_DESCRIPTION("ARM Versatile I2C bus driver"); |
153 | MODULE_LICENSE("GPL"); | 153 | MODULE_LICENSE("GPL"); |
154 | MODULE_ALIAS("platform:versatile-i2c"); | ||