]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
mmc: fsl_esdhc: make if(CONFIG_IS_ENABLED(CLK)) an #if statement
authorGiulio Benetti <giulio.benetti@benettiengineering.com>
Fri, 10 Jan 2020 14:51:45 +0000 (15:51 +0100)
committerStefano Babic <sbabic@denx.de>
Tue, 14 Jan 2020 21:54:00 +0000 (22:54 +0100)
Not all architectures(i.e. i.MXRT) support mxc_get_clock() and use DM_CLK
instead. So building could result in failure due to missing
mxc_get_clock().

Make if(CONFIG_IS_ENABLED(CLK)) an #if statement.

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
drivers/mmc/fsl_esdhc_imx.c

index a69818435245f57f39e28df37a5d789bacb0a5ff..3416e9b04febfd14a90f271ac72dceca60aa258b 100644 (file)
@@ -1523,27 +1523,27 @@ static int fsl_esdhc_probe(struct udevice *dev)
 
        init_clk_usdhc(dev->seq);
 
-       if (CONFIG_IS_ENABLED(CLK)) {
-               /* Assigned clock already set clock */
-               ret = clk_get_by_name(dev, "per", &priv->per_clk);
-               if (ret) {
-                       printf("Failed to get per_clk\n");
-                       return ret;
-               }
-               ret = clk_enable(&priv->per_clk);
-               if (ret) {
-                       printf("Failed to enable per_clk\n");
-                       return ret;
-               }
+#if CONFIG_IS_ENABLED(CLK)
+       /* Assigned clock already set clock */
+       ret = clk_get_by_name(dev, "per", &priv->per_clk);
+       if (ret) {
+               printf("Failed to get per_clk\n");
+               return ret;
+       }
+       ret = clk_enable(&priv->per_clk);
+       if (ret) {
+               printf("Failed to enable per_clk\n");
+               return ret;
+       }
 
-               priv->sdhc_clk = clk_get_rate(&priv->per_clk);
-       } else {
-               priv->sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK + dev->seq);
-               if (priv->sdhc_clk <= 0) {
-                       dev_err(dev, "Unable to get clk for %s\n", dev->name);
-                       return -EINVAL;
-               }
+       priv->sdhc_clk = clk_get_rate(&priv->per_clk);
+#else
+       priv->sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK + dev->seq);
+       if (priv->sdhc_clk <= 0) {
+               dev_err(dev, "Unable to get clk for %s\n", dev->name);
+               return -EINVAL;
        }
+#endif
 
        ret = fsl_esdhc_init(priv, plat);
        if (ret) {