From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757903AbbIVKzT (ORCPT ); Tue, 22 Sep 2015 06:55:19 -0400 Received: from terminus.zytor.com ([198.137.202.10]:47940 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757831AbbIVKzP (ORCPT ); Tue, 22 Sep 2015 06:55:15 -0400 Date: Tue, 22 Sep 2015 03:54:33 -0700 From: tip-bot for Geert Uytterhoeven Message-ID: Cc: galak@codeaurora.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, pawel.moll@arm.com, geert+renesas@glider.be, hpa@zytor.com, mingo@kernel.org, ijc+devicetree@hellion.org.uk, tglx@linutronix.de, marc.zyngier@arm.com, jason@lakedaemon.net Reply-To: mingo@kernel.org, hpa@zytor.com, geert+renesas@glider.be, tglx@linutronix.de, ijc+devicetree@hellion.org.uk, jason@lakedaemon.net, marc.zyngier@arm.com, linux-kernel@vger.kernel.org, galak@codeaurora.org, mark.rutland@arm.com, pawel.moll@arm.com, robh+dt@kernel.org In-Reply-To: <1442261204-30931-2-git-send-email-geert+renesas@glider.be> References: <1442261204-30931-2-git-send-email-geert+renesas@glider.be> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] irqchip/gic: Add arm,pl390 support Git-Commit-ID: 8709b9eb37f07193e39ae4f8f8cb59aaed9eae2e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8709b9eb37f07193e39ae4f8f8cb59aaed9eae2e Gitweb: http://git.kernel.org/tip/8709b9eb37f07193e39ae4f8f8cb59aaed9eae2e Author: Geert Uytterhoeven AuthorDate: Mon, 14 Sep 2015 22:06:43 +0200 Committer: Thomas Gleixner CommitDate: Tue, 22 Sep 2015 12:51:18 +0200 irqchip/gic: Add arm,pl390 support Add support for the PrimeCell® Generic Interrupt Controller (PL390) to the GIC DT bindings and driver. Currently the GIC driver treats this GIC variant the same as other GIC variants, but there are differences in hardware topology (e.g. clock inputs). Sort the list of compatible values while we're at it. Signed-off-by: Geert Uytterhoeven Acked-by: Rob Herring Cc: linux-arm-kernel@lists.infradead.org Cc: Pawel Moll Cc: Mark Rutland Cc: Kumar Gala Cc: Jason Cooper Cc: Marc Zyngier Cc: Ian Campbell Link: http://lkml.kernel.org/r/1442261204-30931-2-git-send-email-geert%2Brenesas@glider.be Signed-off-by: Thomas Gleixner --- Documentation/devicetree/bindings/arm/gic.txt | 9 +++++---- drivers/irqchip/irq-gic.c | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/gic.txt b/Documentation/devicetree/bindings/arm/gic.txt index 2da059a..2474285 100644 --- a/Documentation/devicetree/bindings/arm/gic.txt +++ b/Documentation/devicetree/bindings/arm/gic.txt @@ -11,13 +11,14 @@ have PPIs or SGIs. Main node required properties: - compatible : should be one of: - "arm,gic-400" + "arm,arm1176jzf-devchip-gic" + "arm,arm11mp-gic" "arm,cortex-a15-gic" - "arm,cortex-a9-gic" "arm,cortex-a7-gic" - "arm,arm11mp-gic" + "arm,cortex-a9-gic" + "arm,gic-400" + "arm,pl390" "brcm,brahma-b15-gic" - "arm,arm1176jzf-devchip-gic" "qcom,msm-8660-qgic" "qcom,msm-qgic2" - interrupt-controller : Identifies the node as an interrupt controller diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 982c09c..d0ce7ed 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -1191,6 +1191,7 @@ IRQCHIP_DECLARE(cortex_a9_gic, "arm,cortex-a9-gic", gic_of_init); IRQCHIP_DECLARE(cortex_a7_gic, "arm,cortex-a7-gic", gic_of_init); IRQCHIP_DECLARE(msm_8660_qgic, "qcom,msm-8660-qgic", gic_of_init); IRQCHIP_DECLARE(msm_qgic2, "qcom,msm-qgic2", gic_of_init); +IRQCHIP_DECLARE(pl390, "arm,pl390", gic_of_init); #endif