[PATCH 00/16] ARM: amba: Enable module alias autogeneration for AMBA drivers

[PATCH 00/16] ARM: amba: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

There's no special reason why AMBA device drivers should not be
auto-loadable via udev, but udev currently has no way to map AMBA
device IDs to drivers.

As part of the effort to help enable the building of multiple
ARM platforms into a single kernel image in the future, it's desirable
to be able to build any non-critical platform-specific drivers as
modules.

A straightforward solution is to use modaliases to allow udev to
identify the correct driver module to load.

This series enables the general infrastructure for modalias generation
to work for AMBA devices, and enables it in the affected drivers.

Briefly tested on Versatile Express, including aaci, mmci and amba-clcd
(which appears to have the most interesting modalias match pattern).
For me, the appropiate modules now get loaded at udev trigger time.

Any comments and feedback are welcome.

Dave Martin (16):
  ARM: amba: Move definition of struct amba_id to mod_devicetable.h
  ARM: amba: Auto-generate AMBA driver module aliases during modpost
  hwrng: nomadik: Enable module alias autogeneration for AMBA drivers
  dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers
  dmaengine: pl330: Enable module alias autogeneration for AMBA drivers
  gpio: pl061: Enable module alias autogeneration for AMBA drivers
  input: ambakmi: Enable module alias autogeneration for AMBA drivers
  mmc: mmci: Enable module alias autogeneration for AMBA drivers
  rtc: pl030: Enable module alias autogeneration for AMBA drivers
  rtc: pl031: Enable module alias autogeneration for AMBA drivers
  spi: pl022: Enable module alias autogeneration for AMBA drivers
  serial: pl010: Enable module alias autogeneration for AMBA drivers
  serial: pl011: Enable module alias autogeneration for AMBA drivers
  fbdev: amba: Enable module alias autogeneration for AMBA drivers
  watchdog: sp805: Enable module alias autogeneration for AMBA drivers
  sound: aaci: Enable module alias autogeneration for AMBA drivers

 drivers/amba/bus.c                   |    9 ++++-
 drivers/char/hw_random/nomadik-rng.c |    2 +
 drivers/dma/amba-pl08x.c             |    2 +
 drivers/dma/pl330.c                  |    2 +
 drivers/gpio/gpio-pl061.c            |    2 +
 drivers/input/serio/ambakmi.c        |    2 +
 drivers/mmc/host/mmci.c              |    2 +
 drivers/rtc/rtc-pl030.c              |    2 +
 drivers/rtc/rtc-pl031.c              |    2 +
 drivers/spi/spi-pl022.c              |    2 +
 drivers/tty/serial/amba-pl010.c      |    2 +
 drivers/tty/serial/amba-pl011.c      |    2 +
 drivers/video/amba-clcd.c            |    2 +
 drivers/watchdog/sp805_wdt.c         |    2 +
 include/linux/amba/bus.h             |    7 +---
 include/linux/mod_devicetable.h      |   18 ++++++++
 scripts/mod/file2alias.c             |   72 ++++++++++++++++++++++++++++++++++
 sound/arm/aaci.c                     |    2 +
 18 files changed, 127 insertions(+), 7 deletions(-)

-- 
1.7.4.1

[PATCH 01/16] ARM: amba: Move definition of struct amba_id to mod_devicetable.h

[Dave Martin]

The general kernel infrastructure for adding module alises during
module post processing expects the affected device type
identification structures in a common header
<linux/mod_devicetable.h>.

This patch simple moves struct amba_id to the common header, and
adds the appropriate include in <linux/amba/bus.h>.

Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
 include/linux/amba/bus.h        |    7 +------
 include/linux/mod_devicetable.h |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index fcbbe71..724c69c 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -16,6 +16,7 @@
 
 #include <linux/clk.h>
 #include <linux/device.h>
+#include <linux/mod_devicetable.h>
 #include <linux/err.h>
 #include <linux/resource.h>
 #include <linux/regulator/consumer.h>
@@ -35,12 +36,6 @@ struct amba_device {
 	unsigned int		irq[AMBA_NR_IRQS];
 };
 
-struct amba_id {
-	unsigned int		id;
-	unsigned int		mask;
-	void			*data;
-};
-
 struct amba_driver {
 	struct device_driver	drv;
 	int			(*probe)(struct amba_device *, const struct amba_id *);
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 468819c..83ac071 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -542,4 +542,22 @@ struct isapnp_device_id {
 	kernel_ulong_t driver_data;	/* data private to the driver */
 };
 
+/**
+ * struct amba_id - identifies a device on an AMBA bus
+ * @id: The significant bits if the hardware device ID
+ * @mask: Bitmask specifying which bits of the id field are significant when
+ *	matching.  A driver binds to a device when ((hardware device ID) & mask)
+ *	== id.
+ * @data: Private data used by the driver.
+ */
+struct amba_id {
+	unsigned int		id;
+	unsigned int		mask;
+#ifndef __KERNEL__
+	kernel_ulong_t		data;
+#else
+	void			*data;
+#endif
+};
+
 #endif /* LINUX_MOD_DEVICETABLE_H */
-- 
1.7.4.1

[PATCH 02/16] ARM: amba: Auto-generate AMBA driver module aliases during modpost

[Dave Martin]

This patch adds the necessary support in file2alias.c to define
suitable aliases based on the amba_id table in AMBA driver modules.

This should be sufficient to allow such modules to be auto-loaded
via udev.  The AMBA bus driver's uevent hotplug code is also
modified to pass an approriate MODALIAS string in the event.

For simplicity, the AMBA ID is treated an an opaque 32-bit numeber.
Module alises use patterns as appropriate to describe the value-
mask pairs described in the driver's amba_id list.

The proposed alias format is (extended regex):

        ^amba:d(HEX){8}$

Where HEX is a single upper-case HEX digit or a pattern (? or []
expression) matching a single upper-case HEX digit, as expected by
udev.

"d" is short for "device", following existing alias naming
conventions for other device types.  This adds some flexibility for
unambiguously extending the alias format in the future by adding
additional leading and trailing fields, if this turns out to be
necessary.

Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
 drivers/amba/bus.c       |    9 +++++-
 scripts/mod/file2alias.c |   72 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 1 deletions(-)

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index bd230e8..a8c598c 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -52,7 +52,14 @@ static int amba_uevent(struct device *dev, struct kobj_uevent_env *env)
 	int retval = 0;
 
 	retval = add_uevent_var(env, "AMBA_ID=%08x", pcdev->periphid);
-	return retval;
+	if (retval)
+		return retval;
+
+	retval = add_uevent_var(env, "MODALIAS=amba:d%08X", pcdev->periphid);
+	if (retval)
+		return retval;
+
+	return 0;
 }
 #else
 #define amba_uevent NULL
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index f936d1f..363ab46 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -880,6 +880,74 @@ static int do_isapnp_entry(const char *filename,
 	return 1;
 }
 
+/*
+ * Append a match expression for a single masked hex digit.
+ * outp points to a pointer to the character at which to append.
+ *	*outp is updated on return to point just after the appended text,
+ *	to facilitate further appending.
+ */
+static void append_nibble_mask(char **outp,
+			       unsigned int nibble, unsigned int mask)
+{
+	char *p = *outp;
+	unsigned int i;
+
+	switch (mask) {
+	case 0:
+		*p++ = '?';
+		break;
+
+	case 0xf:
+		p += sprintf(p, "%X",  nibble);
+		break;
+
+	default:
+		/*
+		 * Dumbly emit a match pattern for all possible matching
+		 * digits.  This could be improved in some cases using ranges,
+		 * but it has the advantage of being trivially correct, and is
+		 * often optimal.
+		 */
+		*p++ = '[';
+		for (i = 0; i < 0x10; i++)
+			if ((i & mask) == nibble)
+				p += sprintf(p, "%X", i);
+		*p++ = ']';
+	}
+
+	/* Ensure that the string remains NUL-terminated: */
+	*p = '\0';
+
+	/* Advance the caller's end-of-string pointer: */
+	*outp = p;
+}
+
+/*
+ * looks like: "amba:dN"
+ *
+ * N is exactly 8 digits, where each is an upper-case hex digit, or
+ *	a ? or [] pattern matching exactly one digit.
+ */
+static int do_amba_entry(const char *filename,
+			 struct amba_id *id, char *alias)
+{
+	unsigned int digit;
+	char *p = alias;
+
+	if ((id->id & id->mask) != id->id)
+		fatal("%s: Masked-off bit(s) of AMBA device ID are non-zero: "
+		      "id=0x%08X, mask=0x%08X.  Please fix this driver.\n",
+		      filename, id->id, id->mask);
+
+	p += sprintf(alias, "amba:d");
+	for (digit = 0; digit < 8; digit++)
+		append_nibble_mask(&p,
+				   (id->id >> (4 * (7 - digit))) & 0xf,
+				   (id->mask >> (4 * (7 - digit))) & 0xf);
+
+	return 1;
+}
+
 /* Ignore any prefix, eg. some architectures prepend _ */
 static inline int sym_is(const char *symbol, const char *name)
 {
@@ -1047,6 +1115,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
 		do_table(symval, sym->st_size,
 			sizeof(struct isapnp_device_id), "isa",
 			do_isapnp_entry, mod);
+	else if (sym_is(symname, "__mod_amba_device_table"))
+		do_table(symval, sym->st_size,
+			sizeof(struct amba_id), "amba",
+			do_amba_entry, mod);
 	free(zeros);
 }
 
