diff mbox series

[“PATCH”,1/2] mmc: sdhci-of-arasan: Use clock-frequency property to update clk_xin

Message ID 20210603182242.25733-2-rashmi.a@intel.com (mailing list archive)
State New, archived
Headers show
Series mmc clock-frequency property update and | expand

Commit Message

rashmi.a@intel.com June 3, 2021, 6:22 p.m. UTC
From: Rashmi A <rashmi.a@intel.com>

If clock-frequency property is set and it is not the same as the current
clock rate of clk_xin(base clock frequency), set clk_xin to use the
provided clock rate.

Signed-off-by: Rashmi A <rashmi.a@intel.com>
Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>
---
 drivers/mmc/host/sdhci-of-arasan.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

Comments

Michal Simek June 4, 2021, 6:13 a.m. UTC | #1
On 6/3/21 8:22 PM, rashmi.a@intel.com wrote:
> From: Rashmi A <rashmi.a@intel.com>
> 
> If clock-frequency property is set and it is not the same as the current
> clock rate of clk_xin(base clock frequency), set clk_xin to use the
> provided clock rate.
> 
> Signed-off-by: Rashmi A <rashmi.a@intel.com>
> Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
>  drivers/mmc/host/sdhci-of-arasan.c | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
> index 839965f7c717..0e7c07ed9690 100644
> --- a/drivers/mmc/host/sdhci-of-arasan.c
> +++ b/drivers/mmc/host/sdhci-of-arasan.c
> @@ -1542,6 +1542,8 @@ static int sdhci_arasan_probe(struct platform_device *pdev)
>  		}
>  	}
>  
> +	sdhci_get_of_property(pdev);
> +
>  	sdhci_arasan->clk_ahb = devm_clk_get(dev, "clk_ahb");
>  	if (IS_ERR(sdhci_arasan->clk_ahb)) {
>  		ret = dev_err_probe(dev, PTR_ERR(sdhci_arasan->clk_ahb),
> @@ -1561,14 +1563,22 @@ static int sdhci_arasan_probe(struct platform_device *pdev)
>  		goto err_pltfm_free;
>  	}
>  
> +	/* If clock-frequency property is set, use the provided value */
> +	if (pltfm_host->clock &&
> +	    pltfm_host->clock != clk_get_rate(clk_xin)) {
> +		ret = clk_set_rate(clk_xin, pltfm_host->clock);
> +		if (ret) {
> +			dev_err(&pdev->dev, "Failed to set SD clock rate\n");
> +			goto clk_dis_ahb;
> +		}
> +	}
> +
>  	ret = clk_prepare_enable(clk_xin);
>  	if (ret) {
>  		dev_err(dev, "Unable to enable SD clock.\n");
>  		goto clk_dis_ahb;
>  	}
>  
> -	sdhci_get_of_property(pdev);
> -
>  	if (of_property_read_bool(np, "xlnx,fails-without-test-cd"))
>  		sdhci_arasan->quirks |= SDHCI_ARASAN_QUIRK_FORCE_CDTEST;
>  
> 

Manish/Sai: Please retest this on Xilinx SOC.

Thanks,
Michal
Sai Krishna Potthuri June 17, 2021, 10:18 a.m. UTC | #2
Hi,

> -----Original Message-----
> From: Ulf Hansson <ulf.hansson@linaro.org>
> Sent: Thursday, June 17, 2021 3:34 PM
> To: Michal Simek <michals@xilinx.com>; Manish Narani
> <MNARANI@xilinx.com>; Sai Krishna Potthuri <lakshmis@xilinx.com>
> Cc: rashmi.a@intel.com; linux-drivers-review-request@eclists.intel.com;
> linux-mmc <linux-mmc@vger.kernel.org>; Linux ARM <linux-arm-
> kernel@lists.infradead.org>; Linux Kernel Mailing List <linux-
> kernel@vger.kernel.org>; Kishon <kishon@ti.com>; Vinod Koul
> <vkoul@kernel.org>; Andy Shevchenko
> <andriy.shevchenko@linux.intel.com>; linux-phy@lists.infradead.org; Mark
> Gross <mgross@linux.intel.com>; kris.pan@linux.intel.com;
> furong.zhou@intel.com; mallikarjunappa.sangannavar@intel.com; Adrian
> Hunter <adrian.hunter@intel.com>; mahesh.r.vaidya@intel.com;
> nandhini.srikandan@intel.com; Raja Subramanian, Lakshmi Bai
> <lakshmi.bai.raja.subramanian@intel.com>
> Subject: Re: [“PATCH” 1/2] mmc: sdhci-of-arasan: Use clock-frequency
> property to update clk_xin
> 
> On Fri, 4 Jun 2021 at 08:13, Michal Simek <michal.simek@xilinx.com> wrote:
> >
> >
> >
> > On 6/3/21 8:22 PM, rashmi.a@intel.com wrote:
> > > From: Rashmi A <rashmi.a@intel.com>
> > >
> > > If clock-frequency property is set and it is not the same as the
> > > current clock rate of clk_xin(base clock frequency), set clk_xin to
> > > use the provided clock rate.
> > >
> > > Signed-off-by: Rashmi A <rashmi.a@intel.com>
> > > Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>
> > > ---
> > >  drivers/mmc/host/sdhci-of-arasan.c | 14 ++++++++++++--
> > >  1 file changed, 12 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/mmc/host/sdhci-of-arasan.c
> > > b/drivers/mmc/host/sdhci-of-arasan.c
> > > index 839965f7c717..0e7c07ed9690 100644
> > > --- a/drivers/mmc/host/sdhci-of-arasan.c
> > > +++ b/drivers/mmc/host/sdhci-of-arasan.c
> > > @@ -1542,6 +1542,8 @@ static int sdhci_arasan_probe(struct
> platform_device *pdev)
> > >               }
> > >       }
> > >
> > > +     sdhci_get_of_property(pdev);
> > > +
> > >       sdhci_arasan->clk_ahb = devm_clk_get(dev, "clk_ahb");
> > >       if (IS_ERR(sdhci_arasan->clk_ahb)) {
> > >               ret = dev_err_probe(dev,
> > > PTR_ERR(sdhci_arasan->clk_ahb), @@ -1561,14 +1563,22 @@ static int
> sdhci_arasan_probe(struct platform_device *pdev)
> > >               goto err_pltfm_free;
> > >       }
> > >
> > > +     /* If clock-frequency property is set, use the provided value */
> > > +     if (pltfm_host->clock &&
> > > +         pltfm_host->clock != clk_get_rate(clk_xin)) {
> > > +             ret = clk_set_rate(clk_xin, pltfm_host->clock);
> > > +             if (ret) {
> > > +                     dev_err(&pdev->dev, "Failed to set SD clock rate\n");
> > > +                     goto clk_dis_ahb;
> > > +             }
> > > +     }
> > > +
> > >       ret = clk_prepare_enable(clk_xin);
> > >       if (ret) {
> > >               dev_err(dev, "Unable to enable SD clock.\n");
> > >               goto clk_dis_ahb;
> > >       }
> > >
> > > -     sdhci_get_of_property(pdev);
> > > -
> > >       if (of_property_read_bool(np, "xlnx,fails-without-test-cd"))
> > >               sdhci_arasan->quirks |=
> > > SDHCI_ARASAN_QUIRK_FORCE_CDTEST;
> > >
> > >
> >
> > Manish/Sai: Please retest this on Xilinx SOC.
> >
> > Thanks,
> > Michal
> 
> I am about to queue this patch, but it would be nice to get your confirmation
> and tested-by tags before doing so. Would that be possible within the next
> couple of days?
Tested this patch on Xilinx platforms.
Tested-by: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>

Regards
Sai Krishna
diff mbox series

Patch

diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
index 839965f7c717..0e7c07ed9690 100644
--- a/drivers/mmc/host/sdhci-of-arasan.c
+++ b/drivers/mmc/host/sdhci-of-arasan.c
@@ -1542,6 +1542,8 @@  static int sdhci_arasan_probe(struct platform_device *pdev)
 		}
 	}
 
