Skip to contentSkip to conversation

mmc: sdhci-msm: Fix fallout from sdhci refactoring

PATCH In review Stephen Boyd 5 participants 5 messages Jun 10, 2014 – Jun 12, 2014

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

PATCH 1/1 mmc: sdhci-msm: Fix fallout from sdhci refactoring

The sdhci core was refactored recently and some of those refactorings required changes in every sdhci platform driver. Those updates happened around the same time as when the msm driver was merged so the refactorings missed the msm driver. Hook in the basic library functions so that we can boot apq8074 dragonboards again instead of crashing when we try to jump to NULL function pointers.

---

Patch based on next-20140610

 drivers/mmc/host/sdhci-msm.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/mmc/host/sdhci-msm.c +4 -0
index acb0e9eb55f1..40573a58486a 100644
@@ -468,6 +468,10 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match);
 
 static struct sdhci_ops sdhci_msm_ops = {
 	.platform_execute_tuning = sdhci_msm_execute_tuning,
+	.reset = sdhci_reset,
+	.set_clock = sdhci_set_clock,
+	.set_bus_width = sdhci_set_bus_width,
+	.set_uhs_signaling = sdhci_set_uhs_signaling,
 };
 
 static int sdhci_msm_probe(struct platform_device *pdev)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
Acked-by on v1 1/1
#1 lore raw
Quoted 12 lines · Stephen Boyd

The sdhci core was refactored recently and some of those refactorings required changes in every sdhci platform driver. Those updates happened around the same time as when the msm driver was merged so the refactorings missed the msm driver. Hook in the basic library functions so that we can boot apq8074 dragonboards again instead of crashing when we try to jump to NULL function pointers.

Quoted 6 lines

---

Patch based on next-20140610

drivers/mmc/host/sdhci-msm.c | 4 ++++

1 file changed, 4 insertions(+)

Feel free to pick up this version of the patch and ignore mine.

- k

Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Reviewed-by on v1 1/1
#2 lore raw
In reply to Stephen Boyd
Quoted 8 lines · Stephen Boyd

The sdhci core was refactored recently and some of those refactorings required changes in every sdhci platform driver. Those updates happened around the same time as when the msm driver was merged so the refactorings missed the msm driver. Hook in the basic library functions so that we can boot apq8074 dragonboards again instead of crashing when we try to jump to NULL function pointers.

Quoted 4 lines
Tested-by on v1 1/1
#3 lore raw
In reply to Stephen Boyd
Quoted 8 lines · Stephen Boyd

The sdhci core was refactored recently and some of those refactorings required changes in every sdhci platform driver. Those updates happened around the same time as when the msm driver was merged so the refactorings missed the msm driver. Hook in the basic library functions so that we can boot apq8074 dragonboards again instead of crashing when we try to jump to NULL function pointers.

Quoted 4 lines

I verifed that this patch on top of next-20140610 gets the qcom dragonboard booting again.

Kevin

#4 lore raw
In reply to Stephen Boyd
Quoted 8 lines · Stephen Boyd

The sdhci core was refactored recently and some of those refactorings required changes in every sdhci platform driver. Those updates happened around the same time as when the msm driver was merged so the refactorings missed the msm driver. Hook in the basic library functions so that we can boot apq8074 dragonboards again instead of crashing when we try to jump to NULL function pointers.

Quoted 4 lines

Thanks!

Applied for fixes.

Kind regards
Uffe

Quoted 26 lines

---

Patch based on next-20140610

 drivers/mmc/host/sdhci-msm.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/mmc/host/sdhci-msm.c +4 -1
index acb0e9eb55f1..40573a58486a 100644
@@ -468,6 +468,10 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match);
 
 static struct sdhci_ops sdhci_msm_ops = {
        .platform_execute_tuning = sdhci_msm_execute_tuning,
+       .reset = sdhci_reset,
+       .set_clock = sdhci_set_clock,
+       .set_bus_width = sdhci_set_bus_width,
+       .set_uhs_signaling = sdhci_set_uhs_signaling,
 };
 
 static int sdhci_msm_probe(struct platform_device *pdev)
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation