From patchwork Mon Jun 17 16:33:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2735661 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 9BF499F39E for ; Mon, 17 Jun 2013 17:26:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9FB0120430 for ; Mon, 17 Jun 2013 17:26:00 +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 9130020426 for ; Mon, 17 Jun 2013 17:25:59 +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 1UocTi-0002a7-Vd; Mon, 17 Jun 2013 16:40:30 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UocRP-0006P6-FQ; Mon, 17 Jun 2013 16:38:03 +0000 Received: from mailout3.w1.samsung.com ([210.118.77.13]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UocOy-00061t-J4 for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2013 16:35:36 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MOJ00MBNQ1N6260@mailout3.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2013 17:34:43 +0100 (BST) X-AuditID: cbfec7f5-b7f376d000001ec6-2f-51bf3aa3d01e Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id D0.4B.07878.3AA3FB15; Mon, 17 Jun 2013 17:34:43 +0100 (BST) Received: from amdc1227.digital.local ([106.116.147.199]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MOJ002RHQ1OMHC0@eusync3.samsung.com>; Mon, 17 Jun 2013 17:34:43 +0100 (BST) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH v2 08/38] ARM: EXYNOS: common: Remove legacy interrupt initialization code Date: Mon, 17 Jun 2013 18:33:53 +0200 Message-id: <1371486863-12398-9-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.2.1 In-reply-to: <1371486863-12398-1-git-send-email-t.figa@samsung.com> References: <1371486863-12398-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkluLIzCtJLcpLzFFi42I5/e/4Vd3FVvsDDW70C1v8nXSM3aJ3wVU2 i7NNb9gtNj2+xmox4/w+Jou1R+6yW5y6/pnN4vCbdlaL9TNes1gcm7GE0YHL4/evSYwed67t YfPYvKTe48qJJlaPvi2rGD0+b5ILYIvisklJzcksSy3St0vgyth/4C1rQTtfxcHnK9kbGO9z dzFyckgImEgsvDqDGcIWk7hwbz1bFyMXh5DAUkaJBcsvM0E4fUwS3fNXsIFUsQmoSXxueARm iwioSnxuW8AOUsQs8JJJ4m7jA3aQhLBAjMTCdZvAxrIAFR3fvRcozsHBK+Ak8e20FsQ2BYnj 27cxgticAs4Si/tugZULAZXsnnmJdQIj7wJGhlWMoqmlyQXFSem5RnrFibnFpXnpesn5uZsY IcH3dQfj0mNWhxgFOBiVeHgTxfYHCrEmlhVX5h5ilOBgVhLhjZ24L1CINyWxsiq1KD++qDQn tfgQIxMHp1QDo9Ncyx81Zb2PNh7wune++wzrnJn/tGMPnixaFbc0432M/BfVsw0tZryxT2S0 6p596FTsXcoksFIo/84inzf5okssUtZ/rWZaLBoaKfjzttrp9lNrNXlFGGpWyEkfPXduz9zM k7KuvQbtE444hF9K8j8aFO6pu1WLNy7i2VU2YTXtRQ/s5WYfU2Ipzkg01GIuKk4EAIn+cb0c AgAA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130617_123532_768709_272A726F X-CRM114-Status: GOOD ( 10.93 ) X-Spam-Score: -8.0 (--------) Cc: Kukjin Kim , Arnd Bergmann , Tomasz Figa , Kyungmin Park , Thomas Abraham , Sylwester Nawrocki , Olof Johansson , linux-arm-kernel@lists.infradead.org, Marek Szyprowski 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=-5.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 This patch removes legacy IRQ initialization code that was used to set up interrupt handling when booting with ATAGS, which is not supported any more. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- arch/arm/mach-exynos/common.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 598e4b8..9626ce4 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include @@ -486,41 +485,14 @@ void __init exynos_init_time(void) } } -static unsigned int max_combiner_nr(void) -{ - if (soc_is_exynos5250()) - return EXYNOS5_MAX_COMBINER_NR; - else if (soc_is_exynos4412()) - return EXYNOS4412_MAX_COMBINER_NR; - else if (soc_is_exynos4212()) - return EXYNOS4212_MAX_COMBINER_NR; - else - return EXYNOS4210_MAX_COMBINER_NR; -} - - void __init exynos4_init_irq(void) { - unsigned int gic_bank_offset; - - gic_bank_offset = soc_is_exynos4412() ? 0x4000 : 0x8000; - - if (!of_have_populated_dt()) - gic_init_bases(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU, gic_bank_offset, NULL); - else - irqchip_init(); - - if (!of_have_populated_dt()) - combiner_init(S5P_VA_COMBINER_BASE, NULL, - max_combiner_nr(), COMBINER_IRQ(0, 0)); - - gic_arch_extn.irq_set_wake = s3c_irq_wake; + irqchip_init(); } void __init exynos5_init_irq(void) { irqchip_init(); - gic_arch_extn.irq_set_wake = s3c_irq_wake; } struct bus_type exynos_subsys = {