+	sdhci_get_of_property(pdev);
+
 	sdhci_arasan->clk_ahb = devm_clk_get(dev, "clk_ahb");
 	if (IS_ERR(sdhci_arasan->clk_ahb)) {
 		ret = dev_err_probe(dev, PTR_ERR(sdhci_arasan->clk_ahb),
@@ -1561,14 +1563,22 @@  static int sdhci_arasan_probe(struct platform_device *pdev)
 		goto err_pltfm_free;
 	}
 
+	/* If clock-frequency property is set, use the provided value */
+	if (pltfm_host->clock &&
+	    pltfm_host->clock != clk_get_rate(clk_xin)) {
+		ret = clk_set_rate(clk_xin, pltfm_host->clock);
+		if (ret) {
+			dev_err(&pdev->dev, "Failed to set SD clock rate\n");
+			goto clk_dis_ahb;
+		}
+	}
+
 	ret = clk_prepare_enable(clk_xin);
 	if (ret) {
 		dev_err(dev, "Unable to enable SD clock.\n");
 		goto clk_dis_ahb;
 	}
 
-	sdhci_get_of_property(pdev);
-
 	if (of_property_read_bool(np, "xlnx,fails-without-test-cd"))
 		sdhci_arasan->quirks |= SDHCI_ARASAN_QUIRK_FORCE_CDTEST;