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 <koen.vandeputte@ncentric.com>
This commit is contained in:
@@ -247,7 +247,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
/*
|
||||
--- a/arch/arm64/include/asm/io.h
|
||||
+++ b/arch/arm64/include/asm/io.h
|
||||
@@ -170,6 +170,7 @@ extern void __iomem *ioremap_cache(phys_
|
||||
@@ -186,6 +186,7 @@ extern void __iomem *ioremap_cache(phys_
|
||||
#define ioremap_nocache(addr, size) __ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE))
|
||||
#define ioremap_wc(addr, size) __ioremap((addr), (size), __pgprot(PROT_NORMAL_NC))
|
||||
#define ioremap_wt(addr, size) __ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE))
|
||||
|
||||
@@ -62,7 +62,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
- snps,hird-threshold: HIRD threshold
|
||||
--- a/arch/arm64/include/asm/io.h
|
||||
+++ b/arch/arm64/include/asm/io.h
|
||||
@@ -194,6 +194,34 @@ extern void __iomem *ioremap_cache(phys_
|
||||
@@ -210,6 +210,34 @@ extern void __iomem *ioremap_cache(phys_
|
||||
#define iowrite32be(v,p) ({ __iowmb(); __raw_writel((__force __u32)cpu_to_be32(v), p); })
|
||||
#define iowrite64be(v,p) ({ __iowmb(); __raw_writeq((__force __u64)cpu_to_be64(v), p); })
|
||||
|
||||
@@ -432,7 +432,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
reg &= ~DWC3_DCTL_INITU2ENA;
|
||||
--- a/drivers/usb/dwc3/gadget.c
|
||||
+++ b/drivers/usb/dwc3/gadget.c
|
||||
@@ -3205,6 +3205,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
|
||||
@@ -3209,6 +3209,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
|
||||
{
|
||||
int ret;
|
||||
int irq;
|
||||
@@ -440,7 +440,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
|
||||
irq = dwc3_gadget_get_irq(dwc);
|
||||
if (irq < 0) {
|
||||
@@ -3281,6 +3282,12 @@ int dwc3_gadget_init(struct dwc3 *dwc)
|
||||
@@ -3285,6 +3286,12 @@ int dwc3_gadget_init(struct dwc3 *dwc)
|
||||
goto err4;
|
||||
}
|
||||
|
||||
|
||||
@@ -69,7 +69,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -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 <biwen.li@nxp.com>
|
||||
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 <biwen.li@nxp.com>
|
||||
|
||||
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 <biwen.li@nxp.com>
|
||||
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 <biwen.li@nxp.com>
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
@@ -93,7 +93,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
|
||||
#include "io-pgtable.h"
|
||||
#include "arm-smmu-regs.h"
|
||||
@@ -1464,6 +1465,8 @@ static struct iommu_group *arm_smmu_devi
|
||||
@@ -1465,6 +1466,8 @@ static struct iommu_group *arm_smmu_devi
|
||||
|
||||
if (dev_is_pci(dev))
|
||||
group = pci_device_group(dev);
|
||||
@@ -102,7 +102,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
else
|
||||
group = generic_device_group(dev);
|
||||
|
||||
@@ -2040,6 +2043,10 @@ static void arm_smmu_bus_init(void)
|
||||
@@ -2043,6 +2046,10 @@ static void arm_smmu_bus_init(void)
|
||||
bus_set_iommu(&pci_bus_type, &arm_smmu_ops);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -22,7 +22,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
struct lpuart_port {
|
||||
struct uart_port port;
|
||||
struct clk *clk;
|
||||
@@ -2149,13 +2151,13 @@ static int lpuart_probe(struct platform_
|
||||
@@ -2153,13 +2155,13 @@ static int lpuart_probe(struct platform_
|
||||
|
||||
ret = of_alias_get_id(np, "serial");
|
||||
if (ret < 0) {
|
||||
@@ -42,7 +42,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
sport->port.line = ret;
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
sport->port.membase = devm_ioremap_resource(&pdev->dev, res);
|
||||
@@ -2246,6 +2248,7 @@ static int lpuart_remove(struct platform
|
||||
@@ -2250,6 +2252,7 @@ static int lpuart_remove(struct platform
|
||||
struct lpuart_port *sport = platform_get_drvdata(pdev);
|
||||
|
||||
uart_remove_one_port(&lpuart_reg, &sport->port);
|
||||
|
||||
@@ -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
|
||||
@@ -650,6 +650,7 @@ static void esdhc_reset(struct sdhci_hos
|
||||
@@ -658,6 +658,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", },
|
||||
|
||||
Reference in New Issue
Block a user