domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: bump 5.4 to 5.4.174

Browse Source 
Removed upstreamed patches:
  layerscape/patches-5.4/302-dts-0083-arm64-ls1028a-qds-correct-bus-of-rtc.patch[1]

All other patches automatically rebased.

1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.4.174&id=65816c1034769e714edb70f59a33bc5472d9e55f

Build system: x86_64
Build-tested: ramips/mt7621

Signed-off-by: John Audia <graysky@archlinux.us>
This commit is contained in:
John Audia
2022-01-27 05:44:38 -05:00
committed by Hauke Mehrtens
parent 76725938f1
commit 30cff7c3b0
18 changed files with 35 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-5.4
View File

@@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .173 LINUX_VERSION-5.4 = .174
LINUX_KERNEL_HASH-5.4.173 = 99e8e275b239c708bdb6a41990c4d12098a61752245dbef921a514d9f996c239 LINUX_KERNEL_HASH-5.4.174 = e8cd1be5aefaf9b44024b039e31b6cb21135ab67f322e8dff98be5a9998308a9

4
target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch
View File

@@ -107,7 +107,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
} }
static struct clk clk_pcie = { static struct clk clk_pcie = {
@@ -542,6 +556,21 @@ static struct clk_lookup bcm6368_clks[] @@ -548,6 +562,21 @@ static struct clk_lookup bcm6368_clks[]
CLKDEV_INIT(NULL, "ipsec", &clk_ipsec), CLKDEV_INIT(NULL, "ipsec", &clk_ipsec),
}; };
@@ -129,7 +129,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
#define HSSPI_PLL_HZ_6328 133333333 #define HSSPI_PLL_HZ_6328 133333333
#define HSSPI_PLL_HZ_6362 400000000 #define HSSPI_PLL_HZ_6362 400000000
@@ -574,6 +603,10 @@ static int __init bcm63xx_clk_init(void) @@ -580,6 +609,10 @@ static int __init bcm63xx_clk_init(void)
case BCM6368_CPU_ID: case BCM6368_CPU_ID:
clkdev_add_table(bcm6368_clks, ARRAY_SIZE(bcm6368_clks)); clkdev_add_table(bcm6368_clks, ARRAY_SIZE(bcm6368_clks));
break; break;

6
target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch
View File

@@ -57,7 +57,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
mask = CKCTL_6328_HSSPI_EN; mask = CKCTL_6328_HSSPI_EN;
else if (BCMCPU_IS_6362()) else if (BCMCPU_IS_6362())
mask = CKCTL_6362_HSSPI_EN; mask = CKCTL_6362_HSSPI_EN;
@@ -450,6 +452,19 @@ static struct clk_lookup bcm3368_clks[] @@ -456,6 +458,19 @@ static struct clk_lookup bcm3368_clks[]
CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1), CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1),
}; };
@@ -77,7 +77,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
static struct clk_lookup bcm6328_clks[] = { static struct clk_lookup bcm6328_clks[] = {
/* fixed rate clocks */ /* fixed rate clocks */
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
@@ -571,6 +586,7 @@ static struct clk_lookup bcm63268_clks[] @@ -577,6 +592,7 @@ static struct clk_lookup bcm63268_clks[]
CLKDEV_INIT(NULL, "pcie", &clk_pcie), CLKDEV_INIT(NULL, "pcie", &clk_pcie),
}; };
@@ -85,7 +85,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
#define HSSPI_PLL_HZ_6328 133333333 #define HSSPI_PLL_HZ_6328 133333333
#define HSSPI_PLL_HZ_6362 400000000 #define HSSPI_PLL_HZ_6362 400000000
@@ -580,6 +596,10 @@ static int __init bcm63xx_clk_init(void) @@ -586,6 +602,10 @@ static int __init bcm63xx_clk_init(void)
case BCM3368_CPU_ID: case BCM3368_CPU_ID:
clkdev_add_table(bcm3368_clks, ARRAY_SIZE(bcm3368_clks)); clkdev_add_table(bcm3368_clks, ARRAY_SIZE(bcm3368_clks));
break; break;

20
target/linux/bcm63xx/patches-5.4/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch
View File

