aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-10-14 14:33:42 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-10-15 16:13:06 +0200
commitf3a265575cdbb8b41f66daff13b13d0348277c71 (patch)
tree656a1edcf8bec368b2acda05de34cd7303d7794b /target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch
parent00f96dcddb7717a8cd30e75ef38e7ec03adb0f6b (diff)
downloadupstream-f3a265575cdbb8b41f66daff13b13d0348277c71.tar.gz
upstream-f3a265575cdbb8b41f66daff13b13d0348277c71.tar.bz2
upstream-f3a265575cdbb8b41f66daff13b13d0348277c71.zip
kernel: bump 4.14 to 4.14.149
Refreshed all patches. Altered patches: - 820-sec-support-layerscape.patch Compile-tested on: ar71xx, brcm2708, cns3xxx, imx6, layerscape, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
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.patch34
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 db1a18fc18..60d0c889e5 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
@@ -131,7 +131,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
};
/**
-@@ -495,13 +545,20 @@ static void esdhc_clock_enable(struct sd
+@@ -500,13 +550,20 @@ static void esdhc_clock_enable(struct sd
}
}
@@ -152,7 +152,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
u32 temp;
host->mmc->actual_clock = 0;
-@@ -515,27 +572,14 @@ static void esdhc_of_set_clock(struct sd
+@@ -520,27 +577,14 @@ static void esdhc_of_set_clock(struct sd
if (esdhc->vendor_ver < VENDOR_V_23)
pre_div = 2;
@@ -187,7 +187,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL);
temp &= ~(ESDHC_CLOCK_SDCLKEN | ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN |
-@@ -548,9 +592,30 @@ static void esdhc_of_set_clock(struct sd
+@@ -553,9 +597,30 @@ static void esdhc_of_set_clock(struct sd
while (host->max_clk / pre_div / div > clock && div < 16)
div++;
@@ -218,7 +218,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
pre_div >>= 1;
div--;
-@@ -560,6 +625,29 @@ static void esdhc_of_set_clock(struct sd
+@@ -565,6 +630,29 @@ static void esdhc_of_set_clock(struct sd
| (pre_div << ESDHC_PREDIV_SHIFT));
sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL);
@@ -248,7 +248,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
/* Wait max 20 ms */
timeout = ktime_add_ms(ktime_get(), 20);
while (1) {
-@@ -575,6 +663,7 @@ static void esdhc_of_set_clock(struct sd
+@@ -580,6 +668,7 @@ static void esdhc_of_set_clock(struct sd
udelay(10);
}
@@ -256,7 +256,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
temp |= ESDHC_CLOCK_SDCLKEN;
sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL);
}
-@@ -603,6 +692,8 @@ static void esdhc_pltfm_set_bus_width(st
+@@ -608,6 +697,8 @@ static void esdhc_pltfm_set_bus_width(st
static void esdhc_reset(struct sdhci_host *host, u8 mask)
{
@@ -265,7 +265,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
u32 val;
sdhci_reset(host, mask);
-@@ -617,6 +708,12 @@ static void esdhc_reset(struct sdhci_hos
+@@ -622,6 +713,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>
}
}
-@@ -628,6 +725,7 @@ static void esdhc_reset(struct sdhci_hos
+@@ -633,6 +730,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", },
{}
};
-@@ -690,23 +788,91 @@ static int esdhc_signal_voltage_switch(s
+@@ -695,23 +793,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
-@@ -755,7 +921,7 @@ static const struct sdhci_ops sdhci_esdh
+@@ -760,7 +926,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 = {
-@@ -772,7 +938,7 @@ static const struct sdhci_ops sdhci_esdh
+@@ -777,7 +943,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 = {
-@@ -798,8 +964,20 @@ static struct soc_device_attribute soc_i
+@@ -803,8 +969,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;
-@@ -819,6 +997,24 @@ static void esdhc_init(struct platform_d
+@@ -824,6 +1002,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)) {
-@@ -846,6 +1042,12 @@ static void esdhc_init(struct platform_d
+@@ -851,6 +1047,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;
-@@ -869,6 +1071,7 @@ static int sdhci_esdhc_probe(struct plat
+@@ -874,6 +1076,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);
-@@ -877,6 +1080,11 @@ static int sdhci_esdhc_probe(struct plat
+@@ -882,6 +1085,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;
-@@ -923,14 +1131,6 @@ static int sdhci_esdhc_probe(struct plat
+@@ -928,14 +1136,6 @@ static int sdhci_esdhc_probe(struct plat
return ret;
}