| Message ID | 1444916813-31024-4-git-send-email-linus.walleij@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Oct 15, 2015 at 8:46 AM, Linus Walleij <linus.walleij@linaro.org> wrote: > The GIC bindings for the ARM11MPCore need to differentiate between > the GIC on the Test Chip and the one on the evaluation baseboard. > Split the binding in two and define new compatible-strings. > > Cc: devicetree@vger.kernel.org > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Rob Herring <robh@kernel.org> > --- > Documentation/devicetree/bindings/arm/gic.txt | 3 ++- > drivers/irqchip/irq-gic.c | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/arm/gic.txt b/Documentation/devicetree/bindings/arm/gic.txt > index 2da059a4790c..a5445622c216 100644 > --- a/Documentation/devicetree/bindings/arm/gic.txt > +++ b/Documentation/devicetree/bindings/arm/gic.txt > @@ -15,7 +15,8 @@ Main node required properties: > "arm,cortex-a15-gic" > "arm,cortex-a9-gic" > "arm,cortex-a7-gic" > - "arm,arm11mp-gic" > + "arm,tc11mp-gic" > + "arm,pb11mp-gic" > "brcm,brahma-b15-gic" > "arm,arm1176jzf-devchip-gic" > "qcom,msm-8660-qgic" > diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c > index 982c09c2d791..5376d1cb0a4f 100644 > --- a/drivers/irqchip/irq-gic.c > +++ b/drivers/irqchip/irq-gic.c > @@ -1184,7 +1184,8 @@ gic_of_init(struct device_node *node, struct device_node *parent) > return 0; > } > IRQCHIP_DECLARE(gic_400, "arm,gic-400", gic_of_init); > -IRQCHIP_DECLARE(arm11mp_gic, "arm,arm11mp-gic", gic_of_init); > +IRQCHIP_DECLARE(armtc11mp_gic, "arm,tc11mp-gic", gic_of_init); > +IRQCHIP_DECLARE(armpb11mp_gic, "arm,pb11mp-gic", gic_of_init); > IRQCHIP_DECLARE(arm1176jzf_dc_gic, "arm,arm1176jzf-devchip-gic", gic_of_init); > IRQCHIP_DECLARE(cortex_a15_gic, "arm,cortex-a15-gic", gic_of_init); > IRQCHIP_DECLARE(cortex_a9_gic, "arm,cortex-a9-gic", gic_of_init); > -- > 2.4.3 >
diff --git a/Documentation/devicetree/bindings/arm/gic.txt b/Documentation/devicetree/bindings/arm/gic.txt index 2da059a4790c..a5445622c216 100644 --- a/Documentation/devicetree/bindings/arm/gic.txt +++ b/Documentation/devicetree/bindings/arm/gic.txt @@ -15,7 +15,8 @@ Main node required properties: "arm,cortex-a15-gic" "arm,cortex-a9-gic" "arm,cortex-a7-gic" - "arm,arm11mp-gic" + "arm,tc11mp-gic" + "arm,pb11mp-gic" "brcm,brahma-b15-gic" "arm,arm1176jzf-devchip-gic" "qcom,msm-8660-qgic" diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 982c09c2d791..5376d1cb0a4f 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -1184,7 +1184,8 @@ gic_of_init(struct device_node *node, struct device_node *parent) return 0; } IRQCHIP_DECLARE(gic_400, "arm,gic-400", gic_of_init); -IRQCHIP_DECLARE(arm11mp_gic, "arm,arm11mp-gic", gic_of_init); +IRQCHIP_DECLARE(armtc11mp_gic, "arm,tc11mp-gic", gic_of_init); +IRQCHIP_DECLARE(armpb11mp_gic, "arm,pb11mp-gic", gic_of_init); IRQCHIP_DECLARE(arm1176jzf_dc_gic, "arm,arm1176jzf-devchip-gic", gic_of_init); IRQCHIP_DECLARE(cortex_a15_gic, "arm,cortex-a15-gic", gic_of_init); IRQCHIP_DECLARE(cortex_a9_gic, "arm,cortex-a9-gic", gic_of_init);
The GIC bindings for the ARM11MPCore need to differentiate between the GIC on the Test Chip and the one on the evaluation baseboard. Split the binding in two and define new compatible-strings. Cc: devicetree@vger.kernel.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- Documentation/devicetree/bindings/arm/gic.txt | 3 ++- drivers/irqchip/irq-gic.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)