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

Commit f3877047 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'common/irqdomain' into sh-latest

parents 1ca8fe38 1d6a21b0

Documentation/IRQ-domain.txt

+5 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ Linux IRQ number into the hardware. 
Most drivers cannot use this mapping.



==== Legacy ====

irq_domain_add_simple()

irq_domain_add_legacy()

irq_domain_add_legacy_isa()
@@ -115,3 +116,7 @@ The legacy map should only be used if fixed IRQ mappings must be 
supported.  For example, ISA controllers would use the legacy map for

mapping Linux IRQs 0-15 so that existing ISA drivers get the correct IRQ

numbers.



Most users of legacy mappings should use irq_domain_add_simple() which

will use a legacy domain only if an IRQ range is supplied by the

system and will otherwise use a linear domain mapping.

arch/powerpc/sysdev/xics/icp-hv.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static unsigned int icp_hv_get_irq(void) 
	if (vec == XICS_IRQ_SPURIOUS)

		return NO_IRQ;



	irq = irq_radix_revmap_lookup(xics_host, vec);

	irq = irq_find_mapping(xics_host, vec);

	if (likely(irq != NO_IRQ)) {

		xics_push_cppr(vec);

		return irq;

arch/powerpc/sysdev/xics/icp-native.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static unsigned int icp_native_get_irq(void) 
	if (vec == XICS_IRQ_SPURIOUS)

		return NO_IRQ;



	irq = irq_radix_revmap_lookup(xics_host, vec);

	irq = irq_find_mapping(xics_host, vec);

	if (likely(irq != NO_IRQ)) {

		xics_push_cppr(vec);

		return irq;

arch/powerpc/sysdev/xics/xics-common.c

+0 −3
Original line number Diff line number Diff line
@@ -329,9 +329,6 @@ static int xics_host_map(struct irq_domain *h, unsigned int virq, 


	pr_devel("xics: map virq %d, hwirq 0x%lx\n", virq, hw);



	/* Insert the interrupt mapping into the radix tree for fast lookup */

	irq_radix_revmap_insert(xics_host, virq, hw);



	/* They aren't all level sensitive but we just don't really know */

	irq_set_status_flags(virq, IRQ_LEVEL);

drivers/sh/intc/Kconfig

+4 −0
Original line number Diff line number Diff line 
config SH_INTC

	def_bool y

	select IRQ_DOMAIN



comment "Interrupt controller options"



config INTC_USERIMASK