From patchwork Tue Jul 16 03:22:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 2827869 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E29BBC0AB2 for ; Tue, 16 Jul 2013 03:22:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0B008201BA for ; Tue, 16 Jul 2013 03:22:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8028A201B8 for ; Tue, 16 Jul 2013 03:22:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755316Ab3GPDW1 (ORCPT ); Mon, 15 Jul 2013 23:22:27 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:43373 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753764Ab3GPDW0 (ORCPT ); Mon, 15 Jul 2013 23:22:26 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MQ0000VGEP7RD90@mailout4.samsung.com> for linux-samsung-soc@vger.kernel.org; Tue, 16 Jul 2013 12:22:19 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.49]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 2A.6A.29708.A6CB4E15; Tue, 16 Jul 2013 12:22:18 +0900 (KST) X-AuditID: cbfee690-b7f6f6d00000740c-09-51e4bc6a1662 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id E4.64.03860.A6CB4E15; Tue, 16 Jul 2013 12:22:18 +0900 (KST) Received: from DOKGENEKIM03 ([12.23.120.199]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MQ0001UTEP6EE40@mmp2.samsung.com>; Tue, 16 Jul 2013 12:22:18 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: tglx@linutronix.de Subject: [PATCH] irqchip: exynos: cleanup non-DT stuff in exynos-combiner Date: Tue, 16 Jul 2013 12:22:14 +0900 Message-id: <027401ce81d3$ad706570$08513050$%kim@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac6B06r5JzVR3Fl0Sd+CkT1AG25qtw== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrFIsWRmVeSWpSXmKPExsVy+t8zQ92sPU8CDZ5vt7HY9Pgaq8WM8/uY LDZvmsrswOzx7tw5do/NS+o9Pm+SC2CO4rJJSc3JLEst0rdL4MqYtq2NvaBJvGLuqcUsDYx7 hboYOTkkBEwkjjasYoKwxSQu3FvP1sXIxSEksIxRYtmFE+xwRXc2skAkpjNKzGldxw7h/GWU 2NFxlQ2kik1AQ+Lw+2dACQ4OEQFvieXXFEHCzEBT1yxYzQpiCwt4Ssw7txlsKIuAqsTjI0/B NvMK2EocuHmKEcIWlPgx+R4LRK+WxPqdx5kgbHmJzWveMoOMlxBQl3j0VxckLCKgJ/Hv9QlG iBIRiX0v3jGCnCYhsIxdYue/a8wQuwQkvk0+xALRKyux6QAzxF+SEgdX3GCZwCg2C8nmWUg2 z0KyeRaSFQsYWVYxiqYWJBcUJ6UXmegVJ+YWl+al6yXn525ihMTThB2M9w5YH2JMBlo/kVlK NDkfGI95JfGGxmZGFqYmpsZG5pZmpAkrifOqt1gHCgmkJ5akZqemFqQWxReV5qQWH2Jk4uCU amAsnmG+rXbdNRelI3eF/rWW5qVmZmqv8rp91/vVOukT7M4Ke6qY32RVPv5Q9qhumUB1rJvr zhW7nrVkpTduUm9+rfnbaM9lIePmvV63vq71eZd6VopjqeVBLYVpDHOfaXLc3z/lkqN30ryu 6uiFu3OP1Alejnq77rlaXfbMN9dOhf9oK8qR965QYinOSDTUYi4qTgQApNkV7L0CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpnleLIzCtJLcpLzFFi42I5/e+xoG7WnieBBjP/mVtsenyN1WLG+X1M Fps3TWV2YPZ4d+4cu8fmJfUenzfJBTBHNTDaZKQmpqQWKaTmJeenZOal2yp5B8c7x5uaGRjq GlpamCsp5CXmptoqufgE6Lpl5gAtUlIoS8wpBQoFJBYXK+nbYZoQGuKmawHTGKHrGxIE12Nk gAYS1jFmTNvWxl7QJF4x99RilgbGvUJdjJwcEgImEkfvbGSBsMUkLtxbz9bFyMUhJDCdUWJO 6zp2COcvo8SOjqtsIFVsAhoSh98/A0pwcIgIeEssv6YIEmYGal6zYDUriC0s4Ckx79xmdhCb RUBV4vGRp0wgNq+ArcSBm6cYIWxBiR+T77FA9GpJrN95nAnClpfYvOYtM8h4CQF1iUd/dUHC IgJ6Ev9en2CEKBGR2PfiHeMERoFZSCbNQjJpFpJJs5C0LGBkWcUomlqQXFCclJ5rpFecmFtc mpeul5yfu4kRHK3PpHcwrmqwOMQowMGoxMN7kPNJoBBrYllxZe4hRgkOZiUR3sRNQCHelMTK qtSi/Pii0pzU4kOMyUCPTmSWEk3OByaSvJJ4Q2MTMyNLIzMLIxNzc9KElcR5D7ZaBwoJpCeW pGanphakFsFsYeLglGpgTPAOtLvCwFnb+GllSLt2MctGifMOrU+fn733fsMh9cIHGYIH9PYs VJgU1PMgct6UCj0mVp0Fh3L4FarfT1Z8t/mN1rxHQj1zSxSvH1Gp9mZIn3JHMf3uncCFR4+s Uv6fp/l/anOzfXOO/b2WjdXZS7ISuBQuLWTZuq3TeufRXUuEBfKdnpoWKLEUZyQaajEXFScC ABWQi10aAwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 For EXYNOS SoCs, only can support for DT so removes non-DT stuff in exynos-combiner. Signed-off-by: Kukjin Kim Reviewed-by: Tomasz Figa --- drivers/irqchip/exynos-combiner.c | 44 +------------------------------------ 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/drivers/irqchip/exynos-combiner.c b/drivers/irqchip/exynos-combiner.c index 4c68265..868ed40 100644 --- a/drivers/irqchip/exynos-combiner.c +++ b/drivers/irqchip/exynos-combiner.c @@ -19,10 +19,6 @@ #include #include -#ifdef CONFIG_EXYNOS_ATAGS -#include -#endif - #include "irqchip.h" #define COMBINER_ENABLE_SET 0x0 @@ -138,7 +134,6 @@ static void __init combiner_init_one(struct combiner_chip_data *combiner_data, __raw_writel(combiner_data->irq_mask, base + COMBINER_ENABLE_CLEAR); } -#ifdef CONFIG_OF static int combiner_irq_domain_xlate(struct irq_domain *d, struct device_node *controller, const u32 *intspec, unsigned int intsize, @@ -156,16 +151,6 @@ static int combiner_irq_domain_xlate(struct irq_domain *d, return 0; } -#else -static int combiner_irq_domain_xlate(struct irq_domain *d, - struct device_node *controller, - const u32 *intspec, unsigned int intsize, - unsigned long *out_hwirq, - unsigned int *out_type) -{ - return -EINVAL; -} -#endif static int combiner_irq_domain_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw) @@ -184,26 +169,6 @@ static struct irq_domain_ops combiner_irq_domain_ops = { .map = combiner_irq_domain_map, }; -static unsigned int combiner_lookup_irq(int group) -{ -#ifdef CONFIG_EXYNOS_ATAGS - if (group < EXYNOS4210_MAX_COMBINER_NR || soc_is_exynos5250()) - return IRQ_SPI(group); - - switch (group) { - case 16: - return IRQ_SPI(107); - case 17: - return IRQ_SPI(108); - case 18: - return IRQ_SPI(48); - case 19: - return IRQ_SPI(42); - } -#endif - return 0; -} - static void __init combiner_init(void __iomem *combiner_base, struct device_node *np, unsigned int max_nr, @@ -229,12 +194,7 @@ static void __init combiner_init(void __iomem *combiner_base, } for (i = 0; i < max_nr; i++) { -#ifdef CONFIG_OF - if (np) - irq = irq_of_parse_and_map(np, i); - else -#endif - irq = combiner_lookup_irq(i); + irq = irq_of_parse_and_map(np, i); combiner_init_one(&combiner_data[i], i, combiner_base + (i >> 2) * 0x10, irq); @@ -242,7 +202,6 @@ static void __init combiner_init(void __iomem *combiner_base, } } -#ifdef CONFIG_OF static int __init combiner_of_init(struct device_node *np, struct device_node *parent) { @@ -275,4 +234,3 @@ static int __init combiner_of_init(struct device_node *np, } IRQCHIP_DECLARE(exynos4210_combiner, "samsung,exynos4210-combiner", combiner_of_init); -#endif