From nobody Thu Dec 18 08:36:03 2025 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 C2F5FC38145 for ; Fri, 2 Sep 2022 14:34:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236566AbiIBOek (ORCPT ); Fri, 2 Sep 2022 10:34:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236417AbiIBOcw (ORCPT ); Fri, 2 Sep 2022 10:32:52 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46D5C27B32; Fri, 2 Sep 2022 06:55:32 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 6B86EB82AE3; Fri, 2 Sep 2022 12:37:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67022C433D6; Fri, 2 Sep 2022 12:37:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1662122252; bh=/67D0l64kojxp9yNGoxfMK9Sz6bEFeIamMgjd0pcGog=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y3NhFNAU3LKf8IcbW156UkFAva5H3cKvbG8IMQKdnNI0Sfhhbjzclt75/AY3UUMEd 1jO7ot/JutqLA6urcJ2F4EO0wBOumbYKcXp5XVdP5PYgs9Ai6qkzbUKpJ3EO6nNCXb TF67aDylqiYyavE6CITa81tQEpU79GMnID/3v3/A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Adrian Hunter , Sebastian Reichel , Ulf Hansson , Sasha Levin Subject: [PATCH 5.19 30/72] mmc: sdhci-of-dwcmshc: rename rk3568 to rk35xx Date: Fri, 2 Sep 2022 14:19:06 +0200 Message-Id: <20220902121405.778878038@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220902121404.772492078@linuxfoundation.org> References: <20220902121404.772492078@linuxfoundation.org> User-Agent: quilt/0.67 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" From: Sebastian Reichel [ Upstream commit 86e1a8e1f9b555af342c53ae06284eeeab9a4263 ] Prepare driver for rk3588 support by renaming the internal data structures. Acked-by: Adrian Hunter Signed-off-by: Sebastian Reichel Link: https://lore.kernel.org/r/20220504213251.264819-11-sebastian.reichel@= collabora.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/sdhci-of-dwcmshc.c | 46 ++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-o= f-dwcmshc.c index 3a1b5ba364051..f5fd88c7adef1 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -56,14 +56,14 @@ #define DLL_LOCK_WO_TMOUT(x) \ ((((x) & DWCMSHC_EMMC_DLL_LOCKED) =3D=3D DWCMSHC_EMMC_DLL_LOCKED) && \ (((x) & DWCMSHC_EMMC_DLL_TIMEOUT) =3D=3D 0)) -#define RK3568_MAX_CLKS 3 +#define RK35xx_MAX_CLKS 3 =20 #define BOUNDARY_OK(addr, len) \ ((addr | (SZ_128M - 1)) =3D=3D ((addr + len - 1) | (SZ_128M - 1))) =20 -struct rk3568_priv { +struct rk35xx_priv { /* Rockchip specified optional clocks */ - struct clk_bulk_data rockchip_clks[RK3568_MAX_CLKS]; + struct clk_bulk_data rockchip_clks[RK35xx_MAX_CLKS]; struct reset_control *reset; u8 txclk_tapnum; }; @@ -178,7 +178,7 @@ static void dwcmshc_rk3568_set_clock(struct sdhci_host = *host, unsigned int clock { struct sdhci_pltfm_host *pltfm_host =3D sdhci_priv(host); struct dwcmshc_priv *dwc_priv =3D sdhci_pltfm_priv(pltfm_host); - struct rk3568_priv *priv =3D dwc_priv->priv; + struct rk35xx_priv *priv =3D dwc_priv->priv; u8 txclk_tapnum =3D DLL_TXCLK_TAPNUM_DEFAULT; u32 extra, reg; int err; @@ -281,7 +281,7 @@ static const struct sdhci_ops sdhci_dwcmshc_ops =3D { .adma_write_desc =3D dwcmshc_adma_write_desc, }; =20 -static const struct sdhci_ops sdhci_dwcmshc_rk3568_ops =3D { +static const struct sdhci_ops sdhci_dwcmshc_rk35xx_ops =3D { .set_clock =3D dwcmshc_rk3568_set_clock, .set_bus_width =3D sdhci_set_bus_width, .set_uhs_signaling =3D dwcmshc_set_uhs_signaling, @@ -296,18 +296,18 @@ static const struct sdhci_pltfm_data sdhci_dwcmshc_pd= ata =3D { .quirks2 =3D SDHCI_QUIRK2_PRESET_VALUE_BROKEN, }; =20 -static const struct sdhci_pltfm_data sdhci_dwcmshc_rk3568_pdata =3D { - .ops =3D &sdhci_dwcmshc_rk3568_ops, +static const struct sdhci_pltfm_data sdhci_dwcmshc_rk35xx_pdata =3D { + .ops =3D &sdhci_dwcmshc_rk35xx_ops, .quirks =3D SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN | SDHCI_QUIRK_BROKEN_TIMEOUT_VAL, .quirks2 =3D SDHCI_QUIRK2_PRESET_VALUE_BROKEN | SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN, }; =20 -static int dwcmshc_rk3568_init(struct sdhci_host *host, struct dwcmshc_pri= v *dwc_priv) +static int dwcmshc_rk35xx_init(struct sdhci_host *host, struct dwcmshc_pri= v *dwc_priv) { int err; - struct rk3568_priv *priv =3D dwc_priv->priv; + struct rk35xx_priv *priv =3D dwc_priv->priv; =20 priv->reset =3D devm_reset_control_array_get_optional_exclusive(mmc_dev(h= ost->mmc)); if (IS_ERR(priv->reset)) { @@ -319,14 +319,14 @@ static int dwcmshc_rk3568_init(struct sdhci_host *hos= t, struct dwcmshc_priv *dwc priv->rockchip_clks[0].id =3D "axi"; priv->rockchip_clks[1].id =3D "block"; priv->rockchip_clks[2].id =3D "timer"; - err =3D devm_clk_bulk_get_optional(mmc_dev(host->mmc), RK3568_MAX_CLKS, + err =3D devm_clk_bulk_get_optional(mmc_dev(host->mmc), RK35xx_MAX_CLKS, priv->rockchip_clks); if (err) { dev_err(mmc_dev(host->mmc), "failed to get clocks %d\n", err); return err; } =20 - err =3D clk_bulk_prepare_enable(RK3568_MAX_CLKS, priv->rockchip_clks); + err =3D clk_bulk_prepare_enable(RK35xx_MAX_CLKS, priv->rockchip_clks); if (err) { dev_err(mmc_dev(host->mmc), "failed to enable clocks %d\n", err); return err; @@ -348,7 +348,7 @@ static int dwcmshc_rk3568_init(struct sdhci_host *host,= struct dwcmshc_priv *dwc static const struct of_device_id sdhci_dwcmshc_dt_ids[] =3D { { .compatible =3D "rockchip,rk3568-dwcmshc", - .data =3D &sdhci_dwcmshc_rk3568_pdata, + .data =3D &sdhci_dwcmshc_rk35xx_pdata, }, { .compatible =3D "snps,dwcmshc-sdhci", @@ -371,7 +371,7 @@ static int dwcmshc_probe(struct platform_device *pdev) struct sdhci_pltfm_host *pltfm_host; struct sdhci_host *host; struct dwcmshc_priv *priv; - struct rk3568_priv *rk_priv =3D NULL; + struct rk35xx_priv *rk_priv =3D NULL; const struct sdhci_pltfm_data *pltfm_data; int err; u32 extra; @@ -426,8 +426,8 @@ static int dwcmshc_probe(struct platform_device *pdev) host->mmc_host_ops.request =3D dwcmshc_request; host->mmc_host_ops.hs400_enhanced_strobe =3D dwcmshc_hs400_enhanced_strob= e; =20 - if (pltfm_data =3D=3D &sdhci_dwcmshc_rk3568_pdata) { - rk_priv =3D devm_kzalloc(&pdev->dev, sizeof(struct rk3568_priv), GFP_KER= NEL); + if (pltfm_data =3D=3D &sdhci_dwcmshc_rk35xx_pdata) { + rk_priv =3D devm_kzalloc(&pdev->dev, sizeof(struct rk35xx_priv), GFP_KER= NEL); if (!rk_priv) { err =3D -ENOMEM; goto err_clk; @@ -435,7 +435,7 @@ static int dwcmshc_probe(struct platform_device *pdev) =20 priv->priv =3D rk_priv; =20 - err =3D dwcmshc_rk3568_init(host, priv); + err =3D dwcmshc_rk35xx_init(host, priv); if (err) goto err_clk; } @@ -452,7 +452,7 @@ static int dwcmshc_probe(struct platform_device *pdev) clk_disable_unprepare(pltfm_host->clk); clk_disable_unprepare(priv->bus_clk); if (rk_priv) - clk_bulk_disable_unprepare(RK3568_MAX_CLKS, + clk_bulk_disable_unprepare(RK35xx_MAX_CLKS, rk_priv->rockchip_clks); free_pltfm: sdhci_pltfm_free(pdev); @@ -464,14 +464,14 @@ static int dwcmshc_remove(struct platform_device *pde= v) struct sdhci_host *host =3D platform_get_drvdata(pdev); struct sdhci_pltfm_host *pltfm_host =3D sdhci_priv(host); struct dwcmshc_priv *priv =3D sdhci_pltfm_priv(pltfm_host); - struct rk3568_priv *rk_priv =3D priv->priv; + struct rk35xx_priv *rk_priv =3D priv->priv; =20 sdhci_remove_host(host, 0); =20 clk_disable_unprepare(pltfm_host->clk); clk_disable_unprepare(priv->bus_clk); if (rk_priv) - clk_bulk_disable_unprepare(RK3568_MAX_CLKS, + clk_bulk_disable_unprepare(RK35xx_MAX_CLKS, rk_priv->rockchip_clks); sdhci_pltfm_free(pdev); =20 @@ -484,7 +484,7 @@ static int dwcmshc_suspend(struct device *dev) struct sdhci_host *host =3D dev_get_drvdata(dev); struct sdhci_pltfm_host *pltfm_host =3D sdhci_priv(host); struct dwcmshc_priv *priv =3D sdhci_pltfm_priv(pltfm_host); - struct rk3568_priv *rk_priv =3D priv->priv; + struct rk35xx_priv *rk_priv =3D priv->priv; int ret; =20 ret =3D sdhci_suspend_host(host); @@ -496,7 +496,7 @@ static int dwcmshc_suspend(struct device *dev) clk_disable_unprepare(priv->bus_clk); =20 if (rk_priv) - clk_bulk_disable_unprepare(RK3568_MAX_CLKS, + clk_bulk_disable_unprepare(RK35xx_MAX_CLKS, rk_priv->rockchip_clks); =20 return ret; @@ -507,7 +507,7 @@ static int dwcmshc_resume(struct device *dev) struct sdhci_host *host =3D dev_get_drvdata(dev); struct sdhci_pltfm_host *pltfm_host =3D sdhci_priv(host); struct dwcmshc_priv *priv =3D sdhci_pltfm_priv(pltfm_host); - struct rk3568_priv *rk_priv =3D priv->priv; + struct rk35xx_priv *rk_priv =3D priv->priv; int ret; =20 ret =3D clk_prepare_enable(pltfm_host->clk); @@ -521,7 +521,7 @@ static int dwcmshc_resume(struct device *dev) } =20 if (rk_priv) { - ret =3D clk_bulk_prepare_enable(RK3568_MAX_CLKS, + ret =3D clk_bulk_prepare_enable(RK35xx_MAX_CLKS, rk_priv->rockchip_clks); if (ret) return ret; --=20 2.35.1