From 79abb8f140c0081145acc832cbbd65afcdd0176b Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Fri, 16 Dec 2016 11:33:38 +0000 Subject: kernel: bump to 4.4.39 Bump & refresh patches for all 4.4 targets. Compile & run tested: ar71xx Archer C7 v2 Signed-off-by: Kevin Darbyshire-Bryant --- .../3143-armv8-aarch32-Execute-32-bit-Linux-for-ls1046a.patch | 5 ----- ...7021-net-Make-the-netdev-watchdog-aware-of-hardware-multi.patch | 2 +- .../patches-4.4/8129-clk-qoriq-add-ls1046a-support.patch | 2 +- .../8134-pci-layerscape-add-LUT-DBG-reigster-offset-member.patch | 2 +- .../8138-pci-layerscape-add-MSI-interrupt-support.patch | 2 +- .../8142-drivers-mmc-Add-compatible-string-for-LS1046A.patch | 7 +------ 6 files changed, 5 insertions(+), 15 deletions(-) (limited to 'target/linux/layerscape') diff --git a/target/linux/layerscape/patches-4.4/3143-armv8-aarch32-Execute-32-bit-Linux-for-ls1046a.patch b/target/linux/layerscape/patches-4.4/3143-armv8-aarch32-Execute-32-bit-Linux-for-ls1046a.patch index fc50e986dc..8754ea4fdb 100644 --- a/target/linux/layerscape/patches-4.4/3143-armv8-aarch32-Execute-32-bit-Linux-for-ls1046a.patch +++ b/target/linux/layerscape/patches-4.4/3143-armv8-aarch32-Execute-32-bit-Linux-for-ls1046a.patch @@ -8,8 +8,6 @@ Signed-off-by: Yutang Jiang arch/arm/mach-imx/mach-layerscape.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/arch/arm/mach-imx/mach-layerscape.c b/arch/arm/mach-imx/mach-layerscape.c -index b87a90a..cbc541e 100644 --- a/arch/arm/mach-imx/mach-layerscape.c +++ b/arch/arm/mach-imx/mach-layerscape.c @@ -12,11 +12,13 @@ @@ -27,6 +25,3 @@ index b87a90a..cbc541e 100644 + .smp = smp_ops(layerscape_smp_ops), .dt_compat = layerscape_dt_compat, MACHINE_END --- -1.7.9.5 - diff --git a/target/linux/layerscape/patches-4.4/7021-net-Make-the-netdev-watchdog-aware-of-hardware-multi.patch b/target/linux/layerscape/patches-4.4/7021-net-Make-the-netdev-watchdog-aware-of-hardware-multi.patch index 35bad5d39e..69bba053a7 100644 --- a/target/linux/layerscape/patches-4.4/7021-net-Make-the-netdev-watchdog-aware-of-hardware-multi.patch +++ b/target/linux/layerscape/patches-4.4/7021-net-Make-the-netdev-watchdog-aware-of-hardware-multi.patch @@ -21,7 +21,7 @@ Tested-by: Fleming Andrew-AFLEMING --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c -@@ -334,8 +334,23 @@ static void dev_watchdog(unsigned long a +@@ -290,8 +290,23 @@ static void dev_watchdog(unsigned long a txq = netdev_get_tx_queue(dev, i); /* * old device drivers set dev->trans_start diff --git a/target/linux/layerscape/patches-4.4/8129-clk-qoriq-add-ls1046a-support.patch b/target/linux/layerscape/patches-4.4/8129-clk-qoriq-add-ls1046a-support.patch index 8dd5cdbc8e..ed2f565c31 100644 --- a/target/linux/layerscape/patches-4.4/8129-clk-qoriq-add-ls1046a-support.patch +++ b/target/linux/layerscape/patches-4.4/8129-clk-qoriq-add-ls1046a-support.patch @@ -65,7 +65,7 @@ Integated-by: Yutang Jiang .compat = "fsl,ls2080a-clockgen", .cmux_groups = { &clockgen2_cmux_cga12, &clockgen2_cmux_cgb -@@ -1285,6 +1325,7 @@ CLK_OF_DECLARE(qoriq_clockgen_1, "fsl,qo +@@ -1292,6 +1332,7 @@ CLK_OF_DECLARE(qoriq_clockgen_1, "fsl,qo CLK_OF_DECLARE(qoriq_clockgen_2, "fsl,qoriq-clockgen-2.0", clockgen_init); CLK_OF_DECLARE(qoriq_clockgen_ls1021a, "fsl,ls1021a-clockgen", clockgen_init); CLK_OF_DECLARE(qoriq_clockgen_ls1043a, "fsl,ls1043a-clockgen", clockgen_init); diff --git a/target/linux/layerscape/patches-4.4/8134-pci-layerscape-add-LUT-DBG-reigster-offset-member.patch b/target/linux/layerscape/patches-4.4/8134-pci-layerscape-add-LUT-DBG-reigster-offset-member.patch index 4f7f515a24..c3256e9839 100644 --- a/target/linux/layerscape/patches-4.4/8134-pci-layerscape-add-LUT-DBG-reigster-offset-member.patch +++ b/target/linux/layerscape/patches-4.4/8134-pci-layerscape-add-LUT-DBG-reigster-offset-member.patch @@ -35,7 +35,7 @@ Integrated-by: Yutang Jiang pcie->drvdata->ltssm_shift) & LTSSM_STATE_MASK; -@@ -196,24 +197,28 @@ static struct ls_pcie_drvdata ls1021_drvdata = { +@@ -196,24 +197,28 @@ static struct ls_pcie_drvdata ls1021_drv static struct ls_pcie_drvdata ls1012_drvdata = { .lut_offset = 0xC0000, .ltssm_shift = 24, diff --git a/target/linux/layerscape/patches-4.4/8138-pci-layerscape-add-MSI-interrupt-support.patch b/target/linux/layerscape/patches-4.4/8138-pci-layerscape-add-MSI-interrupt-support.patch index fd597e5737..96c69f3832 100644 --- a/target/linux/layerscape/patches-4.4/8138-pci-layerscape-add-MSI-interrupt-support.patch +++ b/target/linux/layerscape/patches-4.4/8138-pci-layerscape-add-MSI-interrupt-support.patch @@ -129,7 +129,7 @@ Signed-off-by: Zhao Qiang static bool ls_pcie_is_bridge(struct ls_pcie *pcie) { u32 header_type; -@@ -283,10 +308,28 @@ static int __init ls_pcie_probe(struct p +@@ -276,10 +301,28 @@ static int __init ls_pcie_probe(struct p pcie->drvdata = match->data; pcie->lut = pcie->dbi + pcie->drvdata->lut_offset; diff --git a/target/linux/layerscape/patches-4.4/8142-drivers-mmc-Add-compatible-string-for-LS1046A.patch b/target/linux/layerscape/patches-4.4/8142-drivers-mmc-Add-compatible-string-for-LS1046A.patch index d86de8b669..34add83db4 100644 --- a/target/linux/layerscape/patches-4.4/8142-drivers-mmc-Add-compatible-string-for-LS1046A.patch +++ b/target/linux/layerscape/patches-4.4/8142-drivers-mmc-Add-compatible-string-for-LS1046A.patch @@ -8,11 +8,9 @@ Signed-off-by: Yutang Jiang drivers/mmc/host/sdhci-of-esdhc.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c -index a04ed4e..1116d38 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c -@@ -607,6 +607,7 @@ static int sdhci_esdhc_probe(struct platform_device *pdev) +@@ -607,6 +607,7 @@ static int sdhci_esdhc_probe(struct plat of_device_is_compatible(np, "fsl,p4080-esdhc") || of_device_is_compatible(np, "fsl,p1020-esdhc") || of_device_is_compatible(np, "fsl,t1040-esdhc") || @@ -20,6 +18,3 @@ index a04ed4e..1116d38 100644 of_device_is_compatible(np, "fsl,ls1021a-esdhc")) host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION; --- -1.7.9.5 - -- cgit v1.2.3