From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761598Ab3EBS0K (ORCPT ); Thu, 2 May 2013 14:26:10 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:41130 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760863Ab3EBS0G (ORCPT ); Thu, 2 May 2013 14:26:06 -0400 From: Sebastian Hesselbarth To: Sebastian Hesselbarth Cc: Sebastian Hesselbarth , Grant Likely , Rob Herring , Rob Landley , Thomas Gleixner , Russell King , Arnd Bergmann , Jason Cooper , Andrew Lunn , Thomas Petazzoni , Gregory Clement , Ezequiel Garcia , Jean-Francois Moine , devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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, -- 1.7.2.5