From patchwork Tue Jan 5 16:29:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Crispin X-Patchwork-Id: 7956251 Return-Path: X-Original-To: patchwork-linux-mediatek@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AA599BEEE5 for ; Tue, 5 Jan 2016 16:29:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D47102024D for ; Tue, 5 Jan 2016 16:29:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D22BC201DD for ; Tue, 5 Jan 2016 16:29:37 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aGUUK-00068l-JM; Tue, 05 Jan 2016 16:29:36 +0000 Received: from arrakis.dune.hu ([78.24.191.176]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aGUUJ-00066G-00 for linux-mediatek@lists.infradead.org; Tue, 05 Jan 2016 16:29:35 +0000 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 2FAF0283F11; Tue, 5 Jan 2016 17:28:44 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from localhost.localdomain (p548C8701.dip0.t-ipconnect.de [84.140.135.1]) by arrakis.dune.hu (Postfix) with ESMTPSA; Tue, 5 Jan 2016 17:28:44 +0100 (CET) From: John Crispin To: Matthias Brugger Subject: [PATCH 2/2] soc: mediatek: PMIC wrap: INT_EN mask may vary Date: Tue, 5 Jan 2016 17:29:03 +0100 Message-Id: <1452011343-28502-2-git-send-email-blogic@openwrt.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1452011343-28502-1-git-send-email-blogic@openwrt.org> References: <1452011343-28502-1-git-send-email-blogic@openwrt.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160105_082935_278351_C58034D0 X-CRM114-Status: GOOD ( 11.14 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mediatek@lists.infradead.org, =?UTF-8?q?Steven=20Liu=20=28=E5=8A=89=E4=BA=BA=E8=B1=AA=29?= MIME-Version: 1.0 Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The MT7623 and possible other SoCs have a different INT_EN mask. Change the driver so that it handles the interrupt mask in the same was as arb_en_all. Signed-off-by: John Crispin --- drivers/soc/mediatek/mtk-pmic-wrap.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c index f3fccea..82350d0 100644 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c @@ -404,6 +404,7 @@ struct pmic_wrapper_type { u32 dew_base; enum pwrap_type type; u32 arb_en_all; + u32 int_en_all; }; static struct pmic_wrapper_type pwrap_mt8135 = { @@ -412,6 +413,7 @@ static struct pmic_wrapper_type pwrap_mt8135 = { .dew_base = 0xbc00, .type = PWRAP_MT8135, .arb_en_all = 0x1ff, + .int_en_all = BIT(31) | BIT(1), }; static struct pmic_wrapper_type pwrap_mt8173 = { @@ -420,6 +422,7 @@ static struct pmic_wrapper_type pwrap_mt8173 = { .dew_base = 0xbc00, .type = PWRAP_MT8173, .arb_en_all = 0x3f, + .int_en_all = BIT(31) | BIT(1), }; struct pmic_wrapper { @@ -431,6 +434,7 @@ struct pmic_wrapper { u32 dew_base; enum pwrap_type type; u32 arb_en_all; + u32 int_en_all; struct clk *clk_spi; struct clk *clk_wrap; struct reset_control *rstc; @@ -900,6 +904,7 @@ static int pwrap_probe(struct platform_device *pdev) wrp->dew_regs = type->dew_regs; wrp->dew_base = type->dew_base; wrp->arb_en_all = type->arb_en_all; + wrp->int_en_all = type->int_en_all; wrp->dev = &pdev->dev; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pwrap"); @@ -974,7 +979,7 @@ static int pwrap_probe(struct platform_device *pdev) pwrap_writel(wrp, 0xf, PWRAP_WDT_UNIT); pwrap_writel(wrp, 0xffffffff, PWRAP_WDT_SRC_EN); pwrap_writel(wrp, 0x1, PWRAP_TIMER_EN); - pwrap_writel(wrp, ~((1 << 31) | (1 << 1)), PWRAP_INT_EN); + pwrap_writel(wrp, ~wrp->int_en_all, PWRAP_INT_EN); irq = platform_get_irq(pdev, 0); ret = devm_request_irq(wrp->dev, irq, pwrap_interrupt, IRQF_TRIGGER_HIGH,