From patchwork Thu Sep 8 10:49:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mars Cheng X-Patchwork-Id: 9320983 X-Patchwork-Delegate: sboyd@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6C1DA6077F for ; Thu, 8 Sep 2016 10:51:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 580B1297B8 for ; Thu, 8 Sep 2016 10:51:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4C427297BC; Thu, 8 Sep 2016 10:51:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD588297B8 for ; Thu, 8 Sep 2016 10:51:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759148AbcIHKus (ORCPT ); Thu, 8 Sep 2016 06:50:48 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:15393 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1756907AbcIHKup (ORCPT ); Thu, 8 Sep 2016 06:50:45 -0400 Received: from mtkhts09.mediatek.inc [(172.21.101.70)] by mailgw02.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 551740422; Thu, 08 Sep 2016 18:50:41 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by mtkhts09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 14.3.266.1; Thu, 8 Sep 2016 18:50:39 +0800 From: Mars Cheng To: Matthias Brugger , Rob Herring , Marc Zyngier , Mark Rutland , Michael Turquette , Stephen Boyd , Erin Lo , James Liao CC: , CC Hwang , Loda Choui , Miles Chen , Scott Shu , Jades Shih , Yingjoe Chen , My Chuang , , , , , Mars Cheng Subject: [PATCH 2/4] irqchip: mtk-sysirq: support second intpol base Date: Thu, 8 Sep 2016 18:49:51 +0800 Message-ID: <1473331794-27542-3-git-send-email-mars.cheng@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1473331794-27542-1-git-send-email-mars.cheng@mediatek.com> References: <1473331794-27542-1-git-send-email-mars.cheng@mediatek.com> MIME-Version: 1.0 X-MTK: N Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Original mtk-sysirq does not support multiple intpol bases. However, there are some mtk chips need it. Signed-off-by: Mars Cheng --- drivers/irqchip/irq-mtk-sysirq.c | 42 +++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/drivers/irqchip/irq-mtk-sysirq.c b/drivers/irqchip/irq-mtk-sysirq.c index 63ac73b..20f488a 100644 --- a/drivers/irqchip/irq-mtk-sysirq.c +++ b/drivers/irqchip/irq-mtk-sysirq.c @@ -24,7 +24,10 @@ struct mtk_sysirq_chip_data { spinlock_t lock; + unsigned int intpol_num; + unsigned int intpol_num_ex; void __iomem *intpol_base; + void __iomem *intpol_base_ex; }; static int mtk_sysirq_set_type(struct irq_data *data, unsigned int type) @@ -32,14 +35,22 @@ static int mtk_sysirq_set_type(struct irq_data *data, unsigned int type) irq_hw_number_t hwirq = data->hwirq; struct mtk_sysirq_chip_data *chip_data = data->chip_data; u32 offset, reg_index, value; + void __iomem *intpol_base; unsigned long flags; int ret; + if (hwirq >= (chip_data->intpol_num)) { + intpol_base = chip_data->intpol_base_ex; + reg_index = (hwirq - chip_data->intpol_num) >> 5; + } else { + intpol_base = chip_data->intpol_base; + reg_index = hwirq >> 5; + } + offset = hwirq & 0x1f; - reg_index = hwirq >> 5; spin_lock_irqsave(&chip_data->lock, flags); - value = readl_relaxed(chip_data->intpol_base + reg_index * 4); + value = readl_relaxed(intpol_base + reg_index * 4); if (type == IRQ_TYPE_LEVEL_LOW || type == IRQ_TYPE_EDGE_FALLING) { if (type == IRQ_TYPE_LEVEL_LOW) type = IRQ_TYPE_LEVEL_HIGH; @@ -49,7 +60,7 @@ static int mtk_sysirq_set_type(struct irq_data *data, unsigned int type) } else { value &= ~(1 << offset); } - writel(value, chip_data->intpol_base + reg_index * 4); + writel(value, intpol_base + reg_index * 4); data = data->parent_data; ret = data->chip->irq_set_type(data, type); @@ -124,7 +135,7 @@ static int __init mtk_sysirq_of_init(struct device_node *node, { struct irq_domain *domain, *domain_parent; struct mtk_sysirq_chip_data *chip_data; - int ret, size, intpol_num; + int ret, size, total_intpol_num; struct resource res; domain_parent = irq_find_host(parent); @@ -142,7 +153,8 @@ static int __init mtk_sysirq_of_init(struct device_node *node, return -ENOMEM; size = resource_size(&res); - intpol_num = size * 8; + chip_data->intpol_num = size * 8; + total_intpol_num = chip_data->intpol_num; chip_data->intpol_base = ioremap(res.start, size); if (!chip_data->intpol_base) { pr_err("mtk_sysirq: unable to map sysirq register\n"); @@ -150,8 +162,22 @@ static int __init mtk_sysirq_of_init(struct device_node *node, goto out_free; } - domain = irq_domain_add_hierarchy(domain_parent, 0, intpol_num, node, - &sysirq_domain_ops, chip_data); + /* if we get the second base, handle it, or just go on */ + ret = of_address_to_resource(node, 1, &res); + if (!ret) { /* if we get the second base, handle it */ + size = resource_size(&res); + chip_data->intpol_num_ex = size * 8; + total_intpol_num += chip_data->intpol_num_ex; + chip_data->intpol_base_ex = ioremap(res.start, size); + if (!chip_data->intpol_base_ex) { + pr_err("mtk_sysirq: unable to map sysirq register\n"); + ret = -ENXIO; + goto out_free_ex; + } + } + + domain = irq_domain_add_hierarchy(domain_parent, 0, total_intpol_num, + node, &sysirq_domain_ops, chip_data); if (!domain) { ret = -ENOMEM; goto out_unmap; @@ -161,6 +187,8 @@ static int __init mtk_sysirq_of_init(struct device_node *node, return 0; out_unmap: + iounmap(chip_data->intpol_base_ex); +out_free_ex: iounmap(chip_data->intpol_base); out_free: kfree(chip_data);