Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e5f9a23 authored by Dave Martin's avatar Dave Martin
Browse files

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: default avatarDave Martin <dave.martin@linaro.org>
parent cfcfc9ec

include/linux/amba/bus.h

+1 −6
Original line number Diff line number Diff line
@@ -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 *);

include/linux/mod_devicetable.h

+18 −0
Original line number Diff line number Diff line
@@ -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 */