From nobody Sun Sep 22 01:50:31 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E75FC433FE for ; Mon, 16 May 2022 12:47:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231732AbiEPMre (ORCPT ); Mon, 16 May 2022 08:47:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234272AbiEPMrJ (ORCPT ); Mon, 16 May 2022 08:47:09 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9301E38BE1 for ; Mon, 16 May 2022 05:47:06 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: kholk11) with ESMTPSA id C54871F42F4E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1652705225; bh=ALr3bte5ObWK9QXi4TwG41I7mS1thOAooIulWi4FCTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lQGztHSJ2tpk2rKbZFcJL4FE2NxgvoXChGVLXlxO8whXjmjUxTlCD0sDZ1lZPucoh Vcg7uPrFNNgwJyoJFsqMElRod4OvlYhd4sDaSs9Vapj5AsnyUcK1cwzrkewRvPAi0/ zVxTesjdnD6dhABiqP51kngmvKzhl1xAq4T1e0gGVC7XrploNqhPULOibH2q9/pdsR rO1FQkfqCIdOOe1NoMFjC6rc5VvpgYwkBWuHd8Ls4Zf8501fHfOD8GFlCBmjut+deQ qev/5NSWDSBOnwwDGlecMlG//eKZVZM3CYQ4K0WcLDtpgxFaCdFLBNksgb4mkBJ31X n0ic5NrBVL0rw== From: AngeloGioacchino Del Regno To: matthias.bgg@gmail.com Cc: linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, nfraprado@collabora.com, rex-bc.chen@mediatek.com, zhiyong.tao@mediatek.com, AngeloGioacchino Del Regno Subject: [PATCH v3 1/5] soc: mediatek: pwrap: Use readx_poll_timeout() instead of custom function Date: Mon, 16 May 2022 14:46:55 +0200 Message-Id: <20220516124659.69484-2-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220516124659.69484-1-angelogioacchino.delregno@collabora.com> References: <20220516124659.69484-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Function pwrap_wait_for_state() is a function that polls an address through a helper function, but this is the very same operation that the readx_poll_timeout macro means to do. Convert all instances of calling pwrap_wait_for_state() to instead use the read_poll_timeout macro. Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: N=C3=ADcolas F. R. A. Prado Tested-by: N=C3=ADcolas F. R. A. Prado --- drivers/soc/mediatek/mtk-pmic-wrap.c | 60 +++++++++++++++------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mt= k-pmic-wrap.c index bf39a64f3ecc..54a5300ab72b 100644 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c @@ -13,6 +13,9 @@ #include #include =20 +#define PWRAP_POLL_DELAY_US 10 +#define PWRAP_POLL_TIMEOUT_US 10000 + #define PWRAP_MT8135_BRIDGE_IORD_ARB_EN 0x4 #define PWRAP_MT8135_BRIDGE_WACS3_EN 0x10 #define PWRAP_MT8135_BRIDGE_INIT_DONE3 0x14 @@ -1241,27 +1244,14 @@ static bool pwrap_is_fsm_idle_and_sync_idle(struct = pmic_wrapper *wrp) (val & PWRAP_STATE_SYNC_IDLE0); } =20 -static int pwrap_wait_for_state(struct pmic_wrapper *wrp, - bool (*fp)(struct pmic_wrapper *)) -{ - unsigned long timeout; - - timeout =3D jiffies + usecs_to_jiffies(10000); - - do { - if (time_after(jiffies, timeout)) - return fp(wrp) ? 0 : -ETIMEDOUT; - if (fp(wrp)) - return 0; - } while (1); -} - static int pwrap_read16(struct pmic_wrapper *wrp, u32 adr, u32 *rdata) { + bool tmp; int ret; u32 val; =20 - ret =3D pwrap_wait_for_state(wrp, pwrap_is_fsm_idle); + ret =3D readx_poll_timeout(pwrap_is_fsm_idle, wrp, tmp, tmp, + PWRAP_POLL_DELAY_US, PWRAP_POLL_TIMEOUT_US); if (ret) { pwrap_leave_fsm_vldclr(wrp); return ret; @@ -1273,7 +1263,8 @@ static int pwrap_read16(struct pmic_wrapper *wrp, u32= adr, u32 *rdata) val =3D (adr >> 1) << 16; pwrap_writel(wrp, val, PWRAP_WACS2_CMD); =20 - ret =3D pwrap_wait_for_state(wrp, pwrap_is_fsm_vldclr); + ret =3D readx_poll_timeout(pwrap_is_fsm_vldclr, wrp, tmp, tmp, + PWRAP_POLL_DELAY_US, PWRAP_POLL_TIMEOUT_US); if (ret) return ret; =20 @@ -1290,11 +1281,14 @@ static int pwrap_read16(struct pmic_wrapper *wrp, u= 32 adr, u32 *rdata) =20 static int pwrap_read32(struct pmic_wrapper *wrp, u32 adr, u32 *rdata) { + bool tmp; int ret, msb; =20 *rdata =3D 0; for (msb =3D 0; msb < 2; msb++) { - ret =3D pwrap_wait_for_state(wrp, pwrap_is_fsm_idle); + ret =3D readx_poll_timeout(pwrap_is_fsm_idle, wrp, tmp, tmp, + PWRAP_POLL_DELAY_US, PWRAP_POLL_TIMEOUT_US); + if (ret) { pwrap_leave_fsm_vldclr(wrp); return ret; @@ -1303,7 +1297,8 @@ static int pwrap_read32(struct pmic_wrapper *wrp, u32= adr, u32 *rdata) pwrap_writel(wrp, ((msb << 30) | (adr << 16)), PWRAP_WACS2_CMD); =20 - ret =3D pwrap_wait_for_state(wrp, pwrap_is_fsm_vldclr); + ret =3D readx_poll_timeout(pwrap_is_fsm_vldclr, wrp, tmp, tmp, + PWRAP_POLL_DELAY_US, PWRAP_POLL_TIMEOUT_US); if (ret) return ret; =20 @@ -1323,9 +1318,11 @@ static int pwrap_read(struct pmic_wrapper *wrp, u32 = adr, u32 *rdata) =20 static int pwrap_write16(struct pmic_wrapper *wrp, u32 adr, u32 wdata) { + bool tmp; int ret; =20 - ret =3D pwrap_wait_for_state(wrp, pwrap_is_fsm_idle); + ret =3D readx_poll_timeout(pwrap_is_fsm_idle, wrp, tmp, tmp, + PWRAP_POLL_DELAY_US, PWRAP_POLL_TIMEOUT_US); if (ret) { pwrap_leave_fsm_vldclr(wrp); return ret; @@ -1344,10 +1341,12 @@ static int pwrap_write16(struct pmic_wrapper *wrp, = u32 adr, u32 wdata) =20 static int pwrap_write32(struct pmic_wrapper *wrp, u32 adr, u32 wdata) { + bool tmp; int ret, msb, rdata; =20 for (msb =3D 0; msb < 2; msb++) { - ret =3D pwrap_wait_for_state(wrp, pwrap_is_fsm_idle); + ret =3D readx_poll_timeout(pwrap_is_fsm_idle, wrp, tmp, tmp, + PWRAP_POLL_DELAY_US, PWRAP_POLL_TIMEOUT_US); if (ret) { pwrap_leave_fsm_vldclr(wrp); return ret; @@ -1388,6 +1387,7 @@ static int pwrap_regmap_write(void *context, u32 adr,= u32 wdata) =20 static int pwrap_reset_spislave(struct pmic_wrapper *wrp) { + bool tmp; int ret, i; =20 pwrap_writel(wrp, 0, PWRAP_HIPRIO_ARB_EN); @@ -1407,7 +1407,8 @@ static int pwrap_reset_spislave(struct pmic_wrapper *= wrp) pwrap_writel(wrp, wrp->master->spi_w | PWRAP_MAN_CMD_OP_OUTS, PWRAP_MAN_CMD); =20 - ret =3D pwrap_wait_for_state(wrp, pwrap_is_sync_idle); + ret =3D readx_poll_timeout(pwrap_is_sync_idle, wrp, tmp, tmp, + PWRAP_POLL_DELAY_US, PWRAP_POLL_TIMEOUT_US); if (ret) { dev_err(wrp->dev, "%s fail, ret=3D%d\n", __func__, ret); return ret; @@ -1458,14 +1459,15 @@ static int pwrap_init_sidly(struct pmic_wrapper *wr= p) static int pwrap_init_dual_io(struct pmic_wrapper *wrp) { int ret; + bool tmp; u32 rdata; =20 /* Enable dual IO mode */ pwrap_write(wrp, wrp->slave->dew_regs[PWRAP_DEW_DIO_EN], 1); =20 /* Check IDLE & INIT_DONE in advance */ - ret =3D pwrap_wait_for_state(wrp, - pwrap_is_fsm_idle_and_sync_idle); + ret =3D readx_poll_timeout(pwrap_is_fsm_idle_and_sync_idle, wrp, tmp, tmp, + PWRAP_POLL_DELAY_US, PWRAP_POLL_TIMEOUT_US); if (ret) { dev_err(wrp->dev, "%s fail, ret=3D%d\n", __func__, ret); return ret; @@ -1570,6 +1572,7 @@ static bool pwrap_is_pmic_cipher_ready(struct pmic_wr= apper *wrp) static int pwrap_init_cipher(struct pmic_wrapper *wrp) { int ret; + bool tmp; u32 rdata =3D 0; =20 pwrap_writel(wrp, 0x1, PWRAP_CIPHER_SWRST); @@ -1624,14 +1627,16 @@ static int pwrap_init_cipher(struct pmic_wrapper *w= rp) } =20 /* wait for cipher data ready@AP */ - ret =3D pwrap_wait_for_state(wrp, pwrap_is_cipher_ready); + ret =3D readx_poll_timeout(pwrap_is_cipher_ready, wrp, tmp, tmp, + PWRAP_POLL_DELAY_US, PWRAP_POLL_TIMEOUT_US); if (ret) { dev_err(wrp->dev, "cipher data ready@AP fail, ret=3D%d\n", ret); return ret; } =20 /* wait for cipher data ready@PMIC */ - ret =3D pwrap_wait_for_state(wrp, pwrap_is_pmic_cipher_ready); + ret =3D readx_poll_timeout(pwrap_is_pmic_cipher_ready, wrp, tmp, tmp, + PWRAP_POLL_DELAY_US, PWRAP_POLL_TIMEOUT_US); if (ret) { dev_err(wrp->dev, "timeout waiting for cipher data ready@PMIC\n"); @@ -1640,7 +1645,8 @@ static int pwrap_init_cipher(struct pmic_wrapper *wrp) =20 /* wait for cipher mode idle */ pwrap_write(wrp, wrp->slave->dew_regs[PWRAP_DEW_CIPHER_MODE], 0x1); - ret =3D pwrap_wait_for_state(wrp, pwrap_is_fsm_idle_and_sync_idle); + ret =3D readx_poll_timeout(pwrap_is_fsm_idle_and_sync_idle, wrp, tmp, tmp, + PWRAP_POLL_DELAY_US, PWRAP_POLL_TIMEOUT_US); if (ret) { dev_err(wrp->dev, "cipher mode idle fail, ret=3D%d\n", ret); return ret; --=20 2.35.1 From nobody Sun Sep 22 01:50:31 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90B42C433F5 for ; Mon, 16 May 2022 12:47:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237797AbiEPMrZ (ORCPT ); Mon, 16 May 2022 08:47:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232502AbiEPMrJ (ORCPT ); Mon, 16 May 2022 08:47:09 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1CB6538BE3 for ; Mon, 16 May 2022 05:47:07 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: kholk11) with ESMTPSA id 6EB611F42F4D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1652705226; bh=5vOHDRqH1zBj4kXu3ekurCYU3ZRxfiqVzKY6haFAxx4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dDPjBUIrW/eTtO73MVMAKmCZme3fhzCFy/tiY4TYEk1GqoMrDq/mnprQPCN0Tb0kS GrdeoAh4lWKUMFnc2X99OS6J8Kk3Yn0I8mkcUe40/XlWDApBOgOnLORUB9ytAoY1wz ndLIeo4YbOY/nRE3sq729D0HPa7QHuSkV/ATXYg/3dkNoTTHgwMqgSNvYOt347qnMF JFn//ydkPXMn5jCI5JQ/L04GhDSx0GVp5HIAmXMHPS4DZMC/ltncJjRbfE7Z7iWTB4 Nyk8+RdT7AXoaru6gCXFqUtjGeDTJeluGYVH+onJOe8F4Ch5alEpd+kO6CilECx/IS 7Hr2xWQVeNnTQ== From: AngeloGioacchino Del Regno To: matthias.bgg@gmail.com Cc: linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, nfraprado@collabora.com, rex-bc.chen@mediatek.com, zhiyong.tao@mediatek.com, AngeloGioacchino Del Regno Subject: [PATCH v3 2/5] soc: mediatek: pwrap: Switch to devm_platform_ioremap_resource_byname() Date: Mon, 16 May 2022 14:46:56 +0200 Message-Id: <20220516124659.69484-3-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220516124659.69484-1-angelogioacchino.delregno@collabora.com> References: <20220516124659.69484-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to simplify ioremapping resources, instead of calling platform_get_resource_byname() and then devm_ioremap_resource(), simply call devm_platform_ioremap_resource_byname(). Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: N=C3=ADcolas F. R. A. Prado Tested-by: N=C3=ADcolas F. R. A. Prado --- drivers/soc/mediatek/mtk-pmic-wrap.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mt= k-pmic-wrap.c index 54a5300ab72b..852514366f1f 100644 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c @@ -2191,7 +2191,6 @@ static int pwrap_probe(struct platform_device *pdev) struct pmic_wrapper *wrp; struct device_node *np =3D pdev->dev.of_node; const struct of_device_id *of_slave_id =3D NULL; - struct resource *res; =20 if (np->child) of_slave_id =3D of_match_node(of_slave_match_tbl, np->child); @@ -2211,8 +2210,7 @@ static int pwrap_probe(struct platform_device *pdev) wrp->slave =3D of_slave_id->data; wrp->dev =3D &pdev->dev; =20 - res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "pwrap"); - wrp->base =3D devm_ioremap_resource(wrp->dev, res); + wrp->base =3D devm_platform_ioremap_resource_byname(pdev, "pwrap"); if (IS_ERR(wrp->base)) return PTR_ERR(wrp->base); =20 @@ -2226,9 +2224,7 @@ static int pwrap_probe(struct platform_device *pdev) } =20 if (HAS_CAP(wrp->master->caps, PWRAP_CAP_BRIDGE)) { - res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, - "pwrap-bridge"); - wrp->bridge_base =3D devm_ioremap_resource(wrp->dev, res); + wrp->bridge_base =3D devm_platform_ioremap_resource_byname(pdev, "pwrap-= bridge"); if (IS_ERR(wrp->bridge_base)) return PTR_ERR(wrp->bridge_base); =20 --=20 2.35.1 From nobody Sun Sep 22 01:50:31 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E564C433EF for ; Mon, 16 May 2022 12:47:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234229AbiEPMr2 (ORCPT ); Mon, 16 May 2022 08:47:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232553AbiEPMrJ (ORCPT ); Mon, 16 May 2022 08:47:09 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD7CE38BE4 for ; Mon, 16 May 2022 05:47:07 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: kholk11) with ESMTPSA id 1A38C1F42F4F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1652705226; bh=WLVrWccIwGrbjarjl1t+zyyFEO23qLIaLUG4z1ooZTI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N/45Ky2Bk30/JnJ2vUjgK4WzlqnlOVSDfJtgeEGMSTjv/55mkln5smG4KTTHWfhgu pWQBtCB85Rg2nO7BbzQSDWMKy2dZc8eDFdsh+s9jzqW9dpzCRc5PGNOjpn0Wfy6Aa/ P0LynZiL1WiX9+H2jxRxFbXoM/mZYyCqtN6XJLFfKFYv+tG5fMM+K5drluDtB7uGAb EmkAvAfwvsO6nnj7kzJAuS+fwQyGH5bVcEficPMC5jSKpSsGB4KBaa4UiQfNd6nssV ghs/KknjjvMXkmRDnIzRkURSMUfHszGoKsi9q/BuEWNOhFLwXHmLVCQmu+kxT9zDqD 4VSrgGl3G43kA== From: AngeloGioacchino Del Regno To: matthias.bgg@gmail.com Cc: linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, nfraprado@collabora.com, rex-bc.chen@mediatek.com, zhiyong.tao@mediatek.com, AngeloGioacchino Del Regno Subject: [PATCH v3 3/5] soc: mediatek: pwrap: Move and check return value of platform_get_irq() Date: Mon, 16 May 2022 14:46:57 +0200 Message-Id: <20220516124659.69484-4-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220516124659.69484-1-angelogioacchino.delregno@collabora.com> References: <20220516124659.69484-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move the call to platform_get_irq() earlier in the probe function and check for its return value: if no interrupt is specified, it wouldn't make sense to try to call devm_request_irq() so, in that case, we can simply return early. Moving the platform_get_irq() call also makes it possible to use one less goto, as clocks aren't required at that stage. Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: N=C3=ADcolas F. R. A. Prado Tested-by: N=C3=ADcolas F. R. A. Prado --- drivers/soc/mediatek/mtk-pmic-wrap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mt= k-pmic-wrap.c index 852514366f1f..332cbcabc299 100644 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c @@ -2204,6 +2204,10 @@ static int pwrap_probe(struct platform_device *pdev) if (!wrp) return -ENOMEM; =20 + irq =3D platform_get_irq(pdev, 0); + if (irq < 0) + return irq; + platform_set_drvdata(pdev, wrp); =20 wrp->master =3D of_device_get_match_data(&pdev->dev); @@ -2316,7 +2320,6 @@ static int pwrap_probe(struct platform_device *pdev) if (HAS_CAP(wrp->master->caps, PWRAP_CAP_INT1_EN)) pwrap_writel(wrp, wrp->master->int1_en_all, PWRAP_INT1_EN); =20 - irq =3D platform_get_irq(pdev, 0); ret =3D devm_request_irq(wrp->dev, irq, pwrap_interrupt, IRQF_TRIGGER_HIGH, "mt-pmic-pwrap", wrp); --=20 2.35.1 From nobody Sun Sep 22 01:50:31 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F194EC433F5 for ; Mon, 16 May 2022 12:47:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233155AbiEPMrq (ORCPT ); Mon, 16 May 2022 08:47:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234855AbiEPMrJ (ORCPT ); Mon, 16 May 2022 08:47:09 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5ADBB39177 for ; Mon, 16 May 2022 05:47:08 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: kholk11) with ESMTPSA id B8BD01F42F50 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1652705227; bh=rU3HMUqW9dWRUgBD1kOKJz9+OYOFxEoj5qLLiVQ3VwM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UuUqWrd/NaLBeyNWs6OBsad9vy+o0FVY9Y2FKgELcvowSX9hwr5AE/ZgoP6o6Bl2x t9H7zK8cK4MH2ROSyB28un3Lqizky0z+uOlDcH9aRrQVEd7p6eFFjpqoLv1D2+K+jR jl4rWD6Zqec11tb8TcQ8mSCpi8Ooy4cvI7im+zLiSnmnkB+XOfBWbQHD+xZl6rWqzU atJdOBeji2TQ7NNJVlZWCecjyWASFEu/Fkej0up15/n9UfOax1sJOHj94J3PjXq61R o2AeiIMxByFFPxajf/G2YNQVzofoXzoEQ/3Ct8YO4VzotN7iKWzR4hBpUJZGih3Zvd lJO+Ich+NgTBw== From: AngeloGioacchino Del Regno To: matthias.bgg@gmail.com Cc: linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, nfraprado@collabora.com, rex-bc.chen@mediatek.com, zhiyong.tao@mediatek.com, AngeloGioacchino Del Regno Subject: [PATCH v3 4/5] soc: mediatek: pwrap: Move IO pointers to new structure Date: Mon, 16 May 2022 14:46:58 +0200 Message-Id: <20220516124659.69484-5-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220516124659.69484-1-angelogioacchino.delregno@collabora.com> References: <20220516124659.69484-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In the PMIC Wrapper driver each PMIC has its own regmap configuration and its own pwrap_{read/write}() callbacks, but it's just about either a 32 bits vs 16 bits register, and only one of them uses 32bits regs: this means that the same ops are assigned over and over again to all of the supported PMICs. It is therefore possible to avoid reassigning the same things over and over, reducing the amount of lines, without any impact on human readability of this driver: add a pwrap_slv_regops structure and move the callbacks and regmap_config pointer in there instead. This allows to assign just one pointer to that shared data in the per-pmic struct pwrap_slv_type. Signed-off-by: AngeloGioacchino Del Regno --- drivers/soc/mediatek/mtk-pmic-wrap.c | 61 +++++++++++++++------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mt= k-pmic-wrap.c index 332cbcabc299..7d02e1d4faf4 100644 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c @@ -1143,12 +1143,9 @@ enum pwrap_type { }; =20 struct pmic_wrapper; -struct pwrap_slv_type { - const u32 *dew_regs; - enum pmic_type type; + +struct pwrap_slv_regops { const struct regmap_config *regmap; - /* Flags indicating the capability for the target slave */ - u32 caps; /* * pwrap operations are highly associated with the PMIC types, * so the pointers added increases flexibility allowing determination @@ -1158,6 +1155,14 @@ struct pwrap_slv_type { int (*pwrap_write)(struct pmic_wrapper *wrp, u32 adr, u32 wdata); }; =20 +struct pwrap_slv_type { + const u32 *dew_regs; + enum pmic_type type; + const struct pwrap_slv_regops *regops; + /* Flags indicating the capability for the target slave */ + u32 caps; +}; + struct pmic_wrapper { struct device *dev; void __iomem *base; @@ -1313,7 +1318,7 @@ static int pwrap_read32(struct pmic_wrapper *wrp, u32= adr, u32 *rdata) =20 static int pwrap_read(struct pmic_wrapper *wrp, u32 adr, u32 *rdata) { - return wrp->slave->pwrap_read(wrp, adr, rdata); + return wrp->slave->regops->pwrap_read(wrp, adr, rdata); } =20 static int pwrap_write16(struct pmic_wrapper *wrp, u32 adr, u32 wdata) @@ -1372,7 +1377,7 @@ static int pwrap_write32(struct pmic_wrapper *wrp, u3= 2 adr, u32 wdata) =20 static int pwrap_write(struct pmic_wrapper *wrp, u32 adr, u32 wdata) { - return wrp->slave->pwrap_write(wrp, adr, wdata); + return wrp->slave->regops->pwrap_write(wrp, adr, wdata); } =20 static int pwrap_regmap_read(void *context, u32 adr, u32 *rdata) @@ -1891,69 +1896,67 @@ static const struct regmap_config pwrap_regmap_conf= ig32 =3D { .max_register =3D 0xffff, }; =20 +static const struct pwrap_slv_regops pwrap_regops16 =3D { + .pwrap_read =3D pwrap_read16, + .pwrap_write =3D pwrap_write16, + .regmap =3D &pwrap_regmap_config16, +}; + +static const struct pwrap_slv_regops pwrap_regops32 =3D { + .pwrap_read =3D pwrap_read32, + .pwrap_write =3D pwrap_write32, + .regmap =3D &pwrap_regmap_config32, +}; + static const struct pwrap_slv_type pmic_mt6323 =3D { .dew_regs =3D mt6323_regs, .type =3D PMIC_MT6323, - .regmap =3D &pwrap_regmap_config16, + .regops =3D &pwrap_regops16, .caps =3D PWRAP_SLV_CAP_SPI | PWRAP_SLV_CAP_DUALIO | PWRAP_SLV_CAP_SECURITY, - .pwrap_read =3D pwrap_read16, - .pwrap_write =3D pwrap_write16, }; =20 static const struct pwrap_slv_type pmic_mt6351 =3D { .dew_regs =3D mt6351_regs, .type =3D PMIC_MT6351, - .regmap =3D &pwrap_regmap_config16, + .regops =3D &pwrap_regops16, .caps =3D 0, - .pwrap_read =3D pwrap_read16, - .pwrap_write =3D pwrap_write16, }; =20 static const struct pwrap_slv_type pmic_mt6357 =3D { .dew_regs =3D mt6357_regs, .type =3D PMIC_MT6357, - .regmap =3D &pwrap_regmap_config16, + .regops =3D &pwrap_regops16, .caps =3D 0, - .pwrap_read =3D pwrap_read16, - .pwrap_write =3D pwrap_write16, }; =20 static const struct pwrap_slv_type pmic_mt6358 =3D { .dew_regs =3D mt6358_regs, .type =3D PMIC_MT6358, - .regmap =3D &pwrap_regmap_config16, + .regops =3D &pwrap_regops16, .caps =3D PWRAP_SLV_CAP_SPI | PWRAP_SLV_CAP_DUALIO, - .pwrap_read =3D pwrap_read16, - .pwrap_write =3D pwrap_write16, }; =20 static const struct pwrap_slv_type pmic_mt6359 =3D { .dew_regs =3D mt6359_regs, .type =3D PMIC_MT6359, - .regmap =3D &pwrap_regmap_config16, + .regops =3D &pwrap_regops16, .caps =3D PWRAP_SLV_CAP_DUALIO, - .pwrap_read =3D pwrap_read16, - .pwrap_write =3D pwrap_write16, }; =20 static const struct pwrap_slv_type pmic_mt6380 =3D { .dew_regs =3D NULL, .type =3D PMIC_MT6380, - .regmap =3D &pwrap_regmap_config32, + .regops =3D &pwrap_regops32, .caps =3D 0, - .pwrap_read =3D pwrap_read32, - .pwrap_write =3D pwrap_write32, }; =20 static const struct pwrap_slv_type pmic_mt6397 =3D { .dew_regs =3D mt6397_regs, .type =3D PMIC_MT6397, - .regmap =3D &pwrap_regmap_config16, + .regops =3D &pwrap_regops16, .caps =3D PWRAP_SLV_CAP_SPI | PWRAP_SLV_CAP_DUALIO | PWRAP_SLV_CAP_SECURITY, - .pwrap_read =3D pwrap_read16, - .pwrap_write =3D pwrap_write16, }; =20 static const struct of_device_id of_slave_match_tbl[] =3D { @@ -2326,7 +2329,7 @@ static int pwrap_probe(struct platform_device *pdev) if (ret) goto err_out2; =20 - wrp->regmap =3D devm_regmap_init(wrp->dev, NULL, wrp, wrp->slave->regmap); + wrp->regmap =3D devm_regmap_init(wrp->dev, NULL, wrp, wrp->slave->regops-= >regmap); if (IS_ERR(wrp->regmap)) { ret =3D PTR_ERR(wrp->regmap); goto err_out2; --=20 2.35.1 From nobody Sun Sep 22 01:50:31 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5ECE2C433F5 for ; Mon, 16 May 2022 12:47:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242485AbiEPMrw (ORCPT ); Mon, 16 May 2022 08:47:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235250AbiEPMrK (ORCPT ); Mon, 16 May 2022 08:47:10 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4015C393D8 for ; Mon, 16 May 2022 05:47:09 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: kholk11) with ESMTPSA id 61CCE1F42F51 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1652705228; bh=xO6aHuo6qr2U+3Pw1vJl92VTpaOmj3hu2VdgDueiOp4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LAVwhi5fVzB511R2xm2K0fSzYH9ARO0hXPuFthBl2c1kESQLvsYx3vUWdSjGbI41p 7r1L0SCFCDiF8s04Ggl1ADsjZpb+cVYvfYd8heJUczYJ1jjclBVnWocymXxC/A8PMx Rxm3tllXWSSxBQ6lmZZ2Jg9I6sCSEQmK7zFG+WkSsh7dV0LX8iMEjc5USrCi9kdA66 /XXpo+24TNtv5eUQow4276ox7idic3MfG5UIFC6V7wsc5kWFw+7o08GKQk8JTj90t8 4uV/ko+iM5fq45UN6VNkoc2J5l3QvF5vef8XrOouY2eT6sMUpvSGx/ToxNXSmGbajo owEq5I26yn5rQ== From: AngeloGioacchino Del Regno To: matthias.bgg@gmail.com Cc: linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, nfraprado@collabora.com, rex-bc.chen@mediatek.com, zhiyong.tao@mediatek.com, AngeloGioacchino Del Regno Subject: [PATCH v3 5/5] soc: mediatek: pwrap: Compress of_device_id entries to one line Date: Mon, 16 May 2022 14:46:59 +0200 Message-Id: <20220516124659.69484-6-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220516124659.69484-1-angelogioacchino.delregno@collabora.com> References: <20220516124659.69484-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Compress each entry of the of_device_id tables in this driver to one line instead of three, as they fit just fine in a single line. Signed-off-by: AngeloGioacchino Del Regno --- drivers/soc/mediatek/mtk-pmic-wrap.c | 90 ++++++++-------------------- 1 file changed, 24 insertions(+), 66 deletions(-) diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mt= k-pmic-wrap.c index 7d02e1d4faf4..c018092e6cbe 100644 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c @@ -1960,33 +1960,17 @@ static const struct pwrap_slv_type pmic_mt6397 =3D { }; =20 static const struct of_device_id of_slave_match_tbl[] =3D { - { - .compatible =3D "mediatek,mt6323", - .data =3D &pmic_mt6323, - }, { - .compatible =3D "mediatek,mt6351", - .data =3D &pmic_mt6351, - }, { - .compatible =3D "mediatek,mt6357", - .data =3D &pmic_mt6357, - }, { - .compatible =3D "mediatek,mt6358", - .data =3D &pmic_mt6358, - }, { - .compatible =3D "mediatek,mt6359", - .data =3D &pmic_mt6359, - }, { - /* The MT6380 PMIC only implements a regulator, so we bind it - * directly instead of using a MFD. - */ - .compatible =3D "mediatek,mt6380-regulator", - .data =3D &pmic_mt6380, - }, { - .compatible =3D "mediatek,mt6397", - .data =3D &pmic_mt6397, - }, { - /* sentinel */ - } + { .compatible =3D "mediatek,mt6323", .data =3D &pmic_mt6323 }, + { .compatible =3D "mediatek,mt6351", .data =3D &pmic_mt6351 }, + { .compatible =3D "mediatek,mt6357", .data =3D &pmic_mt6357 }, + { .compatible =3D "mediatek,mt6358", .data =3D &pmic_mt6358 }, + { .compatible =3D "mediatek,mt6359", .data =3D &pmic_mt6359 }, + /* The MT6380 PMIC only implements a regulator, so we bind it + * directly instead of using a MFD. + */ + { .compatible =3D "mediatek,mt6380-regulator", .data =3D &pmic_mt6380 }, + { .compatible =3D "mediatek,mt6397", .data =3D &pmic_mt6397 }, + { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, of_slave_match_tbl); =20 @@ -2145,45 +2129,19 @@ static struct pmic_wrapper_type pwrap_mt8186 =3D { }; =20 static const struct of_device_id of_pwrap_match_tbl[] =3D { - { - .compatible =3D "mediatek,mt2701-pwrap", - .data =3D &pwrap_mt2701, - }, { - .compatible =3D "mediatek,mt6765-pwrap", - .data =3D &pwrap_mt6765, - }, { - .compatible =3D "mediatek,mt6779-pwrap", - .data =3D &pwrap_mt6779, - }, { - .compatible =3D "mediatek,mt6797-pwrap", - .data =3D &pwrap_mt6797, - }, { - .compatible =3D "mediatek,mt6873-pwrap", - .data =3D &pwrap_mt6873, - }, { - .compatible =3D "mediatek,mt7622-pwrap", - .data =3D &pwrap_mt7622, - }, { - .compatible =3D "mediatek,mt8135-pwrap", - .data =3D &pwrap_mt8135, - }, { - .compatible =3D "mediatek,mt8173-pwrap", - .data =3D &pwrap_mt8173, - }, { - .compatible =3D "mediatek,mt8183-pwrap", - .data =3D &pwrap_mt8183, - }, { - .compatible =3D "mediatek,mt8186-pwrap", - .data =3D &pwrap_mt8186, - }, { - .compatible =3D "mediatek,mt8195-pwrap", - .data =3D &pwrap_mt8195, - }, { - .compatible =3D "mediatek,mt8516-pwrap", - .data =3D &pwrap_mt8516, - }, { - /* sentinel */ - } + { .compatible =3D "mediatek,mt2701-pwrap", .data =3D &pwrap_mt2701 }, + { .compatible =3D "mediatek,mt6765-pwrap", .data =3D &pwrap_mt6765 }, + { .compatible =3D "mediatek,mt6779-pwrap", .data =3D &pwrap_mt6779 }, + { .compatible =3D "mediatek,mt6797-pwrap", .data =3D &pwrap_mt6797 }, + { .compatible =3D "mediatek,mt6873-pwrap", .data =3D &pwrap_mt6873 }, + { .compatible =3D "mediatek,mt7622-pwrap", .data =3D &pwrap_mt7622 }, + { .compatible =3D "mediatek,mt8135-pwrap", .data =3D &pwrap_mt8135 }, + { .compatible =3D "mediatek,mt8173-pwrap", .data =3D &pwrap_mt8173 }, + { .compatible =3D "mediatek,mt8183-pwrap", .data =3D &pwrap_mt8183 }, + { .compatible =3D "mediatek,mt8186-pwrap", .data =3D &pwrap_mt8186 }, + { .compatible =3D "mediatek,mt8195-pwrap", .data =3D &pwrap_mt8195 }, + { .compatible =3D "mediatek,mt8516-pwrap", .data =3D &pwrap_mt8516 }, + { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, of_pwrap_match_tbl); =20 --=20 2.35.1