From mboxrd@z Thu Jan 1 00:00:00 1970 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 2A204C43219 for ; Tue, 31 May 2022 13:39:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344760AbiEaNjJ (ORCPT ); Tue, 31 May 2022 09:39:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344766AbiEaNjI (ORCPT ); Tue, 31 May 2022 09:39:08 -0400 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51F6266ADF for ; Tue, 31 May 2022 06:39:06 -0700 (PDT) Received: by mail-lj1-x22b.google.com with SMTP id m26so3955346ljb.0 for ; Tue, 31 May 2022 06:39:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Z7akxYTZO1n5hGBdUKvsACb0aYZqvZd4WKpx24anh2Q=; b=aVqK+eGh6U5ZxN+/sy3i1jQIg0aI5Zf42/qEDr8+QPva7b2fcH5Hjoufp+S6xhZUi4 w1rYm2d+oiAYiXy9cZFb/SB8athYS19y3tN/mNGCyaitQwLzqetMbSrt/Xac5zAmtiy3 Kt1nMbAQI/++3zCPjq4FDIej1nHrPLrFTMPWw9aJv/K7DWW7FUt3ThmI9LzT2H+mqGiP +aRcv7BZE78HMfrFJIIA6/QykQAs3hb6dpO62gJ3bT5AVo3VRXycRxFC87ss/2N6NLoj yYcm3JdMgHzwPe8Qi7Mu1JBXkuo+qxLDNo6JZsH0Hzm7bZe3x1oN1c22UqebB72A6NeP qSlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Z7akxYTZO1n5hGBdUKvsACb0aYZqvZd4WKpx24anh2Q=; b=a4jF/T8knKyyTngc2dcv5TNsiPib4z+uMTZKkGVo8HjHfop88wsPZ+yIfn3d5wsiTR rOsTXA5yYRZGrWc7AxO7eBTE+Q+TJMzdH3xdonmVGM7bZMxIKYZGTZXY66meJBRCNf1f 2jsyrMQc+4cfwXOqpJllTPepc0qdUR44lYbMr0E9judVMYminiua6XmQu2HszF2pRuul zA7MSxZJ6koPwseZ1f+maYulGZBFyZTofOri7ktvBjMEwsSC8QWsCVVDdM0rEiQN9lGl SpfpgQfJkcqHNqyc0/j9WPKodJWPlU1hs8KyG0dG9l3XnUTUo40knrH3YaXNacYhQbIF gS0w== X-Gm-Message-State: AOAM5319abHNA4yFPw79EM0hGcrr1cWRmH8v53VooPjN7J2Llc3h6fro 80GVvjE45ft9Nrq1zKZQ5oaWZM5gW2LdChfqO2neQw== X-Google-Smtp-Source: ABdhPJwW/c1bJlMkiebT8YPGfe/ycmePS1OwkzMEJRtOVwabPwHajbg7juGNK47YLhhdudVJ1MU5aii5JNigtMjXGDs= X-Received: by 2002:a05:651c:158e:b0:253:d4c5:86f3 with SMTP id h14-20020a05651c158e00b00253d4c586f3mr34451417ljq.273.1654004344325; Tue, 31 May 2022 06:39:04 -0700 (PDT) MIME-Version: 1.0 References: <20220504213251.264819-1-sebastian.reichel@collabora.com> <20220504213251.264819-11-sebastian.reichel@collabora.com> In-Reply-To: <20220504213251.264819-11-sebastian.reichel@collabora.com> From: Ulf Hansson Date: Tue, 31 May 2022 15:38:28 +0200 Message-ID: Subject: Re: [PATCHv2 10/21] mmc: sdhci-of-dwcmshc: rename rk3568 to rk35xx To: Sebastian Reichel Cc: Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Linus Walleij , Bartosz Golaszewski , Adrian Hunter , Philipp Zabel , Michael Turquette , Stephen Boyd , linux-clk@vger.kernel.org, linux-mmc@vger.kernel.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@lists.collabora.co.uk, kernel@collabora.com Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org On Wed, 4 May 2022 at 23:33, Sebastian Reichel wrote: > > Prepare driver for rk3588 support by renaming the internal data > structures. > > Acked-by: Adrian Hunter > Signed-off-by: Sebastian Reichel Queued for v5.20 on the devel branch, thanks! Kind regards Uffe > --- > 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-of-dwcmshc.c > index 3a1b5ba36405..f5fd88c7adef 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) == DWCMSHC_EMMC_DLL_LOCKED) && \ > (((x) & DWCMSHC_EMMC_DLL_TIMEOUT) == 0)) > -#define RK3568_MAX_CLKS 3 > +#define RK35xx_MAX_CLKS 3 > > #define BOUNDARY_OK(addr, len) \ > ((addr | (SZ_128M - 1)) == ((addr + len - 1) | (SZ_128M - 1))) > > -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 = sdhci_priv(host); > struct dwcmshc_priv *dwc_priv = sdhci_pltfm_priv(pltfm_host); > - struct rk3568_priv *priv = dwc_priv->priv; > + struct rk35xx_priv *priv = dwc_priv->priv; > u8 txclk_tapnum = DLL_TXCLK_TAPNUM_DEFAULT; > u32 extra, reg; > int err; > @@ -281,7 +281,7 @@ static const struct sdhci_ops sdhci_dwcmshc_ops = { > .adma_write_desc = dwcmshc_adma_write_desc, > }; > > -static const struct sdhci_ops sdhci_dwcmshc_rk3568_ops = { > +static const struct sdhci_ops sdhci_dwcmshc_rk35xx_ops = { > .set_clock = dwcmshc_rk3568_set_clock, > .set_bus_width = sdhci_set_bus_width, > .set_uhs_signaling = dwcmshc_set_uhs_signaling, > @@ -296,18 +296,18 @@ static const struct sdhci_pltfm_data sdhci_dwcmshc_pdata = { > .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, > }; > > -static const struct sdhci_pltfm_data sdhci_dwcmshc_rk3568_pdata = { > - .ops = &sdhci_dwcmshc_rk3568_ops, > +static const struct sdhci_pltfm_data sdhci_dwcmshc_rk35xx_pdata = { > + .ops = &sdhci_dwcmshc_rk35xx_ops, > .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN | > SDHCI_QUIRK_BROKEN_TIMEOUT_VAL, > .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN | > SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN, > }; > > -static int dwcmshc_rk3568_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) > +static int dwcmshc_rk35xx_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) > { > int err; > - struct rk3568_priv *priv = dwc_priv->priv; > + struct rk35xx_priv *priv = dwc_priv->priv; > > priv->reset = devm_reset_control_array_get_optional_exclusive(mmc_dev(host->mmc)); > if (IS_ERR(priv->reset)) { > @@ -319,14 +319,14 @@ static int dwcmshc_rk3568_init(struct sdhci_host *host, struct dwcmshc_priv *dwc > priv->rockchip_clks[0].id = "axi"; > priv->rockchip_clks[1].id = "block"; > priv->rockchip_clks[2].id = "timer"; > - err = devm_clk_bulk_get_optional(mmc_dev(host->mmc), RK3568_MAX_CLKS, > + err = 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; > } > > - err = clk_bulk_prepare_enable(RK3568_MAX_CLKS, priv->rockchip_clks); > + err = 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[] = { > { > .compatible = "rockchip,rk3568-dwcmshc", > - .data = &sdhci_dwcmshc_rk3568_pdata, > + .data = &sdhci_dwcmshc_rk35xx_pdata, > }, > { > .compatible = "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 = NULL; > + struct rk35xx_priv *rk_priv = 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 = dwcmshc_request; > host->mmc_host_ops.hs400_enhanced_strobe = dwcmshc_hs400_enhanced_strobe; > > - if (pltfm_data == &sdhci_dwcmshc_rk3568_pdata) { > - rk_priv = devm_kzalloc(&pdev->dev, sizeof(struct rk3568_priv), GFP_KERNEL); > + if (pltfm_data == &sdhci_dwcmshc_rk35xx_pdata) { > + rk_priv = devm_kzalloc(&pdev->dev, sizeof(struct rk35xx_priv), GFP_KERNEL); > if (!rk_priv) { > err = -ENOMEM; > goto err_clk; > @@ -435,7 +435,7 @@ static int dwcmshc_probe(struct platform_device *pdev) > > priv->priv = rk_priv; > > - err = dwcmshc_rk3568_init(host, priv); > + err = 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 *pdev) > struct sdhci_host *host = platform_get_drvdata(pdev); > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); > - struct rk3568_priv *rk_priv = priv->priv; > + struct rk35xx_priv *rk_priv = priv->priv; > > sdhci_remove_host(host, 0); > > 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); > > @@ -484,7 +484,7 @@ static int dwcmshc_suspend(struct device *dev) > struct sdhci_host *host = dev_get_drvdata(dev); > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); > - struct rk3568_priv *rk_priv = priv->priv; > + struct rk35xx_priv *rk_priv = priv->priv; > int ret; > > ret = sdhci_suspend_host(host); > @@ -496,7 +496,7 @@ static int dwcmshc_suspend(struct device *dev) > 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); > > return ret; > @@ -507,7 +507,7 @@ static int dwcmshc_resume(struct device *dev) > struct sdhci_host *host = dev_get_drvdata(dev); > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); > - struct rk3568_priv *rk_priv = priv->priv; > + struct rk35xx_priv *rk_priv = priv->priv; > int ret; > > ret = clk_prepare_enable(pltfm_host->clk); > @@ -521,7 +521,7 @@ static int dwcmshc_resume(struct device *dev) > } > > if (rk_priv) { > - ret = clk_bulk_prepare_enable(RK3568_MAX_CLKS, > + ret = clk_bulk_prepare_enable(RK35xx_MAX_CLKS, > rk_priv->rockchip_clks); > if (ret) > return ret; > -- > 2.35.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0547DC433EF for ; Tue, 31 May 2022 13:39:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/fGSpby7CYJDcRKEpBas/rJronhl3Lde502zGmWjFOw=; b=WAXeE2/cceDYOB dvsf8RY9RNYGdqCNzRWdUq/jcIVbMDnw58nJ/gYhcRiMOkmW4aR+wd/0sr8EmBq+pSUr3LCMLqFwT ICWJQlxcJ5A+A9RLh13RzhBztAWm06buazmOM9bTD28BsmSX3Y7lLBTnEFmtUUCtykjk7TeY3wPaP 05VPD9W90DWib5Ud+rMYoy3aGa4me8Ovjl/srSxTG2kiOyHbiaHEnrwj9pZd7SNKzD4dz/F4XGPlR XrPWDhr42ChQFlyVqN+Nd7vYZMddQowtdKd+zr+WQYqJ52tTh3I3Flkyz4dvlIOhDl00tL9rnFvLu 8tlGlknxzMufpjo9SeoA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nw25i-00B7cG-3P; Tue, 31 May 2022 13:39:22 +0000 Received: from mail-lj1-x22b.google.com ([2a00:1450:4864:20::22b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nw25U-00B7WW-4g for linux-rockchip@lists.infradead.org; Tue, 31 May 2022 13:39:10 +0000 Received: by mail-lj1-x22b.google.com with SMTP id 5so6087667lju.10 for ; Tue, 31 May 2022 06:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Z7akxYTZO1n5hGBdUKvsACb0aYZqvZd4WKpx24anh2Q=; b=aVqK+eGh6U5ZxN+/sy3i1jQIg0aI5Zf42/qEDr8+QPva7b2fcH5Hjoufp+S6xhZUi4 w1rYm2d+oiAYiXy9cZFb/SB8athYS19y3tN/mNGCyaitQwLzqetMbSrt/Xac5zAmtiy3 Kt1nMbAQI/++3zCPjq4FDIej1nHrPLrFTMPWw9aJv/K7DWW7FUt3ThmI9LzT2H+mqGiP +aRcv7BZE78HMfrFJIIA6/QykQAs3hb6dpO62gJ3bT5AVo3VRXycRxFC87ss/2N6NLoj yYcm3JdMgHzwPe8Qi7Mu1JBXkuo+qxLDNo6JZsH0Hzm7bZe3x1oN1c22UqebB72A6NeP qSlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Z7akxYTZO1n5hGBdUKvsACb0aYZqvZd4WKpx24anh2Q=; b=qRgQgEedQi/uPQxI3EO2QTdxTE4HyDefJtodcq4VMJhfmC57Slp7F0aniKPks8HFo/ PinCCAOiXnes9HKcTDML+xyp/QSUHjHKoDNRjahPxpx3YfWVaKjxTsEV9nHgjzEJiITZ tUXHhB5UnziUm+10q2IfLKqK+pQCFV06pvjkkqfPoe7kVtkvnBF0jMr6zGErvdzNfcup Ylfw4U45tTNGc89kXt9piTNn5X6fB0+FfgFfrFIHD8sCbsiU4ttizY5I6z9oD1AmrJ+3 6K0U67z+4kVO2KFzL5AuJgnslJTDSkAjLdJwC7tAWJCZvJGjxuIjbAbxOnWzNQ7368WR 5/UA== X-Gm-Message-State: AOAM5302YTqphjmIw70UR68uteV8mVwSbQ7hlonE3pKWDyylWFvjflJk ENIfyL7F8AplYqXconxIIHkl+s0EmE0Vx391jzelGA== X-Google-Smtp-Source: ABdhPJwW/c1bJlMkiebT8YPGfe/ycmePS1OwkzMEJRtOVwabPwHajbg7juGNK47YLhhdudVJ1MU5aii5JNigtMjXGDs= X-Received: by 2002:a05:651c:158e:b0:253:d4c5:86f3 with SMTP id h14-20020a05651c158e00b00253d4c586f3mr34451417ljq.273.1654004344325; Tue, 31 May 2022 06:39:04 -0700 (PDT) MIME-Version: 1.0 References: <20220504213251.264819-1-sebastian.reichel@collabora.com> <20220504213251.264819-11-sebastian.reichel@collabora.com> In-Reply-To: <20220504213251.264819-11-sebastian.reichel@collabora.com> From: Ulf Hansson Date: Tue, 31 May 2022 15:38:28 +0200 Message-ID: Subject: Re: [PATCHv2 10/21] mmc: sdhci-of-dwcmshc: rename rk3568 to rk35xx To: Sebastian Reichel Cc: Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Linus Walleij , Bartosz Golaszewski , Adrian Hunter , Philipp Zabel , Michael Turquette , Stephen Boyd , linux-clk@vger.kernel.org, linux-mmc@vger.kernel.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@lists.collabora.co.uk, kernel@collabora.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220531_063908_229979_A15C2A47 X-CRM114-Status: GOOD ( 22.09 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org On Wed, 4 May 2022 at 23:33, Sebastian Reichel wrote: > > Prepare driver for rk3588 support by renaming the internal data > structures. > > Acked-by: Adrian Hunter > Signed-off-by: Sebastian Reichel Queued for v5.20 on the devel branch, thanks! Kind regards Uffe > --- > 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-of-dwcmshc.c > index 3a1b5ba36405..f5fd88c7adef 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) == DWCMSHC_EMMC_DLL_LOCKED) && \ > (((x) & DWCMSHC_EMMC_DLL_TIMEOUT) == 0)) > -#define RK3568_MAX_CLKS 3 > +#define RK35xx_MAX_CLKS 3 > > #define BOUNDARY_OK(addr, len) \ > ((addr | (SZ_128M - 1)) == ((addr + len - 1) | (SZ_128M - 1))) > > -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 = sdhci_priv(host); > struct dwcmshc_priv *dwc_priv = sdhci_pltfm_priv(pltfm_host); > - struct rk3568_priv *priv = dwc_priv->priv; > + struct rk35xx_priv *priv = dwc_priv->priv; > u8 txclk_tapnum = DLL_TXCLK_TAPNUM_DEFAULT; > u32 extra, reg; > int err; > @@ -281,7 +281,7 @@ static const struct sdhci_ops sdhci_dwcmshc_ops = { > .adma_write_desc = dwcmshc_adma_write_desc, > }; > > -static const struct sdhci_ops sdhci_dwcmshc_rk3568_ops = { > +static const struct sdhci_ops sdhci_dwcmshc_rk35xx_ops = { > .set_clock = dwcmshc_rk3568_set_clock, > .set_bus_width = sdhci_set_bus_width, > .set_uhs_signaling = dwcmshc_set_uhs_signaling, > @@ -296,18 +296,18 @@ static const struct sdhci_pltfm_data sdhci_dwcmshc_pdata = { > .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, > }; > > -static const struct sdhci_pltfm_data sdhci_dwcmshc_rk3568_pdata = { > - .ops = &sdhci_dwcmshc_rk3568_ops, > +static const struct sdhci_pltfm_data sdhci_dwcmshc_rk35xx_pdata = { > + .ops = &sdhci_dwcmshc_rk35xx_ops, > .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN | > SDHCI_QUIRK_BROKEN_TIMEOUT_VAL, > .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN | > SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN, > }; > > -static int dwcmshc_rk3568_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) > +static int dwcmshc_rk35xx_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) > { > int err; > - struct rk3568_priv *priv = dwc_priv->priv; > + struct rk35xx_priv *priv = dwc_priv->priv; > > priv->reset = devm_reset_control_array_get_optional_exclusive(mmc_dev(host->mmc)); > if (IS_ERR(priv->reset)) { > @@ -319,14 +319,14 @@ static int dwcmshc_rk3568_init(struct sdhci_host *host, struct dwcmshc_priv *dwc > priv->rockchip_clks[0].id = "axi"; > priv->rockchip_clks[1].id = "block"; > priv->rockchip_clks[2].id = "timer"; > - err = devm_clk_bulk_get_optional(mmc_dev(host->mmc), RK3568_MAX_CLKS, > + err = 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; > } > > - err = clk_bulk_prepare_enable(RK3568_MAX_CLKS, priv->rockchip_clks); > + err = 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[] = { > { > .compatible = "rockchip,rk3568-dwcmshc", > - .data = &sdhci_dwcmshc_rk3568_pdata, > + .data = &sdhci_dwcmshc_rk35xx_pdata, > }, > { > .compatible = "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 = NULL; > + struct rk35xx_priv *rk_priv = 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 = dwcmshc_request; > host->mmc_host_ops.hs400_enhanced_strobe = dwcmshc_hs400_enhanced_strobe; > > - if (pltfm_data == &sdhci_dwcmshc_rk3568_pdata) { > - rk_priv = devm_kzalloc(&pdev->dev, sizeof(struct rk3568_priv), GFP_KERNEL); > + if (pltfm_data == &sdhci_dwcmshc_rk35xx_pdata) { > + rk_priv = devm_kzalloc(&pdev->dev, sizeof(struct rk35xx_priv), GFP_KERNEL); > if (!rk_priv) { > err = -ENOMEM; > goto err_clk; > @@ -435,7 +435,7 @@ static int dwcmshc_probe(struct platform_device *pdev) > > priv->priv = rk_priv; > > - err = dwcmshc_rk3568_init(host, priv); > + err = 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 *pdev) > struct sdhci_host *host = platform_get_drvdata(pdev); > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); > - struct rk3568_priv *rk_priv = priv->priv; > + struct rk35xx_priv *rk_priv = priv->priv; > > sdhci_remove_host(host, 0); > > 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); > > @@ -484,7 +484,7 @@ static int dwcmshc_suspend(struct device *dev) > struct sdhci_host *host = dev_get_drvdata(dev); > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); > - struct rk3568_priv *rk_priv = priv->priv; > + struct rk35xx_priv *rk_priv = priv->priv; > int ret; > > ret = sdhci_suspend_host(host); > @@ -496,7 +496,7 @@ static int dwcmshc_suspend(struct device *dev) > 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); > > return ret; > @@ -507,7 +507,7 @@ static int dwcmshc_resume(struct device *dev) > struct sdhci_host *host = dev_get_drvdata(dev); > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); > - struct rk3568_priv *rk_priv = priv->priv; > + struct rk35xx_priv *rk_priv = priv->priv; > int ret; > > ret = clk_prepare_enable(pltfm_host->clk); > @@ -521,7 +521,7 @@ static int dwcmshc_resume(struct device *dev) > } > > if (rk_priv) { > - ret = clk_bulk_prepare_enable(RK3568_MAX_CLKS, > + ret = clk_bulk_prepare_enable(RK35xx_MAX_CLKS, > rk_priv->rockchip_clks); > if (ret) > return ret; > -- > 2.35.1 > _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 418CCC433EF for ; Tue, 31 May 2022 13:40:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bBPy2ViKEdnpKomOIZXM9GGFkA8vSwkRTA8g7d6su2E=; b=MxeFw0J40ehhmn OOHAuPE7sBePto4N3234vB2okKN1zXry/mrcSevBp3IxVLSBLrAQR5mSpJiOsZ/0Xb1ys8BAw1M+C qdHSjDSANQtEY1HOIfrBsZMhpRU5064y8jDWoLUD5ZlBl6FKu8OrcgFxVzHytROlMYqb9S16y6yTx 2mPixrQ9VfGL+wucD1yC7htfxzkJ//s7MQYh8rFeYf8hDs7H9rmVmlrNPN1iB1qSFFJOo8Q6n5+/X J7Aqul/A/a/4pQEGBKcQyH4QlfUFznGH4i1SzaC7GUDKou2VayqhQbJik82FST6doFNEy/v7KSPCg 8RhfCwDZgkWTwU8d4OFA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nw25y-00B7iB-Sy; Tue, 31 May 2022 13:39:39 +0000 Received: from mail-lj1-x22d.google.com ([2a00:1450:4864:20::22d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nw25U-00B7WV-4d for linux-arm-kernel@lists.infradead.org; Tue, 31 May 2022 13:39:09 +0000 Received: by mail-lj1-x22d.google.com with SMTP id t13so12304085ljd.6 for ; Tue, 31 May 2022 06:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Z7akxYTZO1n5hGBdUKvsACb0aYZqvZd4WKpx24anh2Q=; b=aVqK+eGh6U5ZxN+/sy3i1jQIg0aI5Zf42/qEDr8+QPva7b2fcH5Hjoufp+S6xhZUi4 w1rYm2d+oiAYiXy9cZFb/SB8athYS19y3tN/mNGCyaitQwLzqetMbSrt/Xac5zAmtiy3 Kt1nMbAQI/++3zCPjq4FDIej1nHrPLrFTMPWw9aJv/K7DWW7FUt3ThmI9LzT2H+mqGiP +aRcv7BZE78HMfrFJIIA6/QykQAs3hb6dpO62gJ3bT5AVo3VRXycRxFC87ss/2N6NLoj yYcm3JdMgHzwPe8Qi7Mu1JBXkuo+qxLDNo6JZsH0Hzm7bZe3x1oN1c22UqebB72A6NeP qSlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Z7akxYTZO1n5hGBdUKvsACb0aYZqvZd4WKpx24anh2Q=; b=orwKYel/K9sYJKDif6vVsGlRqoH8I4DpA97IPwUwUFfRygeUlhznFyEMCf6q4kWMh4 wteXb/LcvmIXaxvthdgW6Vr70saXaiSqmt3BEC+GJ0+n6tRBDMKmZAaAY14374gN7yF1 +pxRt8SNdHPtnuDu68gpj99a8hopuFLEXMCRSg9vc+m9QTiCMdfHcA4Y8j1dg5ODnqII xpIt048ppssQwXRQUXAaEPygt8s0PB6Gw6+Gf8PThgkuNeTToddL/ETrRw6w1W9qBWd4 luh5f7MSyf7lKxx6cOUG0fwJ+iXGpCod9+mZzl2KdUaBgvdltm2H4a15OFfk7vYingM6 tZlQ== X-Gm-Message-State: AOAM531bxiwC/mqpq74ET88qFwXmHsrEJ/qdGVHar84wJo9OiHts3o/N 8W+oKPasK3DYgRaPg2HsxC3uY5w1tQyzKSBP2xM+0A== X-Google-Smtp-Source: ABdhPJwW/c1bJlMkiebT8YPGfe/ycmePS1OwkzMEJRtOVwabPwHajbg7juGNK47YLhhdudVJ1MU5aii5JNigtMjXGDs= X-Received: by 2002:a05:651c:158e:b0:253:d4c5:86f3 with SMTP id h14-20020a05651c158e00b00253d4c586f3mr34451417ljq.273.1654004344325; Tue, 31 May 2022 06:39:04 -0700 (PDT) MIME-Version: 1.0 References: <20220504213251.264819-1-sebastian.reichel@collabora.com> <20220504213251.264819-11-sebastian.reichel@collabora.com> In-Reply-To: <20220504213251.264819-11-sebastian.reichel@collabora.com> From: Ulf Hansson Date: Tue, 31 May 2022 15:38:28 +0200 Message-ID: Subject: Re: [PATCHv2 10/21] mmc: sdhci-of-dwcmshc: rename rk3568 to rk35xx To: Sebastian Reichel Cc: Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Linus Walleij , Bartosz Golaszewski , Adrian Hunter , Philipp Zabel , Michael Turquette , Stephen Boyd , linux-clk@vger.kernel.org, linux-mmc@vger.kernel.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@lists.collabora.co.uk, kernel@collabora.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220531_063908_221708_0416AE4F X-CRM114-Status: GOOD ( 23.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, 4 May 2022 at 23:33, Sebastian Reichel wrote: > > Prepare driver for rk3588 support by renaming the internal data > structures. > > Acked-by: Adrian Hunter > Signed-off-by: Sebastian Reichel Queued for v5.20 on the devel branch, thanks! Kind regards Uffe > --- > 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-of-dwcmshc.c > index 3a1b5ba36405..f5fd88c7adef 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) == DWCMSHC_EMMC_DLL_LOCKED) && \ > (((x) & DWCMSHC_EMMC_DLL_TIMEOUT) == 0)) > -#define RK3568_MAX_CLKS 3 > +#define RK35xx_MAX_CLKS 3 > > #define BOUNDARY_OK(addr, len) \ > ((addr | (SZ_128M - 1)) == ((addr + len - 1) | (SZ_128M - 1))) > > -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 = sdhci_priv(host); > struct dwcmshc_priv *dwc_priv = sdhci_pltfm_priv(pltfm_host); > - struct rk3568_priv *priv = dwc_priv->priv; > + struct rk35xx_priv *priv = dwc_priv->priv; > u8 txclk_tapnum = DLL_TXCLK_TAPNUM_DEFAULT; > u32 extra, reg; > int err; > @@ -281,7 +281,7 @@ static const struct sdhci_ops sdhci_dwcmshc_ops = { > .adma_write_desc = dwcmshc_adma_write_desc, > }; > > -static const struct sdhci_ops sdhci_dwcmshc_rk3568_ops = { > +static const struct sdhci_ops sdhci_dwcmshc_rk35xx_ops = { > .set_clock = dwcmshc_rk3568_set_clock, > .set_bus_width = sdhci_set_bus_width, > .set_uhs_signaling = dwcmshc_set_uhs_signaling, > @@ -296,18 +296,18 @@ static const struct sdhci_pltfm_data sdhci_dwcmshc_pdata = { > .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, > }; > > -static const struct sdhci_pltfm_data sdhci_dwcmshc_rk3568_pdata = { > - .ops = &sdhci_dwcmshc_rk3568_ops, > +static const struct sdhci_pltfm_data sdhci_dwcmshc_rk35xx_pdata = { > + .ops = &sdhci_dwcmshc_rk35xx_ops, > .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN | > SDHCI_QUIRK_BROKEN_TIMEOUT_VAL, > .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN | > SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN, > }; > > -static int dwcmshc_rk3568_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) > +static int dwcmshc_rk35xx_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) > { > int err; > - struct rk3568_priv *priv = dwc_priv->priv; > + struct rk35xx_priv *priv = dwc_priv->priv; > > priv->reset = devm_reset_control_array_get_optional_exclusive(mmc_dev(host->mmc)); > if (IS_ERR(priv->reset)) { > @@ -319,14 +319,14 @@ static int dwcmshc_rk3568_init(struct sdhci_host *host, struct dwcmshc_priv *dwc > priv->rockchip_clks[0].id = "axi"; > priv->rockchip_clks[1].id = "block"; > priv->rockchip_clks[2].id = "timer"; > - err = devm_clk_bulk_get_optional(mmc_dev(host->mmc), RK3568_MAX_CLKS, > + err = 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; > } > > - err = clk_bulk_prepare_enable(RK3568_MAX_CLKS, priv->rockchip_clks); > + err = 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[] = { > { > .compatible = "rockchip,rk3568-dwcmshc", > - .data = &sdhci_dwcmshc_rk3568_pdata, > + .data = &sdhci_dwcmshc_rk35xx_pdata, > }, > { > .compatible = "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 = NULL; > + struct rk35xx_priv *rk_priv = 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 = dwcmshc_request; > host->mmc_host_ops.hs400_enhanced_strobe = dwcmshc_hs400_enhanced_strobe; > > - if (pltfm_data == &sdhci_dwcmshc_rk3568_pdata) { > - rk_priv = devm_kzalloc(&pdev->dev, sizeof(struct rk3568_priv), GFP_KERNEL); > + if (pltfm_data == &sdhci_dwcmshc_rk35xx_pdata) { > + rk_priv = devm_kzalloc(&pdev->dev, sizeof(struct rk35xx_priv), GFP_KERNEL); > if (!rk_priv) { > err = -ENOMEM; > goto err_clk; > @@ -435,7 +435,7 @@ static int dwcmshc_probe(struct platform_device *pdev) > > priv->priv = rk_priv; > > - err = dwcmshc_rk3568_init(host, priv); > + err = 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 *pdev) > struct sdhci_host *host = platform_get_drvdata(pdev); > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); > - struct rk3568_priv *rk_priv = priv->priv; > + struct rk35xx_priv *rk_priv = priv->priv; > > sdhci_remove_host(host, 0); > > 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); > > @@ -484,7 +484,7 @@ static int dwcmshc_suspend(struct device *dev) > struct sdhci_host *host = dev_get_drvdata(dev); > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); > - struct rk3568_priv *rk_priv = priv->priv; > + struct rk35xx_priv *rk_priv = priv->priv; > int ret; > > ret = sdhci_suspend_host(host); > @@ -496,7 +496,7 @@ static int dwcmshc_suspend(struct device *dev) > 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); > > return ret; > @@ -507,7 +507,7 @@ static int dwcmshc_resume(struct device *dev) > struct sdhci_host *host = dev_get_drvdata(dev); > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); > - struct rk3568_priv *rk_priv = priv->priv; > + struct rk35xx_priv *rk_priv = priv->priv; > int ret; > > ret = clk_prepare_enable(pltfm_host->clk); > @@ -521,7 +521,7 @@ static int dwcmshc_resume(struct device *dev) > } > > if (rk_priv) { > - ret = clk_bulk_prepare_enable(RK3568_MAX_CLKS, > + ret = clk_bulk_prepare_enable(RK35xx_MAX_CLKS, > rk_priv->rockchip_clks); > if (ret) > return ret; > -- > 2.35.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel