From patchwork Mon Sep 29 05:15:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhilash Kesavan X-Patchwork-Id: 4993461 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 CC4CC9F2BA for ; Mon, 29 Sep 2014 05:15:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 042992025B for ; Mon, 29 Sep 2014 05:15:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1FECB20256 for ; Mon, 29 Sep 2014 05:15:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751612AbaI2FP4 (ORCPT ); Mon, 29 Sep 2014 01:15:56 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:43288 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751607AbaI2FPz (ORCPT ); Mon, 29 Sep 2014 01:15:55 -0400 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NCN008TFDAH7O30@mailout3.samsung.com>; Mon, 29 Sep 2014 14:15:53 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.125]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 8B.B8.11124.90BE8245; Mon, 29 Sep 2014 14:15:53 +0900 (KST) X-AuditID: cbfee68e-f79b46d000002b74-0e-5428eb09a895 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id BB.5A.09430.90BE8245; Mon, 29 Sep 2014 14:15:53 +0900 (KST) Received: from abhilash-ubuntu.sisodomain.com ([107.108.73.92]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NCN00D5ED9MLG20@mmp2.samsung.com>; Mon, 29 Sep 2014 14:15:53 +0900 (KST) From: Abhilash Kesavan To: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org, catalin.marinas@arm.com, robh@kernel.org, devicetree@vger.kernel.org, tomasz.figa@gmail.com, linus.walleij@linaro.org Subject: [PATCH v3 2/6] pinctrl: exynos: Consolidate irq domain callbacks Date: Mon, 29 Sep 2014 10:45:08 +0530 Message-id: <1411967712-8321-3-git-send-email-a.kesavan@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1411967712-8321-1-git-send-email-a.kesavan@samsung.com> References: <1411967712-8321-1-git-send-email-a.kesavan@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrLLMWRmVeSWpSXmKPExsWyRsSkVpfztUaIwZW3shbvl/UwWsw/co7V Ysqf5UwWmx5fY7WYcX4fk8X/PTvYLVbt+sPowO6xZt4aRo+ds+6ye2xa1cnmcefaHjaPzUvq PT5vkgtgi+KySUnNySxLLdK3S+DKmNrQy1bQKVUx9/0NlgbGt6JdjJwcEgImEnP2dbJD2GIS F+6tZ+ti5OIQEljKKLFk0gOmLkYOsKKrHRYQ8emMEiu3nmeEcPqYJFoez2UD6WYT0JNY8O8r M4gtIqAhMaXrMdhUZoEFjBJ9LTUgtrCAp8Syf39YQWwWAVWJ3+cfgdXwCrhIvPqxjB1imYLE nEk2IGFOAVeJxV2bwW4QAip58Q7sNgmBRewSbb//Qo0RkPg2+RALRKusxKYDzBC/SEocXHGD ZQKj8AJGhlWMoqkFyQXFSelFRnrFibnFpXnpesn5uZsYgaF++t+zvh2MNw9YH2IU4GBU4uHd sFQjRIg1say4MvcQoynQhonMUqLJ+cCIyiuJNzQ2M7IwNTE1NjK3NFMS502Q+hksJJCeWJKa nZpakFoUX1Sak1p8iJGJg1OqgbFJ71x55ZEyv0bhSb8fdJpNZji8wdGwc9rx8BO89l43el54 xk2eMJ1/VfC7IzfVqucfU5E46+TOy5T+R5j98s3a7+V2bxMF55ze+Cw+e8r3qVqmD1N/mTgf cQ7WO+Qyb5pTznPz6in6dzbnMD99N/1geW/k3rTv5YuZJkkJrBA+wP3tTdQmti1KLMUZiYZa zEXFiQCzOAPRcAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrOIsWRmVeSWpSXmKPExsVy+t9jQV3O1xohBns/i1i8X9bDaDH/yDlW iyl/ljNZbHp8jdVixvl9TBb/9+xgt1i16w+jA7vHmnlrGD12zrrL7rFpVSebx51re9g8Ni+p 9/i8SS6ALaqB0SYjNTEltUghNS85PyUzL91WyTs43jne1MzAUNfQ0sJcSSEvMTfVVsnFJ0DX LTMH6BYlhbLEnFKgUEBicbGSvh2mCaEhbroWMI0Rur4hQXA9RgZoIGENY8bUhl62gk6pirnv b7A0ML4V7WLk4JAQMJG42mHRxcgJZIpJXLi3nq2LkYtDSGA6o8TKrecZIZw+JomWx3PZQKrY BPQkFvz7ygxiiwhoSEzpeswOYjMLLGCU6GupAbGFBTwllv37wwpiswioSvw+/wishlfAReLV j2XsEIsVJOZMsgEJcwq4Sizu2swEEhYCKnnxjm0CI+8CRoZVjKKpBckFxUnpuUZ6xYm5xaV5 6XrJ+bmbGMGR9Ex6B+OqBotDjAIcjEo8vBwrNEKEWBPLiitzDzFKcDArifAqvFYPEeJNSays Si3Kjy8qzUktPsRoCnTTRGYp0eR8YJTnlcQbGpuYmxqbWppYmJhZKonzHmy1DhQSSE8sSc1O TS1ILYLpY+LglGpgbMiYIsixcvLlt8H9khvNN7w/nH4wbYe9sXh0+ir2lyELpIw+x62tPe1p X6jEPDHtf5BU75EvJibqmu+tQmyy+U+s81nMsVb0Xv0m320Wfi98Dd4o39N2lu/hS5ozSTzP tpvHV8dO7Uyny8X6UrYXf1VnKV84rrUhcp1TW2dQ3p6WI/yu1z8qsRRnJBpqMRcVJwIA8w7v T7oCAAA= 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.5 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 Adding a irq_chip field to the samsung_pin_bank struct helps in consolidating the irq domain callbacks for external gpio and wakeup interrupt controllers. The exynos_wkup_irqd_ops and exynos_gpio_irqd_ops have now been merged into a single exynos_eint_irqd_ops. Signed-off-by: Abhilash Kesavan Reviewed-by: Thomas Abraham Tested-by: Thomas Abraham Cc: Tomasz Figa Cc: Linus Walleij --- drivers/pinctrl/samsung/pinctrl-exynos.c | 32 ++++++------------------------ 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.c b/drivers/pinctrl/samsung/pinctrl-exynos.c index 14b9b44..54ebcb6 100644 --- a/drivers/pinctrl/samsung/pinctrl-exynos.c +++ b/drivers/pinctrl/samsung/pinctrl-exynos.c @@ -254,7 +254,7 @@ static struct exynos_irq_chip exynos_gpio_irq_chip = { .eint_pend = EXYNOS_GPIO_EPEND_OFFSET, }; -static int exynos_gpio_irq_map(struct irq_domain *h, unsigned int virq, +static int exynos_eint_irq_map(struct irq_domain *h, unsigned int virq, irq_hw_number_t hw) { struct samsung_pin_bank *b = h->host_data; @@ -267,10 +267,10 @@ static int exynos_gpio_irq_map(struct irq_domain *h, unsigned int virq, } /* - * irq domain callbacks for external gpio interrupt controller. + * irq domain callbacks for external gpio and wakeup interrupt controllers. */ -static const struct irq_domain_ops exynos_gpio_irqd_ops = { - .map = exynos_gpio_irq_map, +static const struct irq_domain_ops exynos_eint_irqd_ops = { + .map = exynos_eint_irq_map, .xlate = irq_domain_xlate_twocell, }; @@ -330,7 +330,7 @@ static int exynos_eint_gpio_init(struct samsung_pinctrl_drv_data *d) if (bank->eint_type != EINT_TYPE_GPIO) continue; bank->irq_domain = irq_domain_add_linear(bank->of_node, - bank->nr_pins, &exynos_gpio_irqd_ops, bank); + bank->nr_pins, &exynos_eint_irqd_ops, bank); if (!bank->irq_domain) { dev_err(dev, "gpio irq domain add failed\n"); ret = -ENXIO; @@ -457,26 +457,6 @@ static void exynos_irq_demux_eint16_31(unsigned int irq, struct irq_desc *desc) chained_irq_exit(chip, desc); } -static int exynos_wkup_irq_map(struct irq_domain *h, unsigned int virq, - irq_hw_number_t hw) -{ - struct samsung_pin_bank *b = h->host_data; - - irq_set_chip_and_handler(virq, &b->irq_chip->chip, - handle_level_irq); - irq_set_chip_data(virq, h->host_data); - set_irq_flags(virq, IRQF_VALID); - return 0; -} - -/* - * irq domain callbacks for external wakeup interrupt controller. - */ -static const struct irq_domain_ops exynos_wkup_irqd_ops = { - .map = exynos_wkup_irq_map, - .xlate = irq_domain_xlate_twocell, -}; - /* * exynos_eint_wkup_init() - setup handling of external wakeup interrupts. * @d: driver data of samsung pinctrl driver. @@ -508,7 +488,7 @@ static int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d) continue; bank->irq_domain = irq_domain_add_linear(bank->of_node, - bank->nr_pins, &exynos_wkup_irqd_ops, bank); + bank->nr_pins, &exynos_eint_irqd_ops, bank); if (!bank->irq_domain) { dev_err(dev, "wkup irq domain add failed\n"); return -ENXIO;