aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorDavid Daney <david.daney@cavium.com>2012-05-22 15:47:19 -0700
committerGrant Likely <grant.likely@secretlab.ca>2012-12-15 00:49:35 +0000
commitcb71941a682270dd5164d1332900694d19caa5e1 (patch)
tree20964fd5de0ccda5cff4cf6e5a0057d5f4bb29d1 /drivers/spi
parent7d859ff4937a22aabc0d3f352d1f515fb8b38528 (diff)
downloadkernel_goldelico_gta04-cb71941a682270dd5164d1332900694d19caa5e1.zip
kernel_goldelico_gta04-cb71941a682270dd5164d1332900694d19caa5e1.tar.gz
kernel_goldelico_gta04-cb71941a682270dd5164d1332900694d19caa5e1.tar.bz2
of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.
To get modprobe to automatically load the proper modules, we need to prefix things with "spi:". Partially based on Grant Likely's suggestions. Signed-off-by: David Daney <david.daney@cavium.com> [grant.likely: reworked because drivers/of/of_spi.c has been removed] Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index ab095ac..19ee901 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -824,6 +824,7 @@ static void of_register_spi_devices(struct spi_master *master)
struct spi_device *spi;
struct device_node *nc;
const __be32 *prop;
+ char modalias[SPI_NAME_SIZE + 4];
int rc;
int len;
@@ -887,7 +888,9 @@ static void of_register_spi_devices(struct spi_master *master)
spi->dev.of_node = nc;
/* Register the new device */
- request_module(spi->modalias);
+ snprintf(modalias, sizeof(modalias), "%s%s", SPI_MODULE_PREFIX,
+ spi->modalias);
+ request_module(modalias);
rc = spi_add_device(spi);
if (rc) {
dev_err(&master->dev, "spi_device register error %s\n",