e44e60b290
Resolved merge conflict in the following patches: layerscape: 701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch ramips: 0013-owrt-hack-fix-mt7688-cache-issue.patch Refreshed patches, removed upstreamed patch: bcm63xx: 020-v5.8-mtd-rawnand-brcmnand-fix-hamming-oob-layout.patch Run tested: qemu-x86-64 Build tested: x86/64 Signed-off-by: Petr Štetiar <ynezz@true.cz>
26 lines
884 B
Diff
26 lines
884 B
Diff
From 0e28623a11f3916c1fe5b7e789c7ab8ca932a929 Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Wed, 22 Jan 2020 13:02:13 +0100
|
|
Subject: [PATCH] mmc: sdhci: sdhci-msm: use sdhci_set_clock instead of
|
|
sdhci_msm_set_clock
|
|
|
|
When using sdhci_msm_set_clock clock setting will fail, so lets
|
|
use the generic sdhci_set_clock.
|
|
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
---
|
|
drivers/mmc/host/sdhci-msm.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/mmc/host/sdhci-msm.c
|
|
+++ b/drivers/mmc/host/sdhci-msm.c
|
|
@@ -1730,7 +1730,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat
|
|
|
|
static const struct sdhci_ops sdhci_msm_ops = {
|
|
.reset = sdhci_reset,
|
|
- .set_clock = sdhci_msm_set_clock,
|
|
+ .set_clock = sdhci_set_clock,
|
|
.get_min_clock = sdhci_msm_get_min_clock,
|
|
.get_max_clock = sdhci_msm_get_max_clock,
|
|
.set_bus_width = sdhci_set_bus_width,
|