-- 
1.7.4.1

[PATCH 03/16] hwrng: nomadik: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
 drivers/char/hw_random/nomadik-rng.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/char/hw_random/nomadik-rng.c b/drivers/char/hw_random/nomadik-rng.c
index 52e08ca..3d3c1e6 100644
--- a/drivers/char/hw_random/nomadik-rng.c
+++ b/drivers/char/hw_random/nomadik-rng.c
@@ -95,6 +95,8 @@ static struct amba_id nmk_rng_ids[] = {
 	{0, 0},
 };
 
+MODULE_DEVICE_TABLE(amba, nmk_rng_ids);
+
 static struct amba_driver nmk_rng_driver = {
 	.drv = {
 		.owner = THIS_MODULE,
-- 
1.7.4.1

[PATCH 04/16] dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
 drivers/dma/amba-pl08x.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index b7cbd1a..0698695 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -2054,6 +2054,8 @@ static struct amba_id pl08x_ids[] = {
 	{ 0, 0 },
 };
 
+MODULE_DEVICE_TABLE(amba, pl08x_ids);
+
 static struct amba_driver pl08x_amba_driver = {
 	.drv.name	= DRIVER_NAME,
 	.id_table	= pl08x_ids,
-- 
1.7.4.1

[PATCH 05/16] dmaengine: pl330: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
 drivers/dma/pl330.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 57104147..2d8d1b0 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -990,6 +990,8 @@ static struct amba_id pl330_ids[] = {
 	{ 0, 0 },
 };
 
+MODULE_DEVICE_TABLE(amba, pl330_ids);
+
 #ifdef CONFIG_PM_RUNTIME
 static int pl330_runtime_suspend(struct device *dev)
 {
-- 
1.7.4.1

[PATCH 06/16] gpio: pl061: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
 drivers/gpio/gpio-pl061.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c
index 2c5a18f..503e9d5 100644
--- a/drivers/gpio/gpio-pl061.c
+++ b/drivers/gpio/gpio-pl061.c
@@ -339,6 +339,8 @@ static struct amba_id pl061_ids[] = {
 	{ 0, 0 },
 };
 
+MODULE_DEVICE_TABLE(amba, pl061_ids);
+
 static struct amba_driver pl061_gpio_driver = {
 	.drv = {
 		.name	= "pl061_gpio",
-- 
1.7.4.1

[PATCH 07/16] input: ambakmi: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
 drivers/input/serio/ambakmi.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
index 12abc50..8407d5b 100644
--- a/drivers/input/serio/ambakmi.c
+++ b/drivers/input/serio/ambakmi.c
@@ -195,6 +195,8 @@ static struct amba_id amba_kmi_idtable[] = {
 	{ 0, 0 }
 };
 
+MODULE_DEVICE_TABLE(amba, amba_kmi_idtable);
+
 static struct amba_driver ambakmi_driver = {
 	.drv		= {
 		.name	= "kmi-pl050",
-- 
1.7.4.1

[PATCH 08/16] mmc: mmci: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
 drivers/mmc/host/mmci.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index b16ea4a..a7d398c 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1496,6 +1496,8 @@ static struct amba_id mmci_ids[] = {
 	{ 0, 0 },
 };
 
+MODULE_DEVICE_TABLE(amba, mmci_ids);
+
 static struct amba_driver mmci_driver = {
 	.drv		= {
 		.name	= DRIVER_NAME,
-- 
1.7.4.1

[PATCH 09/16] rtc: pl030: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
 drivers/rtc/rtc-pl030.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c
index 1d28d44..02111fe 100644
--- a/drivers/rtc/rtc-pl030.c
+++ b/drivers/rtc/rtc-pl030.c
@@ -174,6 +174,8 @@ static struct amba_id pl030_ids[] = {
 	{ 0, 0 },
 };
 
+MODULE_DEVICE_TABLE(amba, pl030_ids);
+
 static struct amba_driver pl030_driver = {
 	.drv		= {
 		.name	= "rtc-pl030",
-- 
1.7.4.1

[PATCH 10/16] rtc: pl031: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
 drivers/rtc/rtc-pl031.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
index ff1b84bd..a952c8d 100644
--- a/drivers/rtc/rtc-pl031.c
+++ b/drivers/rtc/rtc-pl031.c
@@ -420,6 +420,8 @@ static struct amba_id pl031_ids[] = {
 	{0, 0},
 };
 
+MODULE_DEVICE_TABLE(amba, pl031_ids);
+
 static struct amba_driver pl031_driver = {
 	.drv = {
 		.name = "rtc-pl031",
-- 
1.7.4.1

[PATCH 11/16] spi: pl022: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
 drivers/spi/spi-pl022.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index f103e470..43abaf2 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -2424,6 +2424,8 @@ static struct amba_id pl022_ids[] = {
 	{ 0, 0 },
 };
 
+MODULE_DEVICE_TABLE(amba, pl022_ids);
+
 static struct amba_driver pl022_driver = {
 	.drv = {
 		.name	= "ssp-pl022",
-- 
1.7.4.1

[PATCH 12/16] serial: pl010: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
 drivers/tty/serial/amba-pl010.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/tty/serial/amba-pl010.c b/drivers/tty/serial/amba-pl010.c
index efdf92c..0d91a54 100644
--- a/drivers/tty/serial/amba-pl010.c
+++ b/drivers/tty/serial/amba-pl010.c
@@ -795,6 +795,8 @@ static struct amba_id pl010_ids[] = {
 	{ 0, 0 },
 };
 
+MODULE_DEVICE_TABLE(amba, pl010_ids);
+
 static struct amba_driver pl010_driver = {
 	.drv = {
 		.name	= "uart-pl010",
-- 
1.7.4.1

[PATCH 13/16] serial: pl011: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
 drivers/tty/serial/amba-pl011.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 00233af..6958594 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -1994,6 +1994,8 @@ static struct amba_id pl011_ids[] = {
 	{ 0, 0 },
 };
 
+MODULE_DEVICE_TABLE(amba, pl011_ids);
+
 static struct amba_driver pl011_driver = {
 	.drv = {
 		.name	= "uart-pl011",
-- 
1.7.4.1

[PATCH 14/16] fbdev: amba: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
 drivers/video/amba-clcd.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index 2cda6ba..0a2cce7 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -621,6 +621,8 @@ static struct amba_id clcdfb_id_table[] = {
 	{ 0, 0 },
 };
 
+MODULE_DEVICE_TABLE(amba, clcdfb_id_table);
+
 static struct amba_driver clcd_driver = {
 	.drv 		= {
 		.name	= "clcd-pl11x",
-- 
1.7.4.1

[PATCH 15/16] watchdog: sp805: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
 drivers/watchdog/sp805_wdt.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index cc2cfbe..c0a0ece 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -359,6 +359,8 @@ static struct amba_id sp805_wdt_ids[] __initdata = {
 	{ 0, 0 },
 };
 
+MODULE_DEVICE_TABLE(amba, sp805_wdt_ids);
+
 static struct amba_driver sp805_wdt_driver = {
 	.drv = {
 		.name	= MODULE_NAME,
-- 
1.7.4.1

[PATCH 16/16] sound: aaci: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
 sound/arm/aaci.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index e518d38..b37b702a 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -1097,6 +1097,8 @@ static struct amba_id aaci_ids[] = {
 	{ 0, 0 },
 };
 
+MODULE_DEVICE_TABLE(amba, aaci_ids);
+
 static struct amba_driver aaci_driver = {
 	.drv		= {
 		.name	= DRIVER_NAME,
-- 
1.7.4.1

[PATCH 06/16] gpio: pl061: Enable module alias autogeneration for AMBA drivers

[Grant Likely]

On Wed, Oct 5, 2011 at 10:04 AM, Dave Martin <dave.martin@linaro.org> wrote:
> Signed-off-by: Dave Martin <dave.martin@linaro.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>

Feel free to take this through the same tree that the rest of the
patches go through.

g.

> ---
> ?drivers/gpio/gpio-pl061.c | ? ?2 ++
> ?1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c
> index 2c5a18f..503e9d5 100644
> --- a/drivers/gpio/gpio-pl061.c
> +++ b/drivers/gpio/gpio-pl061.c
> @@ -339,6 +339,8 @@ static struct amba_id pl061_ids[] = {
> ? ? ? ?{ 0, 0 },
> ?};
>
> +MODULE_DEVICE_TABLE(amba, pl061_ids);
> +
> ?static struct amba_driver pl061_gpio_driver = {
> ? ? ? ?.drv = {
> ? ? ? ? ? ? ? ?.name ? = "pl061_gpio",
> --
> 1.7.4.1
>
>



-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

[PATCH 11/16] spi: pl022: Enable module alias autogeneration for AMBA drivers

[Grant Likely]

On Wed, Oct 5, 2011 at 10:05 AM, Dave Martin <dave.martin@linaro.org> wrote:
> Signed-off-by: Dave Martin <dave.martin@linaro.org>

Acked-by: Grant Likely <grant.likely@secretlab.ca>

> ---
> ?drivers/spi/spi-pl022.c | ? ?2 ++
> ?1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
> index f103e470..43abaf2 100644
> --- a/drivers/spi/spi-pl022.c
> +++ b/drivers/spi/spi-pl022.c
> @@ -2424,6 +2424,8 @@ static struct amba_id pl022_ids[] = {
> ? ? ? ?{ 0, 0 },
> ?};
>
> +MODULE_DEVICE_TABLE(amba, pl022_ids);
> +
> ?static struct amba_driver pl022_driver = {
> ? ? ? ?.drv = {
> ? ? ? ? ? ? ? ?.name ? = "ssp-pl022",
> --
> 1.7.4.1
>
>



-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

[PATCH 02/16] ARM: amba: Auto-generate AMBA driver module aliases during modpost

[Pawel Moll]

On Wed, 2011-10-05 at 17:04 +0100, Dave Martin wrote:
> This patch adds the necessary support in file2alias.c to define
> suitable aliases based on the amba_id table in AMBA driver modules.
> 
> This should be sufficient to allow such modules to be auto-loaded
> via udev.  The AMBA bus driver's uevent hotplug code is also
> modified to pass an approriate MODALIAS string in the event.
> 
> For simplicity, the AMBA ID is treated an an opaque 32-bit numeber.
> Module alises use patterns as appropriate to describe the value-
> mask pairs described in the driver's amba_id list.
> 
> The proposed alias format is (extended regex):
> 
>         ^amba:d(HEX){8}$
> 
> Where HEX is a single upper-case HEX digit or a pattern (? or []
> expression) matching a single upper-case HEX digit, as expected by
> udev.
> 
> "d" is short for "device", following existing alias naming
> conventions for other device types.  This adds some flexibility for
> unambiguously extending the alias format in the future by adding
> additional leading and trailing fields, if this turns out to be
> necessary.
> 
> Signed-off-by: Dave Martin <dave.martin@linaro.org>

Acked-by: Pawel Moll <pawel.moll@arm.com>

Cheers!

Pawel

[PATCH 07/16] input: ambakmi: Enable module alias autogeneration for AMBA drivers

[Dmitry Torokhov]

On Wed, Oct 05, 2011 at 05:04:58PM +0100, Dave Martin wrote:
> Signed-off-by: Dave Martin <dave.martin@linaro.org>

Acked-by: Dmitry Torokhov <dtor@mail.ru>

> ---
>  drivers/input/serio/ambakmi.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
> index 12abc50..8407d5b 100644
> --- a/drivers/input/serio/ambakmi.c
> +++ b/drivers/input/serio/ambakmi.c
> @@ -195,6 +195,8 @@ static struct amba_id amba_kmi_idtable[] = {
>  	{ 0, 0 }
>  };
>  
> +MODULE_DEVICE_TABLE(amba, amba_kmi_idtable);
> +
>  static struct amba_driver ambakmi_driver = {
>  	.drv		= {
>  		.name	= "kmi-pl050",
> -- 
> 1.7.4.1
> 

-- 
Dmitry

[PATCH 05/16] dmaengine: pl330: Enable module alias autogeneration for AMBA drivers

[Jassi Brar]

On 5 October 2011 21:34, Dave Martin <dave.martin@linaro.org> wrote:
> Signed-off-by: Dave Martin <dave.martin@linaro.org>
> ---
> ?drivers/dma/pl330.c | ? ?2 ++
> ?1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
> index 57104147..2d8d1b0 100644
> --- a/drivers/dma/pl330.c
> +++ b/drivers/dma/pl330.c
> @@ -990,6 +990,8 @@ static struct amba_id pl330_ids[] = {
> ? ? ? ?{ 0, 0 },
> ?};
>
> +MODULE_DEVICE_TABLE(amba, pl330_ids);
> +
> ?#ifdef CONFIG_PM_RUNTIME
> ?static int pl330_runtime_suspend(struct device *dev)
> ?{

Acked-by: Jassi Brar <jassisinghbrar@gmail.com>

Thanks.

[PATCH 11/16] spi: pl022: Enable module alias autogeneration for AMBA drivers

[Linus Walleij]

2011/10/5 Dave Martin <dave.martin@linaro.org>:

> Signed-off-by: Dave Martin <dave.martin@linaro.org>
> ---
> ?drivers/spi/spi-pl022.c | ? ?2 ++
> ?1 files changed, 2 insertions(+), 0 deletions(-)

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Thanks,
Linus Walleij

[PATCH 05/16] dmaengine: pl330: Enable module alias autogeneration for AMBA drivers

[Vinod Koul]

On Thu, 2011-10-06 at 10:47 +0530, Jassi Brar wrote:
> On 5 October 2011 21:34, Dave Martin <dave.martin@linaro.org> wrote:
> > Signed-off-by: Dave Martin <dave.martin@linaro.org>
> > ---
> >  drivers/dma/pl330.c |    2 ++
> >  1 files changed, 2 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
> > index 57104147..2d8d1b0 100644
> > --- a/drivers/dma/pl330.c
> > +++ b/drivers/dma/pl330.c
> > @@ -990,6 +990,8 @@ static struct amba_id pl330_ids[] = {
> >        { 0, 0 },
> >  };
> >
> > +MODULE_DEVICE_TABLE(amba, pl330_ids);
> > +
> >  #ifdef CONFIG_PM_RUNTIME
> >  static int pl330_runtime_suspend(struct device *dev)
> >  {
> 
> Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
> 
Acked-by: Vinod Koul <vinod.koul@intel.com>


-- 
~Vinod

[PATCH 04/16] dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers

[Vinod Koul]

On Wed, 2011-10-05 at 17:04 +0100, Dave Martin wrote:
> Signed-off-by: Dave Martin <dave.martin@linaro.org>
> ---
>  drivers/dma/amba-pl08x.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
> index b7cbd1a..0698695 100644
> --- a/drivers/dma/amba-pl08x.c
> +++ b/drivers/dma/amba-pl08x.c
> @@ -2054,6 +2054,8 @@ static struct amba_id pl08x_ids[] = {
>  	{ 0, 0 },
>  };
>  
> +MODULE_DEVICE_TABLE(amba, pl08x_ids);
> +
>  static struct amba_driver pl08x_amba_driver = {
>  	.drv.name	= DRIVER_NAME,
>  	.id_table	= pl08x_ids,

Acked-by: Vinod Koul <vinod.koul@intel.com>

-- 
~Vinod

[PATCH 00/16] ARM: amba: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

Russell, did you have a view on this series?

Following your suggestion I was able to use the generic modpost
infrastructure instead of reinventing stuff, and it seemes to work out
quite neatly.

Hopefully the only possibly-contraversial change change is the
movement of struct amba_id.

If it's already on your queue to look at then there's no need to rush.

Thanks
---Dave

On Wed, Oct 05, 2011 at 05:04:51PM +0100, Dave Martin wrote:
> There's no special reason why AMBA device drivers should not be
> auto-loadable via udev, but udev currently has no way to map AMBA
> device IDs to drivers.
> 
> As part of the effort to help enable the building of multiple
> ARM platforms into a single kernel image in the future, it's desirable
> to be able to build any non-critical platform-specific drivers as
> modules.
> 
> A straightforward solution is to use modaliases to allow udev to
> identify the correct driver module to load.
> 
> This series enables the general infrastructure for modalias generation
> to work for AMBA devices, and enables it in the affected drivers.
> 
> Briefly tested on Versatile Express, including aaci, mmci and amba-clcd
> (which appears to have the most interesting modalias match pattern).
> For me, the appropiate modules now get loaded at udev trigger time.
> 
> Any comments and feedback are welcome.
> 
> Dave Martin (16):
>   ARM: amba: Move definition of struct amba_id to mod_devicetable.h
>   ARM: amba: Auto-generate AMBA driver module aliases during modpost
>   hwrng: nomadik: Enable module alias autogeneration for AMBA drivers
>   dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers
>   dmaengine: pl330: Enable module alias autogeneration for AMBA drivers
>   gpio: pl061: Enable module alias autogeneration for AMBA drivers
>   input: ambakmi: Enable module alias autogeneration for AMBA drivers
>   mmc: mmci: Enable module alias autogeneration for AMBA drivers
>   rtc: pl030: Enable module alias autogeneration for AMBA drivers
>   rtc: pl031: Enable module alias autogeneration for AMBA drivers
>   spi: pl022: Enable module alias autogeneration for AMBA drivers
>   serial: pl010: Enable module alias autogeneration for AMBA drivers
>   serial: pl011: Enable module alias autogeneration for AMBA drivers
>   fbdev: amba: Enable module alias autogeneration for AMBA drivers
>   watchdog: sp805: Enable module alias autogeneration for AMBA drivers
>   sound: aaci: Enable module alias autogeneration for AMBA drivers
> 
>  drivers/amba/bus.c                   |    9 ++++-
>  drivers/char/hw_random/nomadik-rng.c |    2 +
>  drivers/dma/amba-pl08x.c             |    2 +
>  drivers/dma/pl330.c                  |    2 +
>  drivers/gpio/gpio-pl061.c            |    2 +
>  drivers/input/serio/ambakmi.c        |    2 +
>  drivers/mmc/host/mmci.c              |    2 +
>  drivers/rtc/rtc-pl030.c              |    2 +
>  drivers/rtc/rtc-pl031.c              |    2 +
>  drivers/spi/spi-pl022.c              |    2 +
>  drivers/tty/serial/amba-pl010.c      |    2 +
>  drivers/tty/serial/amba-pl011.c      |    2 +
>  drivers/video/amba-clcd.c            |    2 +
>  drivers/watchdog/sp805_wdt.c         |    2 +
>  include/linux/amba/bus.h             |    7 +---
>  include/linux/mod_devicetable.h      |   18 ++++++++
>  scripts/mod/file2alias.c             |   72 ++++++++++++++++++++++++++++++++++
>  sound/arm/aaci.c                     |    2 +
>  18 files changed, 127 insertions(+), 7 deletions(-)
> 
> -- 
> 1.7.4.1
> 

[PATCH 00/16] ARM: amba: Enable module alias autogeneration for AMBA drivers

[Russell King - ARM Linux]

On Thu, Oct 13, 2011 at 05:54:20PM +0100, Dave Martin wrote:
> Russell, did you have a view on this series?
> 
> Following your suggestion I was able to use the generic modpost
> infrastructure instead of reinventing stuff, and it seemes to work out
> quite neatly.
> 
> Hopefully the only possibly-contraversial change change is the
> movement of struct amba_id.

I think it looks fine - but I would like to see the first patch getting
a wider distribution before accepting the series - I think it needs to
go to at least lkml.org just in case someone has an issue with it.

[PATCH 00/16] ARM: amba: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

On Thu, Oct 13, 2011 at 06:24:04PM +0100, Russell King - ARM Linux wrote:
> On Thu, Oct 13, 2011 at 05:54:20PM +0100, Dave Martin wrote:
> > Russell, did you have a view on this series?
> > 
> > Following your suggestion I was able to use the generic modpost
> > infrastructure instead of reinventing stuff, and it seemes to work out
> > quite neatly.
> > 
> > Hopefully the only possibly-contraversial change change is the
> > movement of struct amba_id.
> 
> I think it looks fine - but I would like to see the first patch getting
> a wider distribution before accepting the series - I think it needs to
> go to at least lkml.org just in case someone has an issue with it.

OK, that makes sense.  I tried to CC the appropriate people, but you're
right-- posting it to lkml would be a better way to reach the right
audience.  I'll post and see.

Thanks
---Dave