@@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
--- a/arch/mips/bcm63xx/clk.c --- a/arch/mips/bcm63xx/clk.c
+++ b/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c
@@ -495,6 +495,8 @@ static struct clk_lookup bcm3368_clks[] @@ -501,6 +501,8 @@ static struct clk_lookup bcm3368_clks[]
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
@@ -18,7 +18,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet0", &clk_enet0),
CLKDEV_INIT(NULL, "enet1", &clk_enet1), CLKDEV_INIT(NULL, "enet1", &clk_enet1),
@@ -511,7 +513,9 @@ static struct clk_lookup bcm6318_clks[] @@ -517,7 +519,9 @@ static struct clk_lookup bcm6318_clks[]
/* fixed rate clocks */ /* fixed rate clocks */
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
@@ -28,7 +28,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
CLKDEV_INIT(NULL, "usbh", &clk_usbh), CLKDEV_INIT(NULL, "usbh", &clk_usbh),
@@ -525,7 +529,10 @@ static struct clk_lookup bcm6328_clks[] @@ -531,7 +535,10 @@ static struct clk_lookup bcm6328_clks[]
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
@@ -39,7 +39,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
CLKDEV_INIT(NULL, "usbh", &clk_usbh), CLKDEV_INIT(NULL, "usbh", &clk_usbh),
@@ -538,6 +545,7 @@ static struct clk_lookup bcm6338_clks[] @@ -544,6 +551,7 @@ static struct clk_lookup bcm6338_clks[]
/* fixed rate clocks */ /* fixed rate clocks */
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
@@ -47,7 +47,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet0", &clk_enet0),
CLKDEV_INIT(NULL, "enet1", &clk_enet1), CLKDEV_INIT(NULL, "enet1", &clk_enet1),
@@ -552,6 +560,7 @@ static struct clk_lookup bcm6345_clks[] @@ -558,6 +566,7 @@ static struct clk_lookup bcm6345_clks[]
/* fixed rate clocks */ /* fixed rate clocks */
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
@@ -55,7 +55,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet0", &clk_enet0),
CLKDEV_INIT(NULL, "enet1", &clk_enet1), CLKDEV_INIT(NULL, "enet1", &clk_enet1),
@@ -566,6 +575,7 @@ static struct clk_lookup bcm6348_clks[] @@ -572,6 +581,7 @@ static struct clk_lookup bcm6348_clks[]
/* fixed rate clocks */ /* fixed rate clocks */
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
@@ -63,7 +63,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet0", &clk_enet0),
CLKDEV_INIT(NULL, "enet1", &clk_enet1), CLKDEV_INIT(NULL, "enet1", &clk_enet1),
@@ -582,6 +592,8 @@ static struct clk_lookup bcm6358_clks[] @@ -588,6 +598,8 @@ static struct clk_lookup bcm6358_clks[]
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
@@ -72,7 +72,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet0", &clk_enet0),
CLKDEV_INIT(NULL, "enet1", &clk_enet1), CLKDEV_INIT(NULL, "enet1", &clk_enet1),
@@ -601,7 +613,10 @@ static struct clk_lookup bcm6362_clks[] @@ -607,7 +619,10 @@ static struct clk_lookup bcm6362_clks[]
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
@@ -83,7 +83,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
CLKDEV_INIT(NULL, "usbh", &clk_usbh), CLKDEV_INIT(NULL, "usbh", &clk_usbh),
@@ -617,6 +632,8 @@ static struct clk_lookup bcm6368_clks[] @@ -623,6 +638,8 @@ static struct clk_lookup bcm6368_clks[]
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
@@ -92,7 +92,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
CLKDEV_INIT(NULL, "usbh", &clk_usbh), CLKDEV_INIT(NULL, "usbh", &clk_usbh),
@@ -631,7 +648,10 @@ static struct clk_lookup bcm63268_clks[] @@ -637,7 +654,10 @@ static struct clk_lookup bcm63268_clks[]
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),

6
target/linux/bcm63xx/patches-5.4/430-MIPS-BCM63XX-add-nand-clocks.patch
View File

@@ -24,7 +24,7 @@
* Internal peripheral clock * Internal peripheral clock
*/ */
static struct clk clk_periph = { static struct clk clk_periph = {
@@ -618,6 +635,7 @@ static struct clk_lookup bcm6362_clks[] @@ -624,6 +641,7 @@ static struct clk_lookup bcm6362_clks[]
CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll), CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll),
CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll), CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll),
/* gated clocks */ /* gated clocks */
@@ -32,7 +32,7 @@
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
CLKDEV_INIT(NULL, "usbh", &clk_usbh), CLKDEV_INIT(NULL, "usbh", &clk_usbh),
CLKDEV_INIT(NULL, "usbd", &clk_usbd), CLKDEV_INIT(NULL, "usbd", &clk_usbd),
@@ -635,6 +653,7 @@ static struct clk_lookup bcm6368_clks[] @@ -641,6 +659,7 @@ static struct clk_lookup bcm6368_clks[]
CLKDEV_INIT("10000100.serial", "refclk", &clk_periph), CLKDEV_INIT("10000100.serial", "refclk", &clk_periph),
CLKDEV_INIT("10000120.serial", "refclk", &clk_periph), CLKDEV_INIT("10000120.serial", "refclk", &clk_periph),
/* gated clocks */ /* gated clocks */
@@ -40,7 +40,7 @@
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
CLKDEV_INIT(NULL, "usbh", &clk_usbh), CLKDEV_INIT(NULL, "usbh", &clk_usbh),
CLKDEV_INIT(NULL, "usbd", &clk_usbd), CLKDEV_INIT(NULL, "usbd", &clk_usbd),
@@ -653,6 +672,7 @@ static struct clk_lookup bcm63268_clks[] @@ -659,6 +678,7 @@ static struct clk_lookup bcm63268_clks[]
CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll), CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll),
CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll), CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll),
/* gated clocks */ /* gated clocks */

