Skip to contentSkip to conversation

mmc: atmel-sdhci: fix the clk_enable call in case of no ops

PATCH Superseded Eugen Hristev 2 participants 3 messages Nov 9, 2020 – Nov 26, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mmc: atmel-sdhci: fix the clk_enable call in case of no ops

If the clock driver does not offer a clk_enable ops, then the system will return -ENOSYS.
The clk_enable works with CCF (common clock framework).
Some clocks in some cases (like the generic clock for some products: sama5d2) do not have the clk_enable primitive, and in this case probing of the driver will fail.
This patch changes the behavior to return an error in case there is really an error, and not a missing primitive.
If the clock driver does not have an enable primitive, most likely clocks are always enabled or enabled in the set_rate primitives.

Fixes 81f16438d4 ("mmc: atmel-sdhci: enable the required generic clock")

---
Changes in v2:
- fixed issue with ret being 0, it was going to return ret;, when in fact there was no error. Have to check for both ret != 0 and ret != -ENOSYS.

 drivers/mmc/atmel_sdhci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/atmel_sdhci.c +2 -1
index f56ae63bc2..ca7a98bf1d 100644
@@ -86,7 +86,8 @@ static int atmel_sdhci_probe(struct udevice *dev)
 		return -EINVAL;
 
 	ret = clk_enable(&clk);
-	if (ret)
+	/* return error only if the clock really has a clock enable func */
+	if (ret && ret != -ENOSYS)
 		return ret;
 
 	ret = mmc_of_parse(dev, &plat->cfg);
Signature · 1 line
2.25.1
#1 lore raw

PATCH v2 1/1 mmc: atmel-sdhci: fix the clk_enable call in case of no ops

Quoted 11 lines · Eugen Hristev

If the clock driver does not offer a clk_enable ops, then the system will return -ENOSYS.
The clk_enable works with CCF (common clock framework).
Some clocks in some cases (like the generic clock for some products: sama5d2) do not have the clk_enable primitive, and in this case probing of the driver will fail.
This patch changes the behavior to return an error in case there is really an error, and not a missing primitive.
If the clock driver does not have an enable primitive, most likely clocks are always enabled or enabled in the set_rate primitives.

Quoted 2 lines
Fixes 81f16438d4 ("mmc: atmel-sdhci: enable the required generic clock")

Best Regards,
Jaehoon Chung

Quoted 24 lines

---
Changes in v2:
- fixed issue with ret being 0, it was going to return ret;, when in fact there was no error. Have to check for both ret != 0 and ret != -ENOSYS.

 drivers/mmc/atmel_sdhci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/atmel_sdhci.c +2 -1
index f56ae63bc2..ca7a98bf1d 100644
@@ -86,7 +86,8 @@ static int atmel_sdhci_probe(struct udevice *dev)
 		return -EINVAL;
 
 	ret = clk_enable(&clk);
-	if (ret)
+	/* return error only if the clock really has a clock enable func */
+	if (ret && ret != -ENOSYS)
 		return ret;
 
 	ret = mmc_of_parse(dev, &plat->cfg);
#2 lore raw

PATCH v2 1/1 mmc: atmel-sdhci: fix the clk_enable call in case of no ops

Quoted 12 lines · Jaehoon Chung
Quoted 11 lines · Eugen Hristev

If the clock driver does not offer a clk_enable ops, then the system will return -ENOSYS.
The clk_enable works with CCF (common clock framework).
Some clocks in some cases (like the generic clock for some products: sama5d2) do not have the clk_enable primitive, and in this case probing of the driver will fail.
This patch changes the behavior to return an error in case there is really an error, and not a missing primitive.
If the clock driver does not have an enable primitive, most likely clocks are always enabled or enabled in the set_rate primitives.

Quoted 9 lines
Quoted 2 lines
Fixes 81f16438d4 ("mmc: atmel-sdhci: enable the required generic clock")

Best Regards,
Jaehoon Chung

Quoted 1 line

---

Applied to u-boot-atmel/master