From patchwork Thu May 2 18:25:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 2513471 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id AA39A3FD85 for ; Thu, 2 May 2013 18:28:18 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UXyDf-0003UH-Ev; Thu, 02 May 2013 18:27:05 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UXyDB-0007Sp-76; Thu, 02 May 2013 18:26:33 +0000 Received: from mail-bk0-x230.google.com ([2a00:1450:4008:c01::230]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UXyD2-0007QM-Eu for linux-arm-kernel@lists.infradead.org; Thu, 02 May 2013 18:26:27 +0000 Received: by mail-bk0-f48.google.com with SMTP id jf3so391984bkc.21 for ; Thu, 02 May 2013 11:26:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=A/E/NNE3QE4ruwOzs1LeqyrHUWCYKAUipQXVVFaojTo=; b=fAJyK2ifOtcYD9O2HosvH6dq452SFc7VLM2X4oyyu1j+GsAgqG0nCl+KaQitp9Ymr2 rx66ZBEwcMBwAJOzK8Ni/3w0J/OtJS3VsIkjL732kCLH4UpFMJUJ4nW13F+Ek+v0g5O+ voLBzDxlvDCkG/ty7XdU/RCXVewgGkdpGUw4K967YytsmYzF11ynk702N9txiv2w3zGN J/rZS29Kp1zIH2kb/1zmTQe88U6eJCtsMA/iqAtItmY+aq2OHHloCkfvkNVd56VzL4I4 3Tz4yI9EdoTndQSFTruESyh+DV4OOZLb7n9gwcjeuHPdeDxw4Icdc5DcFlbWmB+6sqKp 1YXA== X-Received: by 10.204.165.15 with SMTP id g15mr2493221bky.140.1367519164342; Thu, 02 May 2013 11:26:04 -0700 (PDT) Received: from topkick.lan (dslc-082-083-251-181.pools.arcor-ip.net. [82.83.251.181]) by mx.google.com with ESMTPSA id cv9sm1677764bkb.5.2013.05.02.11.26.02 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 May 2013 11:26:03 -0700 (PDT) Received: from picnic.unix.mst.uni-hannover.de (phire.mst.uni-hannover.de [130.75.30.51]) by topkick.lan (Postfix) with ESMTPSA id 134AC605BE; Thu, 2 May 2013 20:25:37 +0200 (CEST) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH 3/3] ARM: dove: move DT boards to orion irqchip driver Date: Thu, 2 May 2013 20:25:40 +0200 Message-Id: <1367519140-19716-4-git-send-email-sebastian.hesselbarth@gmail.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1367519140-19716-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1367519140-19716-1-git-send-email-sebastian.hesselbarth@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130502_142624_701158_0F3FCB07 X-CRM114-Status: GOOD ( 15.59 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (sebastian.hesselbarth[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Thomas Petazzoni , Andrew Lunn , Russell King , Jason Cooper , Arnd Bergmann , Jean-Francois Moine , devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , Gregory Clement , Rob Landley , Grant Likely , Thomas Gleixner , Ezequiel Garcia , linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org With legacy devices mapping their irqs, we can now switch DT enabled boards to orion irqchip driver. Signed-off-by: Sebastian Hesselbarth --- Cc: Grant Likely Cc: Rob Herring Cc: Rob Landley Cc: Thomas Gleixner Cc: Russell King Cc: Arnd Bergmann Cc: Jason Cooper Cc: Andrew Lunn Cc: Thomas Petazzoni Cc: Gregory Clement Cc: Ezequiel Garcia Cc: Jean-Francois Moine Cc: devicetree-discuss@lists.ozlabs.org Cc: linux-doc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/boot/dts/dove.dtsi | 4 ++-- arch/arm/mach-dove/Kconfig | 1 + arch/arm/mach-dove/Makefile | 4 ++-- arch/arm/mach-dove/board-dt.c | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 433cca1..8ba528a 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -38,10 +38,10 @@ }; intc: interrupt-controller { - compatible = "marvell,orion-intc"; + compatible = "marvell,orion-mpic"; interrupt-controller; #interrupt-cells = <1>; - reg = <0x20204 0x04>, <0x20214 0x04>; + reg = <0x20200 0x04>, <0x20210 0x04>; }; core_clk: core-clocks@d0214 { diff --git a/arch/arm/mach-dove/Kconfig b/arch/arm/mach-dove/Kconfig index 36469d8..60d72b4 100644 --- a/arch/arm/mach-dove/Kconfig +++ b/arch/arm/mach-dove/Kconfig @@ -22,6 +22,7 @@ config MACH_CM_A510 config MACH_DOVE_DT bool "Marvell Dove Flattened Device Tree" + select IRQCHIP_ORION select MVEBU_CLK_CORE select MVEBU_CLK_GATING select REGULATOR diff --git a/arch/arm/mach-dove/Makefile b/arch/arm/mach-dove/Makefile index 3f0a858..4780f78 100644 --- a/arch/arm/mach-dove/Makefile +++ b/arch/arm/mach-dove/Makefile @@ -1,5 +1,5 @@ -obj-y += common.o addr-map.o irq.o -obj-$(CONFIG_DOVE_LEGACY) += mpp.o +obj-y += common.o addr-map.o +obj-$(CONFIG_DOVE_LEGACY) += irq.o mpp.o obj-$(CONFIG_PCI) += pcie.o obj-$(CONFIG_MACH_DOVE_DB) += dove-db-setup.o obj-$(CONFIG_MACH_DOVE_DT) += board-dt.o diff --git a/arch/arm/mach-dove/board-dt.c b/arch/arm/mach-dove/board-dt.c index cea65b7..b6734b9 100644 --- a/arch/arm/mach-dove/board-dt.c +++ b/arch/arm/mach-dove/board-dt.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -20,7 +21,6 @@ #include #include #include -#include #include #include "common.h" @@ -143,7 +143,7 @@ static const char * const dove_dt_board_compat[] = { DT_MACHINE_START(DOVE_DT, "Marvell Dove (Flattened Device Tree)") .map_io = dove_map_io, - .init_irq = orion_dt_init_irq, + .init_irq = orion_init_irq, .init_time = dove_legacy_timer_init, .init_machine = dove_dt_init, .restart = dove_restart,