From patchwork Tue Jul 2 09:28:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2811501 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 536789F3EB for ; Tue, 2 Jul 2013 09:34:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1441920153 for ; Tue, 2 Jul 2013 09:34:09 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 460FE20152 for ; Tue, 2 Jul 2013 09:34:07 +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 1Utwu6-0002o7-04; Tue, 02 Jul 2013 09:29:46 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Utwsq-0002jV-Iy; Tue, 02 Jul 2013 09:28:24 +0000 Received: from mail-pa0-x22d.google.com ([2607:f8b0:400e:c03::22d]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Utwsm-0002hH-3Q for linux-arm-kernel@lists.infradead.org; Tue, 02 Jul 2013 09:28:21 +0000 Received: by mail-pa0-f45.google.com with SMTP id bi5so6054977pad.32 for ; Tue, 02 Jul 2013 02:28:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=aVzNpznlonB03YjpdxYMCIU4X+0pJc/icHDv8FYu5GM=; b=I7s9KvZdQ0ykeqiOQXUyQvL4WhEAzPmSRU9WWfh87XwtBfo8vKX/ZLLIMZhj7S+bqw 2GQK0b3G7ChXNIak2b3MVZzRQXRebPlK0b3o9QyXSJdkhIbzeiM5BC9DRCLN7lB4VsVO /yMfgg5q/NLH3XyGT+UU4KCZk4DOc+x1OBjRMRUJUMLdv9CgpoHplyM3K5GeCMuvEiB0 HbEl0OmwVbttSky1WstNHaUMHyby5vA6UpBrFIUg14g6jyN0WKgcuultTGj7Yn+sZ/tY F9cH7BdjoJ/N2shgkCPJB/SygTod4d+Q7pLiWAVEbss5eDOLJGcVQqgss7XShC1FEuJL MTZQ== X-Received: by 10.68.210.103 with SMTP id mt7mr28035711pbc.179.1372757281846; Tue, 02 Jul 2013 02:28:01 -0700 (PDT) Received: from [127.0.0.1] (ac230065.ppp.asahi-net.or.jp. [183.77.230.65]) by mx.google.com with ESMTPSA id wi6sm26581679pbc.22.2013.07.02.02.28.00 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Jul 2013 02:28:01 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Tue, 02 Jul 2013 18:28:06 +0900 Message-Id: <20130702092806.32066.58281.sendpatchset@w520> In-Reply-To: <20130702092725.32066.54861.sendpatchset@w520> References: <20130702092725.32066.54861.sendpatchset@w520> Subject: [PATCH 05/08] ARM: shmobile: Use DT for GIC on EMEV2 and KZM9D X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130702_052820_839179_650BDC01 X-CRM114-Status: UNSURE ( 8.43 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) Cc: arnd@arndb.de, Magnus Damm , horms@verge.net.au, olof@lixom.net, shinya.kuribayashi.px@renesas.com, linux-arm-kernel@lists.infradead.org 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 X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm Remove the C version of the EMEV2 GIC setup code, instead rely on GIC information provided by DT. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/board-kzm9d.c | 2 -- arch/arm/mach-shmobile/include/mach/emev2.h | 1 - arch/arm/mach-shmobile/setup-emev2.c | 15 --------------- 3 files changed, 18 deletions(-) --- 0002/arch/arm/mach-shmobile/board-kzm9d.c +++ work/arch/arm/mach-shmobile/board-kzm9d.c 2013-07-02 15:01:32.000000000 +0900 @@ -86,8 +86,6 @@ DT_MACHINE_START(KZM9D_DT, "kzm9d") .smp = smp_ops(emev2_smp_ops), .map_io = emev2_map_io, .init_early = emev2_init_delay, - .nr_irqs = NR_IRQS_LEGACY, - .init_irq = emev2_init_irq, .init_machine = kzm9d_add_standard_devices, .init_late = shmobile_init_late, .dt_compat = kzm9d_boards_compat_dt, --- 0002/arch/arm/mach-shmobile/include/mach/emev2.h +++ work/arch/arm/mach-shmobile/include/mach/emev2.h 2013-07-02 15:01:48.000000000 +0900 @@ -2,7 +2,6 @@ #define __ASM_EMEV2_H__ extern void emev2_map_io(void); -extern void emev2_init_irq(void); extern void emev2_init_delay(void); extern void emev2_add_standard_devices(void); extern void emev2_clock_init(void); --- 0003/arch/arm/mach-shmobile/setup-emev2.c +++ work/arch/arm/mach-shmobile/setup-emev2.c 2013-07-02 15:01:17.000000000 +0900 @@ -202,20 +202,6 @@ void __init emev2_init_delay(void) shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */ } -void __init emev2_init_irq(void) -{ - void __iomem *gic_dist_base; - void __iomem *gic_cpu_base; - - /* Static mappings, never released */ - gic_dist_base = ioremap(0xe0028000, PAGE_SIZE); - gic_cpu_base = ioremap(0xe0020000, PAGE_SIZE); - BUG_ON(!gic_dist_base || !gic_cpu_base); - - /* Use GIC to handle interrupts */ - gic_init(0, 29, gic_dist_base, gic_cpu_base); -} - #ifdef CONFIG_USE_OF static const struct of_dev_auxdata emev2_auxdata_lookup[] __initconst = { { } @@ -235,7 +221,6 @@ static const char *emev2_boards_compat_d DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)") .smp = smp_ops(emev2_smp_ops), .init_early = emev2_init_delay, - .nr_irqs = NR_IRQS_LEGACY, .init_machine = emev2_add_standard_devices_dt, .dt_compat = emev2_boards_compat_dt, MACHINE_END