diff options
| author | Maxime Ripard | 2014-02-07 21:50:25 +0100 |
|---|---|---|
| committer | Thomas Gleixner | 2014-03-14 13:43:32 +0100 |
| commit | a7e8b4b51917e5e14e28af4f49891bd153ffe5cd (patch) | |
| tree | f2a87e6a1f2c89c4dccb63b7c3dbc85730ab6f6c | |
| parent | Merge branch 'irq/for-gpio' into irq/core (diff) | |
| download | kernel-qcow2-linux-a7e8b4b51917e5e14e28af4f49891bd153ffe5cd.tar.gz kernel-qcow2-linux-a7e8b4b51917e5e14e28af4f49891bd153ffe5cd.tar.xz kernel-qcow2-linux-a7e8b4b51917e5e14e28af4f49891bd153ffe5cd.zip | |
irqchip: sunxi: Change compatibles
The Allwinner A10 compatibles were following a slightly different compatible
patterns than the rest of the SoCs for historical reasons. Change the compatibles
to match the other pattern in the irq controller driver for consistency.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt | 4 | ||||
| -rw-r--r-- | drivers/irqchip/irq-sun4i.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt index 32cec4b26cd0..b290ca150d30 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt @@ -2,7 +2,7 @@ Allwinner Sunxi Interrupt Controller Required properties: -- compatible : should be "allwinner,sun4i-ic" +- compatible : should be "allwinner,sun4i-a10-ic" - reg : Specifies base physical address and size of the registers. - interrupt-controller : Identifies the node as an interrupt controller - #interrupt-cells : Specifies the number of cells needed to encode an @@ -11,7 +11,7 @@ Required properties: Example: intc: interrupt-controller { - compatible = "allwinner,sun4i-ic"; + compatible = "allwinner,sun4i-a10-ic"; reg = <0x01c20400 0x400>; interrupt-controller; #interrupt-cells = <1>; diff --git a/drivers/irqchip/irq-sun4i.c b/drivers/irqchip/irq-sun4i.c index 9fbff030c700..15999551ff7f 100644 --- a/drivers/irqchip/irq-sun4i.c +++ b/drivers/irqchip/irq-sun4i.c @@ -134,7 +134,7 @@ static int __init sun4i_of_init(struct device_node *node, return 0; } -IRQCHIP_DECLARE(allwinner_sun4i_ic, "allwinner,sun4i-ic", sun4i_of_init); +IRQCHIP_DECLARE(allwinner_sun4i_ic, "allwinner,sun4i-a10-ic", sun4i_of_init); static void __exception_irq_entry sun4i_handle_irq(struct pt_regs *regs) { |