mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
SPI driver hotplug/coldplug fixes
Update various SPI drivers so they properly support - coldplug through "modprobe $(cat /sys/devices/.../modalias)" - hotplug through "modprobe $(MODALIAS)" The basic rule for platform, SPI, and (new style) I2C drivers is just to make sure that modprobing the driver name works. In this case, all the relevant drivers are platform drivers, and this patch either (a) Changes the driver name, if no in-tree code would break; this is simpler and thus preferable in the long term. (b) Adds MODULE_ALIAS directives, when in-tree platforms declare devices using the current driver name; less desirable. Most systems will link SPI controller drivers statically, but there's no point in being needlessly broken. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Cc: Jean Delvare <khali@linux-fr.org> Acked-by: Andrei Konovalov <akonovalov@ru.mvista.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
f2ab6d8889
commit
fc3ba9525b
@ -1303,8 +1303,9 @@ static int bfin5xx_spi_resume(struct platform_device *pdev)
|
||||
#define bfin5xx_spi_resume NULL
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
MODULE_ALIAS("bfin-spi-master"); /* for platform bus hotplug */
|
||||
static struct platform_driver bfin5xx_spi_driver = {
|
||||
.driver = {
|
||||
.driver = {
|
||||
.name = "bfin-spi-master",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
|
@ -1735,7 +1735,7 @@ static int spi_imx_resume(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver driver = {
|
||||
.driver = {
|
||||
.name = "imx-spi",
|
||||
.name = "spi_imx",
|
||||
.bus = &platform_bus_type,
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
|
@ -530,6 +530,7 @@ static int __devexit mpc83xx_spi_remove(struct platform_device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_ALIAS("mpc83xx_spi"); /* for platform bus hotplug */
|
||||
static struct platform_driver mpc83xx_spi_driver = {
|
||||
.probe = mpc83xx_spi_probe,
|
||||
.remove = __devexit_p(mpc83xx_spi_remove),
|
||||
|
@ -427,6 +427,7 @@ static int s3c24xx_spi_resume(struct platform_device *pdev)
|
||||
#define s3c24xx_spi_resume NULL
|
||||
#endif
|
||||
|
||||
MODULE_ALIAS("s3c2410_spi"); /* for platform bus hotplug */
|
||||
static struct platform_driver s3c24xx_spidrv = {
|
||||
.probe = s3c24xx_spi_probe,
|
||||
.remove = s3c24xx_spi_remove,
|
||||
|
@ -180,7 +180,7 @@ static struct platform_driver s3c2410_spigpio_drv = {
|
||||
.suspend = s3c2410_spigpio_suspend,
|
||||
.resume = s3c2410_spigpio_resume,
|
||||
.driver = {
|
||||
.name = "s3c24xx-spi-gpio",
|
||||
.name = "spi_s3c24xx_gpio",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
};
|
||||
|
@ -450,6 +450,7 @@ static int __exit txx9spi_remove(struct platform_device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_ALIAS("txx9spi"); /* for platform bus hotplug */
|
||||
static struct platform_driver txx9spi_driver = {
|
||||
.remove = __exit_p(txx9spi_remove),
|
||||
.driver = {
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#include <syslib/virtex_devices.h>
|
||||
|
||||
#define XILINX_SPI_NAME "xspi"
|
||||
#define XILINX_SPI_NAME "xilinx_spi"
|
||||
|
||||
/* Register definitions as per "OPB Serial Peripheral Interface (SPI) (v1.00e)
|
||||
* Product Specification", DS464
|
||||
|
Loading…
Reference in New Issue
Block a user