leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: at91: aic add dt support for external irqs

Browse Source 
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2012-04-09 19:36:36 +08:00 committed by Nicolas Ferre
parent 42a859daaf
commit c657394370
7 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/devicetree/bindings/arm/atmel-aic.txt
View File

@ -15,6 +15,7 @@ Required properties:
Valid combinations are 1, 2, 3, 4, 8. Valid combinations are 1, 2, 3, 4, 8.
Default flag for internal sources should be set to 4 (active high). Default flag for internal sources should be set to 4 (active high).
- reg: Should contain AIC registers location and length - reg: Should contain AIC registers location and length
- atmel,external-irqs: u32 array of external irqs.
Examples: Examples:
/* /*

1
arch/arm/boot/dts/at91sam9260.dtsi
View File

@ -56,6 +56,7 @@
compatible = "atmel,at91rm9200-aic"; compatible = "atmel,at91rm9200-aic";
interrupt-controller; interrupt-controller;
reg = <0xfffff000 0x200>; reg = <0xfffff000 0x200>;
atmel,external-irqs = <29 30 31>;
}; };
ramc0: ramc@ffffea00 { ramc0: ramc@ffffea00 {

1
arch/arm/boot/dts/at91sam9263.dtsi
View File

@ -52,6 +52,7 @@
compatible = "atmel,at91rm9200-aic"; compatible = "atmel,at91rm9200-aic";
interrupt-controller; interrupt-controller;
reg = <0xfffff000 0x200>; reg = <0xfffff000 0x200>;
atmel,external-irqs = <30 31>;
}; };
pmc: pmc@fffffc00 { pmc: pmc@fffffc00 {

1
arch/arm/boot/dts/at91sam9g45.dtsi
View File

@ -57,6 +57,7 @@
compatible = "atmel,at91rm9200-aic"; compatible = "atmel,at91rm9200-aic";
interrupt-controller; interrupt-controller;
reg = <0xfffff000 0x200>; reg = <0xfffff000 0x200>;
atmel,external-irqs = <31>;
}; };
ramc0: ramc@ffffe400 { ramc0: ramc@ffffe400 {

1
arch/arm/boot/dts/at91sam9x5.dtsi
View File

@ -55,6 +55,7 @@
compatible = "atmel,at91rm9200-aic"; compatible = "atmel,at91rm9200-aic";
interrupt-controller; interrupt-controller;
reg = <0xfffff000 0x200>; reg = <0xfffff000 0x200>;
atmel,external-irqs = <31>;
}; };
ramc0: ramc@ffffe800 { ramc0: ramc@ffffe800 {

2
arch/arm/mach-at91/at91sam9x5.c
View File

@ -312,8 +312,6 @@ static void __init at91sam9x5_map_io(void)
void __init at91sam9x5_initialize(void) void __init at91sam9x5_initialize(void)
{ {
at91_extern_irq = (1 << AT91SAM9X5_ID_IRQ0);
/* Register GPIO subsystem (using DT) */ /* Register GPIO subsystem (using DT) */
at91_gpio_init(NULL, 0); at91_gpio_init(NULL, 0);
} }

12
arch/arm/mach-at91/irq.c
View File

@ -194,6 +194,10 @@ static struct irq_domain_ops at91_aic_irq_ops = {
int __init at91_aic_of_init(struct device_node *node, int __init at91_aic_of_init(struct device_node *node,
struct device_node *parent) struct device_node *parent)
{ {
struct property *prop;
const __be32 *p;
u32 val;
at91_aic_base = of_iomap(node, 0); at91_aic_base = of_iomap(node, 0);
at91_aic_np = node; at91_aic_np = node;
@ -202,6 +206,14 @@ int __init at91_aic_of_init(struct device_node *node,
if (!at91_aic_domain) if (!at91_aic_domain)
panic("Unable to add AIC irq domain (DT)\n"); panic("Unable to add AIC irq domain (DT)\n");
at91_extern_irq = 0;
of_property_for_each_u32(node, "atmel,external-irqs", prop, p, val) {
if (val > 31)
pr_warn("AIC: external irq %d > 31 skip it\n", val);
else
at91_extern_irq |= (1 << val);
}
irq_set_default_host(at91_aic_domain); irq_set_default_host(at91_aic_domain);
at91_aic_hw_init(NR_AIC_IRQS); at91_aic_hw_init(NR_AIC_IRQS);