8
target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
View File

@@ -607,7 +607,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* /*
--- a/drivers/net/ethernet/freescale/fman/mac.c --- a/drivers/net/ethernet/freescale/fman/mac.c
+++ b/drivers/net/ethernet/freescale/fman/mac.c +++ b/drivers/net/ethernet/freescale/fman/mac.c
@@ -605,7 +605,6 @@ static int mac_probe(struct platform_dev @@ -616,7 +616,6 @@ static int mac_probe(struct platform_dev
struct platform_device *of_dev; struct platform_device *of_dev;
struct resource res; struct resource res;
struct mac_priv_s *priv; struct mac_priv_s *priv;
@@ -615,7 +615,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
u32 val; u32 val;
u8 fman_id; u8 fman_id;
int phy_if; int phy_if;
@@ -723,13 +722,12 @@ static int mac_probe(struct platform_dev @@ -734,13 +733,12 @@ static int mac_probe(struct platform_dev
priv->cell_index = (u8)val; priv->cell_index = (u8)val;
/* Get the MAC address */ /* Get the MAC address */
@@ -1492,7 +1492,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
} }
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -1663,7 +1663,7 @@ static int axienet_probe(struct platform @@ -1665,7 +1665,7 @@ static int axienet_probe(struct platform
struct device_node *np; struct device_node *np;
struct axienet_local *lp; struct axienet_local *lp;
struct net_device *ndev; struct net_device *ndev;
@@ -1501,7 +1501,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
struct resource *ethres; struct resource *ethres;
u32 value; u32 value;
@@ -1835,13 +1835,14 @@ static int axienet_probe(struct platform @@ -1837,13 +1837,14 @@ static int axienet_probe(struct platform
dev_info(&pdev->dev, "Ethernet core IRQ not defined\n"); dev_info(&pdev->dev, "Ethernet core IRQ not defined\n");
/* Retrieve the MAC address */ /* Retrieve the MAC address */

2
target/linux/generic/pending-5.4/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
View File

@@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
--- a/mm/page_alloc.c --- a/mm/page_alloc.c
+++ b/mm/page_alloc.c +++ b/mm/page_alloc.c
@@ -6884,7 +6884,7 @@ static void __ref alloc_node_mem_map(str @@ -6886,7 +6886,7 @@ static void __ref alloc_node_mem_map(str
mem_map = NODE_DATA(0)->node_mem_map; mem_map = NODE_DATA(0)->node_mem_map;
#if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM) #if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM)
if (page_to_pfn(mem_map) != pgdat->node_start_pfn) if (page_to_pfn(mem_map) != pgdat->node_start_pfn)

2
target/linux/generic/pending-5.4/644-net-pppoe-support-hardware-flow-table-offload.patch
View File

@@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#define PPP_VERSION "2.4.2" #define PPP_VERSION "2.4.2"
/* /*
@@ -1373,12 +1378,37 @@ static void ppp_dev_priv_destructor(stru @@ -1378,12 +1383,37 @@ static void ppp_dev_priv_destructor(stru
ppp_destroy_interface(ppp); ppp_destroy_interface(ppp);
} }

2
target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
View File

@@ -53,7 +53,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
--- a/net/ipv4/fib_semantics.c --- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c
@@ -141,6 +141,10 @@ const struct fib_prop fib_props[RTN_MAX @@ -142,6 +142,10 @@ const struct fib_prop fib_props[RTN_MAX
.error = -EINVAL, .error = -EINVAL,
.scope = RT_SCOPE_NOWHERE, .scope = RT_SCOPE_NOWHERE,
}, },

2
target/linux/layerscape/patches-5.4/302-dts-0060-arm64-dts-ls1028a-add-flexspi-nodes.patch
View File

@@ -18,7 +18,7 @@ Signed-off-by: Xiaowei Bao <xiaowei.bao@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
@@ -222,6 +222,21 @@ @@ -226,6 +226,21 @@
phy-connection-type = "rgmii-id"; phy-connection-type = "rgmii-id";
}; };

2
target/linux/layerscape/patches-5.4/302-dts-0073-arm64-ls1028aqds-Add-support-DP-nodes-for-LS1028AQDS.patch
View File

@@ -13,7 +13,7 @@ Signed-off-by: Wen He <wen.he_1@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
@@ -244,3 +244,15 @@ @@ -248,3 +248,15 @@
&sata { &sata {
status = "okay"; status = "okay";
}; };

42
target/linux/layerscape/patches-5.4/302-dts-0083-arm64-ls1028a-qds-correct-bus-of-rtc.patch
View File

@@ -1,42 +0,0 @@
From d4c7270a63b1d78b89d91f74d782cce2a2bd9690 Mon Sep 17 00:00:00 2001
From: Biwen Li <biwen.li@nxp.com>
Date: Wed, 4 Sep 2019 11:39:30 +0800
Subject: [PATCH] arm64: ls1028a-qds: correct bus of rtc
The rtc is on i2c2 bus(hardware), not on i2c1 channel 3,
so correct it
Signed-off-by: Biwen Li <biwen.li@nxp.com>
---
arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
@@ -169,11 +169,6 @@
vcc-supply = <&sb_3v3>;
};
- rtc@51 {
- compatible = "nxp,pcf2129";
- reg = <0x51>;
- };
-
eeprom@56 {
compatible = "atmel,24c512";
reg = <0x56>;
@@ -217,6 +212,14 @@
};
+&i2c1 {
+ status = "okay";
+ rtc@51 {
+ compatible = "nxp,pcf2129";
+ reg = <0x51>;
+ };
+};
+
&enetc_port1 {
phy-handle = <&qds_phy1>;
phy-connection-type = "rgmii-id";

2
target/linux/layerscape/patches-5.4/302-dts-0084-arm64-dts-ls1028a-define-networking-options-for-QDS.patch
View File

@@ -346,7 +346,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
}; };
}; };
@@ -259,3 +283,6 @@ @@ -260,3 +284,6 @@
edp_num_lanes = <0x4>; edp_num_lanes = <0x4>;
status = "okay"; status = "okay";
}; };

2
target/linux/layerscape/patches-5.4/302-dts-0092-arm64-dts-ls1028a-Add-DP-DT-nodes.patch
View File

@@ -14,7 +14,7 @@ Signed-off-by: Wen He <wen.he_1@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
@@ -273,14 +273,7 @@ @@ -274,14 +274,7 @@
}; };
&hdptx0 { &hdptx0 {

2
target/linux/layerscape/patches-5.4/302-dts-0113-arm64-dts-fsl-ls1028a-qds-Add-overlays-for-various-s.patch
View File

@@ -884,7 +884,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
-}; -};
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
@@ -276,6 +276,3 @@ @@ -277,6 +277,3 @@
lane-mapping = <0x4e>; lane-mapping = <0x4e>;
status = "okay"; status = "okay";
}; };

2
target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch
View File

@@ -20,7 +20,7 @@ Signed-off-by: Li Jun <jun.li@freescale.com>
--- a/drivers/usb/core/hub.c --- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c
@@ -4777,7 +4777,8 @@ hub_port_init(struct usb_hub *hub, struc @@ -4780,7 +4780,8 @@ hub_port_init(struct usb_hub *hub, struc
} }
if (r) { if (r) {
if (r != -ENODEV) if (r != -ENODEV)

2
target/linux/octeon/patches-5.4/130-itus_shield_support.patch
View File

@@ -20,7 +20,7 @@
} }
--- a/arch/mips/cavium-octeon/octeon-platform.c --- a/arch/mips/cavium-octeon/octeon-platform.c
+++ b/arch/mips/cavium-octeon/octeon-platform.c +++ b/arch/mips/cavium-octeon/octeon-platform.c
@@ -771,7 +771,7 @@ int __init octeon_prune_device_tree(void @@ -773,7 +773,7 @@ int __init octeon_prune_device_tree(void
if (fdt_check_header(initial_boot_params)) if (fdt_check_header(initial_boot_params))
panic("Corrupt Device Tree."); panic("Corrupt Device Tree.");

2
target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
View File

@@ -22,7 +22,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com>
#include <linux/platform_data/x86/apple.h> #include <linux/platform_data/x86/apple.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/suspend.h> #include <linux/suspend.h>
@@ -5790,3 +5791,34 @@ static void nvidia_ion_ahci_fixup(struct @@ -5793,3 +5794,34 @@ static void nvidia_ion_ahci_fixup(struct
pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING; pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING;
} }
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup);