From patchwork Tue Jul 7 10:30:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gene Chen X-Patchwork-Id: 11648283 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DB5E060D for ; Tue, 7 Jul 2020 10:31:54 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 96A5C20702 for ; Tue, 7 Jul 2020 10:31:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="gJxGSweh"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gicuxWAw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 96A5C20702 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=s7fURSFKSRFIiMpnkij08HdaEOjGjiZET8UNqU/00Go=; b=gJxGSwehtYNIdEGvbcw/J42iyi h2vK/LCu+nn8vGAfsgjWhcYhBbIh/Kwyae7d355D+zrDvCL8R0/uBp17ne3vnDWREryBvHZvIBVph 9bXVMY/NLgzxsM64Xgf3f2DfitvSPw+Opwfa/ND2O/DmQtEJTzT+52XfW5h8xl3KqkNTAS7u0mZIs zNef2h2c/xAskoRg+vBJx1Ob1bLajMXVuN/woG2960XqHcWl7Y3yMvT2Pnz9H6c2+FtARsdys0Lb9 ewVqTo25wgOhDrfD8QS+KhnmARBL1UBcHwUAeqAFMEkxNCdU5aSkA+M+B+Kk8nv+AoxE1vvrbO4ZT rku9RDwA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jskt4-0003Ki-DH; Tue, 07 Jul 2020 10:31:42 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jsksq-0003E5-4e; Tue, 07 Jul 2020 10:31:30 +0000 Received: by mail-pf1-x444.google.com with SMTP id a14so13676999pfi.2; Tue, 07 Jul 2020 03:31:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=R8Mecnd/N5RuV2ASVo7CBIbtDgnsjAuRaGhB+0HFu8w=; b=gicuxWAwMntPjwvQjl5kbsli4aSZ/UEZS/VhbdBin5eXpEFMtlRPyiHz9qKxsmEl3K OECXuzxQ5AN0vpilIe7xH7y4bJ9D5IFlH3n+kgbTWwmdp5naLT+q1aOu822gUMbVflKH rKSfPDxrLWYtWQfUCz8QsraOzoqaV35SK84MqBcXxGW8ChtV3ww8x4DIwsab1tv8EysB Bt47LSGAYIe0gG25HuOOSgSLPFKodBsDRZrybcKDPmofugx4yNTJpXMIc3/U0a0Ptgr7 3QwXxe0Gc8xSq89Z17H6G1unNtAu4ad4M+PRqE+DNRqhTDmCTglHm1bMO3fB98u1JzXT s1LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=R8Mecnd/N5RuV2ASVo7CBIbtDgnsjAuRaGhB+0HFu8w=; b=h0PquR+gOmXt3CHVOawGm67A8ydrHEdxsarlI634Y0qAsml+Hfdp2KR4TkgiX6UQXZ ObIJT5zpxALBrWxWHSNgwfk/yyCN/3ZV2JqcU7cArKEr+nCBruyriWfsxr3OD9h0TfQT bUeQVGqtkvekaTEyxaCo9fbWmE5OvokYupSESW43TMPlD8ORCUPJsmFV4pK607oRv+0l 8QFtsy4FRLGXyfu47hcaxZpSihVc/7Q8VujDLOKFxqX8tdSGNCLSc5z8Skh+Fyydk3g5 aziVL1IYreyMZRM8vbGqzGBiy0rHkrSpKoC3PxuJNaF3XRc4UbH+WQ+sKlC5Gewly4ID Odag== X-Gm-Message-State: AOAM53363r38NiGiCrESk7GmUGs8e1czOzibynbWweB6ZFTewBmae5zT ZqMP0q2nrtqgpDviDYR3sos= X-Google-Smtp-Source: ABdhPJz2GVdbrVjCYP3z9DeeKDe3WKe4/MXhL33doMCWw6ZlpeVbTH9zSfOauEll/8pOx+0Ci4LmNA== X-Received: by 2002:a62:8482:: with SMTP id k124mr39271134pfd.285.1594117885763; Tue, 07 Jul 2020 03:31:25 -0700 (PDT) Received: from localhost.localdomain ([2402:7500:549:1a30:cc80:8285:be58:d37a]) by smtp.gmail.com with ESMTPSA id io3sm2159014pjb.22.2020.07.07.03.31.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Jul 2020 03:31:25 -0700 (PDT) From: Gene Chen To: lee.jones@linaro.org, matthias.bgg@gmail.com Subject: [PATCH 2/4] mfd: mt6360: Remove handle_post_irq callback function Date: Tue, 7 Jul 2020 18:30:54 +0800 Message-Id: <1594117856-14343-3-git-send-email-gene.chen.richtek@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1594117856-14343-1-git-send-email-gene.chen.richtek@gmail.com> References: <1594117856-14343-1-git-send-email-gene.chen.richtek@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200707_063128_259251_9DF033C9 X-CRM114-Status: GOOD ( 14.91 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:444 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [gene.chen.richtek[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: gene_chen@richtek.com, linux-kernel@vger.kernel.org, cy_huang@richtek.com, benjamin.chao@mediatek.com, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, shufan_lee@richtek.com MIME-Version: 1.0 Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org From: Gene Chen Remove handle_post_irq which is used to retrigger irq. Set irq level low trigger to keep irq always be handled. Signed-off-by: Gene Chen --- drivers/mfd/mt6360-core.c | 25 ++++++++----------------- include/linux/mfd/mt6360.h | 6 +++--- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/drivers/mfd/mt6360-core.c b/drivers/mfd/mt6360-core.c index 5dfc13e..2dd5918 100644 --- a/drivers/mfd/mt6360-core.c +++ b/drivers/mfd/mt6360-core.c @@ -208,24 +208,16 @@ static const struct regmap_irq mt6360_irqs[] = { REGMAP_IRQ_REG_LINE(MT6360_LDO7_PGB_EVT, 8), }; -static int mt6360_pmu_handle_post_irq(void *irq_drv_data) -{ - struct mt6360_data *data = irq_drv_data; - - return regmap_update_bits(data->regmap, - MT6360_PMU_IRQ_SET, MT6360_IRQ_RETRIG, MT6360_IRQ_RETRIG); -} - -static struct regmap_irq_chip mt6360_irq_chip = { +static const struct regmap_irq_chip mt6360_irq_chip = { + .name = "mt6360_irqs", .irqs = mt6360_irqs, .num_irqs = ARRAY_SIZE(mt6360_irqs), - .num_regs = MT6360_PMU_IRQ_REGNUM, - .mask_base = MT6360_PMU_CHG_MASK1, - .status_base = MT6360_PMU_CHG_IRQ1, - .ack_base = MT6360_PMU_CHG_IRQ1, + .num_regs = MT6360_IRQ_REGNUM, + .mask_base = MT6360_REG_PMU_CHGMASK1, + .status_base = MT6360_REG_PMU_CHGIRQ1, + .ack_base = MT6360_REG_PMU_CHGIRQ1, .init_ack_masked = true, .use_ack = true, - .handle_post_irq = mt6360_pmu_handle_post_irq, }; static const struct regmap_config mt6360_pmu_regmap_config = { @@ -339,10 +331,9 @@ static int mt6360_probe(struct i2c_client *client) return -ENODEV; } - mt6360_irq_chip.irq_drv_data = data; ret = devm_regmap_add_irq_chip(&client->dev, data->regmap, client->irq, - IRQF_TRIGGER_FALLING, 0, - &mt6360_irq_chip, &data->irq_data); + IRQF_ONESHOT, 0, &mt6360_irq_chip, + &data->irq_data); if (ret) { dev_err(&client->dev, "Failed to add Regmap IRQ Chip\n"); return ret; diff --git a/include/linux/mfd/mt6360.h b/include/linux/mfd/mt6360.h index 76077e4..9fc6718 100644 --- a/include/linux/mfd/mt6360.h +++ b/include/linux/mfd/mt6360.h @@ -179,7 +179,7 @@ struct mt6360_data { #define MT6360_PMU_SPARE2 (0xA0) #define MT6360_PMU_SPARE3 (0xB0) #define MT6360_PMU_SPARE4 (0xC0) -#define MT6360_PMU_CHG_IRQ1 (0xD0) +#define MT6360_REG_PMU_CHGIRQ1 (0xD0) #define MT6360_PMU_CHG_IRQ2 (0xD1) #define MT6360_PMU_CHG_IRQ3 (0xD2) #define MT6360_PMU_CHG_IRQ4 (0xD3) @@ -211,7 +211,7 @@ struct mt6360_data { #define MT6360_PMU_BUCK2_STAT (0xED) #define MT6360_PMU_LDO_STAT1 (0xEE) #define MT6360_PMU_LDO_STAT2 (0xEF) -#define MT6360_PMU_CHG_MASK1 (0xF0) +#define MT6360_REG_PMU_CHGMASK1 (0xF0) #define MT6360_PMU_CHG_MASK2 (0xF1) #define MT6360_PMU_CHG_MASK3 (0xF2) #define MT6360_PMU_CHG_MASK4 (0xF3) @@ -230,7 +230,7 @@ struct mt6360_data { #define MT6360_PMU_MAXREG (MT6360_PMU_LDO_MASK2) /* MT6360_PMU_IRQ_SET */ -#define MT6360_PMU_IRQ_REGNUM (MT6360_PMU_LDO_IRQ2 - MT6360_PMU_CHG_IRQ1 + 1) +#define MT6360_IRQ_REGNUM 16 #define MT6360_IRQ_RETRIG BIT(2) #define CHIP_VEN_MASK (0xF0)