From patchwork Tue Sep 23 08:16:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhilash Kesavan X-Patchwork-Id: 4954161 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 812E2BEEA5 for ; Tue, 23 Sep 2014 08:16:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 342EE2020F for ; Tue, 23 Sep 2014 08:16:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FDDF2011B for ; Tue, 23 Sep 2014 08:16:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753411AbaIWIQ0 (ORCPT ); Tue, 23 Sep 2014 04:16:26 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:10571 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753534AbaIWIQX (ORCPT ); Tue, 23 Sep 2014 04:16:23 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NCC00IMZHN9BK30@mailout1.samsung.com>; Tue, 23 Sep 2014 17:16:21 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.125]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 6E.F2.18167.45C21245; Tue, 23 Sep 2014 17:16:20 +0900 (KST) X-AuditID: cbfee690-f79ab6d0000046f7-3b-54212c5411ab Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 59.A8.09430.45C21245; Tue, 23 Sep 2014 17:16:20 +0900 (KST) Received: from abhilash-ubuntu.sisodomain.com ([107.108.73.92]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NCC00AJWHN23PB1@mmp1.samsung.com>; Tue, 23 Sep 2014 17:16:20 +0900 (KST) From: Abhilash Kesavan To: linux-arm-kernel@lists.infradead.org Cc: naveenkrishna.ch@gmail.com, linux-samsung-soc@vger.kernel.org, catalin.marinas@arm.com, devicetree@vger.kernel.org, Thomas Abraham , Tomasz Figa , Linus Walleij Subject: [PATCH v2 1/5] pinctrl: exynos: Generalize the eint16_31 demux code Date: Tue, 23 Sep 2014 13:46:05 +0530 Message-id: <1411460169-30536-2-git-send-email-a.kesavan@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1411460169-30536-1-git-send-email-a.kesavan@samsung.com> References: <1411460169-30536-1-git-send-email-a.kesavan@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRmVeSWpSXmKPExsWyRsSkVjdERzHEYNobY4v3y3oYLeYfOcdq MeXPciaLTY+vsVrMOL+PyWLRtv/MFh3LGC1W7frD6MDhsWbeGkaPnbPusnvcubaHzWPzknqP vi2rGD0+b5ILYIvisklJzcksSy3St0vgypj+YwdLwTmhit2t5xgbGN/wdzFycEgImEhcPsne xcgJZIpJXLi3nq2LkYtDSGApo0TL/69sEAkTif+3XjNBJBYxSvw4NokZwuljkvi38BoTSBWb gJ7Egn9fmUFsEQENiSldj9lBipgFPjNKHG87zQiSEBbwkZi88xaYzSKgKtFy9w/Ybl4BV4kT 1+cxQpykIDFnkg1ImFPATeLAh7VgVwgBlXz/uQBspoTAKnaJHz/PskHMEZD4NvkQC0SvrMSm A8wQV0tKHFxxg2UCo/ACRoZVjKKpBckFxUnpRSZ6xYm5xaV56XrJ+bmbGIFhf/rfswk7GO8d sD7EKMDBqMTD67FGIUSINbGsuDL3EKMp0IaJzFKiyfnA6MoriTc0NjOyMDUxNTYytzRTEud9 LfUzWEggPbEkNTs1tSC1KL6oNCe1+BAjEwenVAPjfCY2NekpfimzD/0p8Z1tsb2wr97nXUm0 6qKb6zceOlA23+ejpWtk3sRHe/blLbv8S+JV5vYVOyrmpGVzxF188ddqjcGXS8H2y0Kbb/+e 3HV1tZO91a5yt6Kg/2ezHHauvV/GdnFZqqPOqvSCstAlLRd+WurUrP1SES35Kkxw47vP3nWb pFf6K7EUZyQaajEXFScCAOQZSEx2AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrHIsWRmVeSWpSXmKPExsVy+t9jAd0QHcUQg12ztS3eL+thtJh/5Byr xZQ/y5ksNj2+xmox4/w+JotF2/4zW3QsY7RYtesPowOHx5p5axg9ds66y+5x59oeNo/NS+o9 +rasYvT4vEkugC2qgdEmIzUxJbVIITUvOT8lMy/dVsk7ON453tTMwFDX0NLCXEkhLzE31VbJ xSdA1y0zB+geJYWyxJxSoFBAYnGxkr4dpgmhIW66FjCNEbq+IUFwPUYGaCBhDWPG9B87WArO CVXsbj3H2MD4hr+LkZNDQsBE4v+t10wQtpjEhXvr2boYuTiEBBYxSvw4NokZwuljkvi38BpY FZuAnsSCf1+ZQWwRAQ2JKV2P2UGKmAU+M0ocbzvNCJIQFvCRmLzzFpjNIqAq0XL3DzuIzSvg KnHi+jygOAfQOgWJOZNsQMKcAm4SBz6sZQOxhYBKvv9cwD6BkXcBI8MqRtHUguSC4qT0XCO9 4sTc4tK8dL3k/NxNjOC4eia9g3FVg8UhRgEORiUeXs81CiFCrIllxZW5hxglOJiVRHj7FRVD hHhTEiurUovy44tKc1KLDzGaAh01kVlKNDkfGPN5JfGGxibmpsamliYWJmaWSuK8B1utA4UE 0hNLUrNTUwtSi2D6mDg4pRoY1er75vpsd3sYttfAZ3Ww3M1DrQzBJRn2S3S23+YUiUz6lyAn efJbBL/IlXWtXiufVtnM6wmtEDXm+T63iG0/m46qxe4nvEe9TGVW8lnd6OD8vS70s7igb6iT Y/6ExYYdAmtjtyoY86/bvKgkK/xpec5q/QVutmnLe07zlS09tOnuqyyer2ZKLMUZiYZazEXF iQC5Xpd7wQIAAA== 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.6 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 The function exynos_irq_demux_eint16_31 uses pre-defined offsets for external interrupt pending status and mask registers. So this function is not extensible for Exynos7 SoC which have these registers at different offsets. So generalize the exynos_irq_demux_eint16_31 function by using the pending/mask register offset values from the exynos_irq_chip structure. Signed-off-by: Abhilash Kesavan Reviewed-by: Thomas Abraham Tested-by: Thomas Abraham Cc: Thomas Abraham Cc: Tomasz Figa Cc: Linus Walleij --- drivers/pinctrl/samsung/pinctrl-exynos.c | 6 ++++-- drivers/pinctrl/samsung/pinctrl-exynos.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.c b/drivers/pinctrl/samsung/pinctrl-exynos.c index d7154ed..b5e1cd4 100644 --- a/drivers/pinctrl/samsung/pinctrl-exynos.c +++ b/drivers/pinctrl/samsung/pinctrl-exynos.c @@ -444,10 +444,11 @@ static void exynos_irq_demux_eint16_31(unsigned int irq, struct irq_desc *desc) chained_irq_enter(chip, desc); for (i = 0; i < eintd->nr_banks; ++i) { + struct exynos_irq_chip *our_chip = eintd->chip; struct samsung_pin_bank *b = eintd->banks[i]; - pend = readl(d->virt_base + EXYNOS_WKUP_EPEND_OFFSET + pend = readl(d->virt_base + our_chip->eint_pend + b->eint_offset); - mask = readl(d->virt_base + EXYNOS_WKUP_EMASK_OFFSET + mask = readl(d->virt_base + our_chip->eint_mask + b->eint_offset); exynos_irq_demux_eint(pend & ~mask, b->irq_domain); } @@ -565,6 +566,7 @@ static int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d) muxed_data->banks[idx++] = bank; } muxed_data->nr_banks = muxed_banks; + muxed_data->chip = &exynos_wkup_irq_chip; return 0; } diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.h b/drivers/pinctrl/samsung/pinctrl-exynos.h index 3c91c35..e060722 100644 --- a/drivers/pinctrl/samsung/pinctrl-exynos.h +++ b/drivers/pinctrl/samsung/pinctrl-exynos.h @@ -94,6 +94,7 @@ struct exynos_weint_data { * @banks: array of banks being part of the mux */ struct exynos_muxed_weint_data { + struct exynos_irq_chip *chip; unsigned int nr_banks; struct samsung_pin_bank *banks[]; };