diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-03 13:40:15 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-03 17:00:29 +0200 |
| commit | 794771afde99814b00485f335553d7203874eaea (patch) | |
| tree | 6121c24a0f68eef296e707bfbfccfae4e4bfe3c1 /target/linux/layerscape/patches-4.14 | |
| parent | ff88d943727bb65ed31ed8893de1623ff635d0ae (diff) | |
| download | upstream-794771afde99814b00485f335553d7203874eaea.tar.gz upstream-794771afde99814b00485f335553d7203874eaea.tar.bz2 upstream-794771afde99814b00485f335553d7203874eaea.zip | |
kernel: bump 4.14 to 4.14.123
Refreshed all patches.
Compile-tested on: ar71xx, cns3xxx, imx6, 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')
3 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch b/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch index 970e95cf3b..2fa6e4797e 100644 --- a/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch @@ -290,7 +290,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> #define __HAVE_PHYS_MEM_ACCESS_PROT --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c -@@ -937,3 +937,4 @@ void arch_setup_dma_ops(struct device *d +@@ -947,3 +947,4 @@ void arch_setup_dma_ops(struct device *d } #endif } 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 ed72f31e4a..f5fc0545be 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 @@ -112,7 +112,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL); temp &= ~(ESDHC_CLOCK_SDCLKEN | ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN | -@@ -797,6 +830,7 @@ static struct soc_device_attribute soc_i +@@ -800,6 +833,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 <biwen.li@nxp.com> struct sdhci_pltfm_host *pltfm_host; struct sdhci_esdhc *esdhc; struct device_node *np; -@@ -816,6 +850,9 @@ static void esdhc_init(struct platform_d +@@ -819,6 +853,9 @@ static void esdhc_init(struct platform_d else esdhc->quirk_incorrect_hostver = false; @@ -130,7 +130,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> np = pdev->dev.of_node; clk = of_clk_get(np, 0); if (!IS_ERR(clk)) { -@@ -915,14 +952,6 @@ static int sdhci_esdhc_probe(struct plat +@@ -923,14 +960,6 @@ static int sdhci_esdhc_probe(struct plat return ret; } diff --git a/target/linux/layerscape/patches-4.14/824-mmc-sdhci-of-esdhc-add-voltage-switch-support-for-ls.patch b/target/linux/layerscape/patches-4.14/824-mmc-sdhci-of-esdhc-add-voltage-switch-support-for-ls.patch index 7a276d8abd..969fe3f375 100644 --- a/target/linux/layerscape/patches-4.14/824-mmc-sdhci-of-esdhc-add-voltage-switch-support-for-ls.patch +++ b/target/linux/layerscape/patches-4.14/824-mmc-sdhci-of-esdhc-add-voltage-switch-support-for-ls.patch @@ -13,7 +13,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c -@@ -658,6 +658,7 @@ static void esdhc_reset(struct sdhci_hos +@@ -661,6 +661,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", }, |