diff options
Diffstat (limited to 'target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch')
| -rw-r--r-- | target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch b/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch index 60d0c889e5..02688c74cd 100644 --- a/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch @@ -265,7 +265,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> u32 val; sdhci_reset(host, mask); -@@ -622,6 +713,12 @@ static void esdhc_reset(struct sdhci_hos +@@ -619,6 +710,12 @@ static void esdhc_reset(struct sdhci_hos val = sdhci_readl(host, ESDHC_TBCTL); val &= ~ESDHC_TB_EN; sdhci_writel(host, val, ESDHC_TBCTL); @@ -278,7 +278,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> } } -@@ -633,6 +730,7 @@ static void esdhc_reset(struct sdhci_hos +@@ -630,6 +727,7 @@ static void esdhc_reset(struct sdhci_hos static const struct of_device_id scfg_device_ids[] = { { .compatible = "fsl,t1040-scfg", }, { .compatible = "fsl,ls1012a-scfg", }, @@ -286,7 +286,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> { .compatible = "fsl,ls1046a-scfg", }, {} }; -@@ -695,23 +793,91 @@ static int esdhc_signal_voltage_switch(s +@@ -692,23 +790,91 @@ static int esdhc_signal_voltage_switch(s } } @@ -383,7 +383,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> } #ifdef CONFIG_PM_SLEEP -@@ -760,7 +926,7 @@ static const struct sdhci_ops sdhci_esdh +@@ -757,7 +923,7 @@ static const struct sdhci_ops sdhci_esdh .adma_workaround = esdhc_of_adma_workaround, .set_bus_width = esdhc_pltfm_set_bus_width, .reset = esdhc_reset, @@ -392,7 +392,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> }; static const struct sdhci_ops sdhci_esdhc_le_ops = { -@@ -777,7 +943,7 @@ static const struct sdhci_ops sdhci_esdh +@@ -774,7 +940,7 @@ static const struct sdhci_ops sdhci_esdh .adma_workaround = esdhc_of_adma_workaround, .set_bus_width = esdhc_pltfm_set_bus_width, .reset = esdhc_reset, @@ -401,7 +401,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> }; static const struct sdhci_pltfm_data sdhci_esdhc_be_pdata = { -@@ -803,8 +969,20 @@ static struct soc_device_attribute soc_i +@@ -800,8 +966,20 @@ static struct soc_device_attribute soc_i { }, }; @@ -422,7 +422,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> struct sdhci_pltfm_host *pltfm_host; struct sdhci_esdhc *esdhc; struct device_node *np; -@@ -824,6 +1002,24 @@ static void esdhc_init(struct platform_d +@@ -821,6 +999,24 @@ static void esdhc_init(struct platform_d else esdhc->quirk_incorrect_hostver = false; @@ -447,7 +447,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> np = pdev->dev.of_node; clk = of_clk_get(np, 0); if (!IS_ERR(clk)) { -@@ -851,6 +1047,12 @@ static void esdhc_init(struct platform_d +@@ -848,6 +1044,12 @@ static void esdhc_init(struct platform_d } } @@ -460,7 +460,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> static int sdhci_esdhc_probe(struct platform_device *pdev) { struct sdhci_host *host; -@@ -874,6 +1076,7 @@ static int sdhci_esdhc_probe(struct plat +@@ -871,6 +1073,7 @@ static int sdhci_esdhc_probe(struct plat host->mmc_host_ops.start_signal_voltage_switch = esdhc_signal_voltage_switch; host->mmc_host_ops.execute_tuning = esdhc_execute_tuning; @@ -468,7 +468,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> host->tuning_delay = 1; esdhc_init(pdev, host); -@@ -882,6 +1085,11 @@ static int sdhci_esdhc_probe(struct plat +@@ -879,6 +1082,11 @@ static int sdhci_esdhc_probe(struct plat pltfm_host = sdhci_priv(host); esdhc = sdhci_pltfm_priv(pltfm_host); @@ -480,7 +480,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> if (esdhc->vendor_ver == VENDOR_V_22) host->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23; -@@ -928,14 +1136,6 @@ static int sdhci_esdhc_probe(struct plat +@@ -925,14 +1133,6 @@ static int sdhci_esdhc_probe(struct plat return ret; } @@ -497,7 +497,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> .name = "sdhci-esdhc", --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c -@@ -2150,7 +2150,7 @@ static void sdhci_send_tuning(struct sdh +@@ -2148,7 +2148,7 @@ static void sdhci_send_tuning(struct sdh } @@ -506,9 +506,9 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> { int i; -@@ -2167,13 +2167,13 @@ static void __sdhci_execute_tuning(struc - pr_info("%s: Tuning timeout, falling back to fixed sampling clock\n", - mmc_hostname(host->mmc)); +@@ -2165,13 +2165,13 @@ static void __sdhci_execute_tuning(struc + pr_debug("%s: Tuning timeout, falling back to fixed sampling clock\n", + mmc_hostname(host->mmc)); sdhci_abort_tuning(host, opcode); - return; + return -ETIMEDOUT; @@ -522,7 +522,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> break; } -@@ -2185,6 +2185,7 @@ static void __sdhci_execute_tuning(struc +@@ -2183,6 +2183,7 @@ static void __sdhci_execute_tuning(struc pr_info("%s: Tuning failed, falling back to fixed sampling clock\n", mmc_hostname(host->mmc)); sdhci_reset_tuning(host); @@ -530,7 +530,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> } int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) -@@ -2246,7 +2247,7 @@ int sdhci_execute_tuning(struct mmc_host +@@ -2244,7 +2245,7 @@ int sdhci_execute_tuning(struct mmc_host sdhci_start_tuning(host); |