]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
mmc: sdhci-of-arasan: Use clock-frequency property to update clk_xin
authorRashmi A <rashmi.a@intel.com>
Thu, 3 Jun 2021 18:22:41 +0000 (23:52 +0530)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 29 Jun 2021 14:45:16 +0000 (16:45 +0200)
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>
Tested-by: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>
Link: https://lore.kernel.org/r/20210603182242.25733-2-rashmi.a@intel.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci-of-arasan.c

index 839965f7c717f090320defc365b9271dee919780..0e7c07ed96904b1e12de189ebf64265974520934 100644 (file)
@@ -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;