Commit-ID: fa776a3f2b1b62970179bcefc55fae85e5700746 Gitweb: http://git.kernel.org/tip/fa776a3f2b1b62970179bcefc55fae85e5700746 Author: Andrew Jeffery <andrew@xxxxxxxx> AuthorDate: Tue, 16 May 2017 15:57:47 +0800 Committer: Marc Zyngier <marc.zyngier@xxxxxxx> CommitDate: Thu, 22 Jun 2017 14:13:39 +0100 irqchip/aspeed-vic: Add AST2500 compatible string In addition to introducing the new compatible string the bindings description is reworked to be more generic. Acked-by: Rob Herring <robh@xxxxxxxxxx> Signed-off-by: Andrew Jeffery <andrew@xxxxxxxx> Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx> --- .../bindings/interrupt-controller/aspeed,ast2400-vic.txt | 9 +++++---- drivers/irqchip/irq-aspeed-vic.c | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2400-vic.txt b/Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2400-vic.txt index 6c6e853..e3fea07 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2400-vic.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2400-vic.txt @@ -1,12 +1,13 @@ Aspeed Vectored Interrupt Controller -These bindings are for the Aspeed AST2400 interrupt controller register layout. -The SoC has an legacy register layout, but this driver does not support that -mode of operation. +These bindings are for the Aspeed interrupt controller. The AST2400 and +AST2500 SoC families include a legacy register layout before a re-designed +layout, but the bindings do not prescribe the use of one or the other. Required properties: -- compatible : should be "aspeed,ast2400-vic". +- compatible : "aspeed,ast2400-vic" + "aspeed,ast2500-vic" - interrupt-controller : Identifies the node as an interrupt controller - #interrupt-cells : Specifies the number of cells needed to encode an diff --git a/drivers/irqchip/irq-aspeed-vic.c b/drivers/irqchip/irq-aspeed-vic.c index 88e139e..03ba477 100644 --- a/drivers/irqchip/irq-aspeed-vic.c +++ b/drivers/irqchip/irq-aspeed-vic.c @@ -227,4 +227,5 @@ static int __init avic_of_init(struct device_node *node, return 0; } -IRQCHIP_DECLARE(aspeed_new_vic, "aspeed,ast2400-vic", avic_of_init); +IRQCHIP_DECLARE(ast2400_vic, "aspeed,ast2400-vic", avic_of_init); +IRQCHIP_DECLARE(ast2500_vic, "aspeed,ast2500-vic", avic_of_init); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|