diff options
| author | Dave Martin <dave.martin@linaro.org> | 2011-10-05 14:40:59 +0100 |
|---|---|---|
| committer | Dave Martin <dave.martin@linaro.org> | 2011-11-22 10:58:30 +0000 |
| commit | 1e5f9a23430e64fb56d9d5d8e1ca165ba1cfeb75 (patch) | |
| tree | 5dc5ea5d1895b063a911f1101a906da696b59f53 | |
| parent | cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37 (diff) | |
| download | op-kernel-dev-1e5f9a23430e64fb56d9d5d8e1ca165ba1cfeb75.zip op-kernel-dev-1e5f9a23430e64fb56d9d5d8e1ca165ba1cfeb75.tar.gz | |
ARM: amba: Move definition of struct amba_id to mod_devicetable.h
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>
| -rw-r--r-- | include/linux/amba/bus.h | 7 | ||||
| -rw-r--r-- | 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 */ |
