Several architectures define their own empty irq_dispose_mapping(). Since
the irq_domain code is centralized now, there is little need to do so. This
patch removes them and creates a new empty copy when !CONFIG_IRQ_DOMAIN is
selected.
The patch also means that IRQ_DOMAIN becomes selectable on all architectures.
Signed-off-by: Grant Likely <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Jonas Bonn <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
arch/openrisc/include/asm/prom.h | 10 +---------
arch/sparc/include/asm/prom.h | 10 +---------
include/linux/irqdomain.h | 5 ++++-
include/linux/of_irq.h | 4 +---
4 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/arch/openrisc/include/asm/prom.h b/arch/openrisc/include/asm/prom.h
index e1f3fe2..bbb34e5 100644
--- a/arch/openrisc/include/asm/prom.h
+++ b/arch/openrisc/include/asm/prom.h
@@ -24,6 +24,7 @@
#include <linux/types.h>
#include <asm/irq.h>
+#include <linux/irqdomain.h>
#include <linux/atomic.h>
#include <linux/of_irq.h>
#include <linux/of_fdt.h>
@@ -63,15 +64,6 @@ extern const void *of_get_mac_address(struct device_node *np);
struct pci_dev;
extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);
-/* This routine is here to provide compatibility with how powerpc
- * handles IRQ mapping for OF device nodes. We precompute and permanently
- * register them in the platform_device objects, whereas powerpc computes them
- * on request.
- */
-static inline void irq_dispose_mapping(unsigned int virq)
-{
-}
-
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* _ASM_OPENRISC_PROM_H */
diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h
index edd3d3cde..c287651 100644
--- a/arch/sparc/include/asm/prom.h
+++ b/arch/sparc/include/asm/prom.h
@@ -22,6 +22,7 @@
#include <linux/proc_fs.h>
#include <linux/mutex.h>
#include <linux/atomic.h>
+#include <linux/irqdomain.h>
#define OF_ROOT_NODE_ADDR_CELLS_DEFAULT 2
#define OF_ROOT_NODE_SIZE_CELLS_DEFAULT 1
@@ -55,15 +56,6 @@ struct resource;
extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name);
extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size);
-/* These routines are here to provide compatibility with how powerpc
- * handles IRQ mapping for OF device nodes. We precompute and permanently
- * register them in the platform_device objects, whereas powerpc computes them
- * on request.
- */
-static inline void irq_dispose_mapping(unsigned int virq)
-{
-}
-
extern struct device_node *of_console_device;
extern char *of_console_path;
extern char *of_console_options;
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index 5245488..ead4a42 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -182,6 +182,9 @@ extern void irq_domain_generate_simple(const struct of_device_id *match,
static inline void irq_domain_generate_simple(const struct of_device_id *match,
u64 phys_base, unsigned int irq_start) { }
#endif /* !CONFIG_OF_IRQ */
-#endif /* CONFIG_IRQ_DOMAIN */
+
+#else /* CONFIG_IRQ_DOMAIN */
+static inline void irq_dispose_mapping(unsigned int virq) { }
+#endif /* !CONFIG_IRQ_DOMAIN */
#endif /* _LINUX_IRQDOMAIN_H */
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
index d0307ee..d229ad3 100644
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@ -6,6 +6,7 @@ struct of_irq;
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/irq.h>
+#include <linux/irqdomain.h>
#include <linux/ioport.h>
#include <linux/of.h>
@@ -65,9 +66,6 @@ extern int of_irq_map_one(struct device_node *device, int index,
extern unsigned int irq_create_of_mapping(struct device_node *controller,
const u32 *intspec,
unsigned int intsize);
-#ifdef CONFIG_IRQ_DOMAIN
-extern void irq_dispose_mapping(unsigned int irq);
-#endif
extern int of_irq_to_resource(struct device_node *dev, int index,
struct resource *r);
extern int of_irq_count(struct device_node *dev);
--
1.7.9
From: Benoit Cousson <[email protected]>
TWL4030 depends on IRQ_DOMAIN support, so this patch selects it in Kconfig.
It used to be that CONFIG_IRQ_DOMAIN must only be selected by the architecture,
but recent cleanups have fixed it so that it is safe to select from anywhere.
Signed-off-by: Benoit Cousson <[email protected]>
[grant.likely: Changed from a depends to a select]
Signed-off-by: Grant Likely <[email protected]>
Cc: Samuel Ortiz <[email protected]>
---
drivers/mfd/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index f147395..1489c35 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -201,6 +201,7 @@ config MENELAUS
config TWL4030_CORE
bool "Texas Instruments TWL4030/TWL5030/TWL6030/TPS659x0 Support"
depends on I2C=y && GENERIC_HARDIRQS
+ select IRQ_DOMAIN
help
Say yes here if you have TWL4030 / TWL6030 family chip on your board.
This core driver provides register access and IRQ handling
--
1.7.9
On 02/24/2012 08:54 AM, Grant Likely wrote:
> Several architectures define their own empty irq_dispose_mapping(). Since
> the irq_domain code is centralized now, there is little need to do so. This
> patch removes them and creates a new empty copy when !CONFIG_IRQ_DOMAIN is
> selected.
>
> The patch also means that IRQ_DOMAIN becomes selectable on all architectures.
>
> Signed-off-by: Grant Likely<[email protected]>
> Cc: Rob Herring<[email protected]>
> Cc: "David S. Miller"<[email protected]>
> Cc: Jonas Bonn<[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> ---
> arch/openrisc/include/asm/prom.h | 10 +---------
> arch/sparc/include/asm/prom.h | 10 +---------
> include/linux/irqdomain.h | 5 ++++-
> include/linux/of_irq.h | 4 +---
> 4 files changed, 7 insertions(+), 22 deletions(-)
>
There is also a definition in arch/mips/include/asm/irq.h.
Probably best to get rid of that one too.
David Daney
On Fri, Feb 24, 2012 at 10:32 AM, David Daney <[email protected]> wrote:
> On 02/24/2012 08:54 AM, Grant Likely wrote:
>>
>> Several architectures define their own empty irq_dispose_mapping(). ?Since
>> the irq_domain code is centralized now, there is little need to do so.
>> ?This
>> patch removes them and creates a new empty copy when !CONFIG_IRQ_DOMAIN is
>> selected.
>>
>> The patch also means that IRQ_DOMAIN becomes selectable on all
>> architectures.
>>
>> Signed-off-by: Grant Likely<[email protected]>
>> Cc: Rob Herring<[email protected]>
>> Cc: "David S. Miller"<[email protected]>
>> Cc: Jonas Bonn<[email protected]>
>> Cc: [email protected]
>> Cc: [email protected]
>> ---
>> ?arch/openrisc/include/asm/prom.h | ? 10 +---------
>> ?arch/sparc/include/asm/prom.h ? ?| ? 10 +---------
>> ?include/linux/irqdomain.h ? ? ? ?| ? ?5 ++++-
>> ?include/linux/of_irq.h ? ? ? ? ? | ? ?4 +---
>> ?4 files changed, 7 insertions(+), 22 deletions(-)
>>
>
> There is also a definition in arch/mips/include/asm/irq.h.
>
> Probably best to get rid of that one too.
I've got a separate patch which I posted today that enables IRQ_DOMAIN
on MIPS which does indeed remove that definition.
g.
On Fri, 2012-02-24 at 09:54 -0700, Grant Likely wrote:
> Several architectures define their own empty irq_dispose_mapping(). Since
> the irq_domain code is centralized now, there is little need to do so. This
> patch removes them and creates a new empty copy when !CONFIG_IRQ_DOMAIN is
> selected.
>
> The patch also means that IRQ_DOMAIN becomes selectable on all architectures.
Acked-by: Jonas Bonn <[email protected]> (for OpenRISC)
Hi Grant, Benoit,
On Fri, Feb 24, 2012 at 09:54:08AM -0700, Grant Likely wrote:
> From: Benoit Cousson <[email protected]>
>
> TWL4030 depends on IRQ_DOMAIN support, so this patch selects it in Kconfig.
> It used to be that CONFIG_IRQ_DOMAIN must only be selected by the architecture,
> but recent cleanups have fixed it so that it is safe to select from anywhere.
Applied to my for-next branch, thanks.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
On 2/27/2012 11:17 AM, Samuel Ortiz wrote:
> Hi Grant, Benoit,
>
> On Fri, Feb 24, 2012 at 09:54:08AM -0700, Grant Likely wrote:
>> From: Benoit Cousson<[email protected]>
>>
>> TWL4030 depends on IRQ_DOMAIN support, so this patch selects it in Kconfig.
>> It used to be that CONFIG_IRQ_DOMAIN must only be selected by the architecture,
>> but recent cleanups have fixed it so that it is safe to select from anywhere.
> Applied to my for-next branch, thanks.
Thanks Samuel,
Regards,
Benoit
On Mon, Feb 27, 2012 at 06:54:52AM -0700, Grant Likely wrote:
> On Feb 27, 2012 3:10 AM, "Samuel Ortiz" <[email protected]> wrote:
> >
> > Hi Grant, Benoit,
> >
> > On Fri, Feb 24, 2012 at 09:54:08AM -0700, Grant Likely wrote:
> > > From: Benoit Cousson <[email protected]>
> > >
> > > TWL4030 depends on IRQ_DOMAIN support, so this patch selects it in
> Kconfig.
> > > It used to be that CONFIG_IRQ_DOMAIN must only be selected by the
> architecture,
> > > but recent cleanups have fixed it so that it is safe to select from
> anywhere.
> > Applied to my for-next branch, thanks.
>
> It has to go via my tree to get rid of the build failure properly.
Yes. I wasn't sure you pushed it already until I saw your reply to Andrew.
I removed it from my tree, thanks for taking care of that.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/