From 9a1d7ff187300767f77401302b43733ee01080b4 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Wed, 13 Feb 2019 11:38:08 +0100 Subject: kernel: bump 4.14 to 4.14.99 Refreshed all patches. Remove upstreamed: - 950-0434-mmc-bcm2835-Recover-from-MMC_SEND_EXT_CSD.patch Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte --- .../layerscape/patches-4.14/819-sdhc-support-layerscape.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch') 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 986db4c221..ed72f31e4a 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 @@ -69,7 +69,7 @@ Signed-off-by: Biwen Li }; /** -@@ -498,6 +543,7 @@ static void esdhc_of_set_clock(struct sd +@@ -502,6 +547,7 @@ static void esdhc_of_set_clock(struct sd int pre_div = 1; int div = 1; ktime_t timeout; @@ -77,7 +77,7 @@ Signed-off-by: Biwen Li u32 temp; host->mmc->actual_clock = 0; -@@ -511,27 +557,14 @@ static void esdhc_of_set_clock(struct sd +@@ -515,27 +561,14 @@ static void esdhc_of_set_clock(struct sd if (esdhc->vendor_ver < VENDOR_V_23) pre_div = 2; @@ -112,7 +112,7 @@ Signed-off-by: Biwen Li temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL); temp &= ~(ESDHC_CLOCK_SDCLKEN | ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN | -@@ -789,6 +822,7 @@ static struct soc_device_attribute soc_i +@@ -797,6 +830,7 @@ static struct soc_device_attribute soc_i static void esdhc_init(struct platform_device *pdev, struct sdhci_host *host) { @@ -120,7 +120,7 @@ Signed-off-by: Biwen Li struct sdhci_pltfm_host *pltfm_host; struct sdhci_esdhc *esdhc; struct device_node *np; -@@ -808,6 +842,9 @@ static void esdhc_init(struct platform_d +@@ -816,6 +850,9 @@ static void esdhc_init(struct platform_d else esdhc->quirk_incorrect_hostver = false; @@ -130,7 +130,7 @@ Signed-off-by: Biwen Li np = pdev->dev.of_node; clk = of_clk_get(np, 0); if (!IS_ERR(clk)) { -@@ -907,14 +944,6 @@ static int sdhci_esdhc_probe(struct plat +@@ -915,14 +952,6 @@ static int sdhci_esdhc_probe(struct plat return ret; } -- cgit v1.2.3