| Message ID | 2621565.f5eISveXXJ@diego |
|---|---|
| State | Accepted |
| Commit | 144cb08864ed44be52d8634ac69cd98e5efcf527 |
| Headers | show |
On Mon, Jul 14, 2014 at 11:03:03PM +0100, Heiko Stübner wrote: > From: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> > > Commit 3ab72f9156bb "dt-bindings: add GIC-400 binding" added the > "arm,gic-400" compatible string, but the corresponding IRQCHIP_DECLARE > was never added to the gic driver. > > Therefore add the missing irqchip declaration for it. > > Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> > > Removed additional empty line and adapted commit message to mark it > as fixing an issue. > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > As I really need this, I took the liberty of adapting the patch accordingly > to make it apply on top of the current irqchip/for-next (or urgent) and > explicitly state the fixed issue. Hope that is ok Acked-by: Will Deacon <will.deacon@arm.com> Will > drivers/irqchip/irq-gic.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c > index 9d26643..6ff28b4 100644 > --- a/drivers/irqchip/irq-gic.c > +++ b/drivers/irqchip/irq-gic.c > @@ -1020,6 +1020,7 @@ gic_of_init(struct device_node *node, struct device_node *parent) > gic_cnt++; > return 0; > } > +IRQCHIP_DECLARE(gic_400, "arm,gic-400", 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); > IRQCHIP_DECLARE(cortex_a7_gic, "arm,cortex-a7-gic", gic_of_init); > -- > 1.9.0 > > > > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jul 15, 2014 at 12:03:03AM +0200, Heiko Stübner wrote: > From: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> > > Commit 3ab72f9156bb "dt-bindings: add GIC-400 binding" added the > "arm,gic-400" compatible string, but the corresponding IRQCHIP_DECLARE > was never added to the gic driver. > > Therefore add the missing irqchip declaration for it. > > Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> > > Removed additional empty line and adapted commit message to mark it > as fixing an issue. > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > As I really need this, I took the liberty of adapting the patch accordingly > to make it apply on top of the current irqchip/for-next (or urgent) and > explicitly state the fixed issue. Hope that is ok > > drivers/irqchip/irq-gic.c | 1 + > 1 file changed, 1 insertion(+) Applied to irqchip/urgent with Will's Ack and Cc'd to stable for v3.14+ thx, Jason. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On Mon, Jul 14, 2014 at 11:03:03PM +0100, Heiko Stübner wrote: > From: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> > > Commit 3ab72f9156bb "dt-bindings: add GIC-400 binding" added the > "arm,gic-400" compatible string, but the corresponding IRQCHIP_DECLARE > was never added to the gic driver. > > Therefore add the missing irqchip declaration for it. > > Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> > > Removed additional empty line and adapted commit message to mark it > as fixing an issue. > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > As I really need this, I took the liberty of adapting the patch accordingly > to make it apply on top of the current irqchip/for-next (or urgent) and > explicitly state the fixed issue. Hope that is ok While this is a fix that we should have, I'm not certain I see why this is urgent. A dt can already have: compatible = "arm,gic-400", "arm,cortex-a15-gic"; Which will work _today_, before this patch. If we need to treat the A15 GIC string differently, we'll have to ensure we support the GIC 400 string first. Thanks, Mark. > > drivers/irqchip/irq-gic.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c > index 9d26643..6ff28b4 100644 > --- a/drivers/irqchip/irq-gic.c > +++ b/drivers/irqchip/irq-gic.c > @@ -1020,6 +1020,7 @@ gic_of_init(struct device_node *node, struct device_node *parent) > gic_cnt++; > return 0; > } > +IRQCHIP_DECLARE(gic_400, "arm,gic-400", 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); > IRQCHIP_DECLARE(cortex_a7_gic, "arm,cortex-a7-gic", gic_of_init); > -- > 1.9.0 > > > > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 7/17/2014 7:48 AM, Jason Cooper wrote: > On Tue, Jul 15, 2014 at 12:03:03AM +0200, Heiko Stübner wrote: >> From: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> >> >> Commit 3ab72f9156bb "dt-bindings: add GIC-400 binding" added the >> "arm,gic-400" compatible string, but the corresponding IRQCHIP_DECLARE >> was never added to the gic driver. >> >> Therefore add the missing irqchip declaration for it. >> >> Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> >> >> Removed additional empty line and adapted commit message to mark it >> as fixing an issue. >> Signed-off-by: Heiko Stuebner <heiko@sntech.de> >> --- >> As I really need this, I took the liberty of adapting the patch accordingly >> to make it apply on top of the current irqchip/for-next (or urgent) and >> explicitly state the fixed issue. Hope that is ok >> >> drivers/irqchip/irq-gic.c | 1 + >> 1 file changed, 1 insertion(+) > > Applied to irqchip/urgent with Will's Ack and Cc'd to stable for v3.14+ > > thx, > > Jason. > Thank you, Suravee -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 9d26643..6ff28b4 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -1020,6 +1020,7 @@ gic_of_init(struct device_node *node, struct device_node *parent) gic_cnt++; return 0; } +IRQCHIP_DECLARE(gic_400, "arm,gic-400", 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); IRQCHIP_DECLARE(cortex_a7_gic, "arm,cortex-a7-gic", gic_of_init);