From 28ef76402671c4166de2d34e52dbc4f46dc08077 Mon Sep 17 00:00:00 2001 From: John Audia Date: Sun, 25 Jul 2021 14:36:53 -0400 Subject: [PATCH] kernel: bump 5.4 to 5.4.135 All patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia --- include/kernel-version.mk | 4 +-- .../910-unaligned_access_hacks.patch | 2 +- ...Better-coalescing-parameter-defaults.patch | 2 +- ...36-drm-v3d-The-third-IRQ-is-optional.patch | 2 +- ...et-bcmgenet-Reset-RBUF-on-first-open.patch | 8 +++--- ...0003-ARM-dts-gemini-Rename-IDE-nodes.patch | 6 ++--- ...e6xxx-Add-support-for-port-mirroring.patch | 4 +-- ...x-fix-broken-if-statement-because-of.patch | 2 +- ...equest-assisted-learning-on-CPU-port.patch | 2 +- ...a-accumulated-change-to-ls208xa-boar.patch | 26 +++++++++---------- ...s208xa-add-more-thermal-zone-support.patch | 2 +- ...endianness-information-to-dts-serdes.patch | 2 +- ...C3-IP-VBUS-glitch-issue-on-Layerscap.patch | 4 +-- ...yerscape-fix-warnings-when-compiling.patch | 20 +++++++------- ...m64-dts-fsl-remove-backplane-support.patch | 4 +-- ...a-ls1043a-ls1046a-ls1088a-ls208xa-re.patch | 2 +- ...078-arm64-dts-fix-endianness-of-rcpm.patch | 2 +- ...ts-layerscape-add-chip-specific-comp.patch | 4 +-- ...cape-apply-dma-coherent-for-dwc3-nod.patch | 4 +-- ...a-Update-qspi-node-properties-for-LS.patch | 2 +- ...a-Remove-dma-coherent-from-dwc3-node.patch | 4 +-- ...lot-add-tsn-support-for-felix-switch.patch | 2 +- .../patches-5.4/0310-mtk-bmt-support.patch | 4 +-- ..._eth_soc-add-support-for-coherent-DM.patch | 2 +- ...l-armada-37xx-Set-pcie_reset_pin-to-.patch | 2 +- ...l-armada-37xx-Move-PCIe-comphy-handl.patch | 2 +- ...l-armada-37xx-Move-PCIe-max-link-spe.patch | 2 +- ...ethernet-mediatek-support-net-labels.patch | 6 ++--- 28 files changed, 64 insertions(+), 64 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index b70dc5b89de..0ec155de2d5 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-5.4 = .134 +LINUX_VERSION-5.4 = .135 LINUX_VERSION-5.10 = .54 -LINUX_KERNEL_HASH-5.4.134 = c9fb861642161c256e10c97c35ccce18831e688d87ead53c18e3226778e05841 +LINUX_KERNEL_HASH-5.4.135 = 83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1 LINUX_KERNEL_HASH-5.10.54 = bf50c63261847187eca4a1793e5df5c1355b21697409589f6ca03e32b629be44 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch index 99520863d3e..55b198eb0c3 100644 --- a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch @@ -214,7 +214,7 @@ #include #include #include -@@ -849,10 +850,10 @@ static void tcp_v6_send_response(const s +@@ -864,10 +865,10 @@ static void tcp_v6_send_response(const s topt = (__be32 *)(t1 + 1); if (tsecr) { diff --git a/target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch b/target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch index 3a38f64436f..1d3765b93c9 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell /* Disable rate control for now */ bcmgenet_tdma_ring_writel(priv, index, flow_period_val, TDMA_FLOW_PERIOD); -@@ -3573,9 +3573,12 @@ static int bcmgenet_probe(struct platfor +@@ -3579,9 +3579,12 @@ static int bcmgenet_probe(struct platfor netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1); /* Set default coalescing parameters */ diff --git a/target/linux/bcm27xx/patches-5.4/950-0336-drm-v3d-The-third-IRQ-is-optional.patch b/target/linux/bcm27xx/patches-5.4/950-0336-drm-v3d-The-third-IRQ-is-optional.patch index 97ff76a6a33..ab3c053c3f0 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0336-drm-v3d-The-third-IRQ-is-optional.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0336-drm-v3d-The-third-IRQ-is-optional.patch @@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -3474,7 +3474,7 @@ static int bcmgenet_probe(struct platfor +@@ -3480,7 +3480,7 @@ static int bcmgenet_probe(struct platfor priv = netdev_priv(dev); priv->irq0 = platform_get_irq(pdev, 0); priv->irq1 = platform_get_irq(pdev, 1); diff --git a/target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch b/target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch index b7f0ce0cad8..60505cf4ed0 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch @@ -31,9 +31,9 @@ Signed-off-by: Phil Elwell -static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv) +static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv, bool flush_rx) { + unsigned int i; u32 reg; - u32 dma_ctrl; -@@ -2809,6 +2809,14 @@ static u32 bcmgenet_dma_disable(struct b +@@ -2815,6 +2815,14 @@ static u32 bcmgenet_dma_disable(struct b udelay(10); bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH); @@ -48,7 +48,7 @@ Signed-off-by: Phil Elwell return dma_ctrl; } -@@ -2910,8 +2918,8 @@ static int bcmgenet_open(struct net_devi +@@ -2916,8 +2924,8 @@ static int bcmgenet_open(struct net_devi bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT); } @@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell /* Reinitialize TDMA and RDMA and SW housekeeping */ ret = bcmgenet_init_dma(priv); -@@ -3671,7 +3679,7 @@ static int bcmgenet_resume(struct device +@@ -3677,7 +3685,7 @@ static int bcmgenet_resume(struct device bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC); /* Disable RX/TX DMA and flush TX queues */ diff --git a/target/linux/gemini/patches-5.4/0003-ARM-dts-gemini-Rename-IDE-nodes.patch b/target/linux/gemini/patches-5.4/0003-ARM-dts-gemini-Rename-IDE-nodes.patch index 6477b2d2a46..cf4a74f86a7 100644 --- a/target/linux/gemini/patches-5.4/0003-ARM-dts-gemini-Rename-IDE-nodes.patch +++ b/target/linux/gemini/patches-5.4/0003-ARM-dts-gemini-Rename-IDE-nodes.patch @@ -84,7 +84,7 @@ Signed-off-by: Linus Walleij --- a/arch/arm/boot/dts/gemini.dtsi +++ b/arch/arm/boot/dts/gemini.dtsi -@@ -356,7 +356,7 @@ +@@ -357,7 +357,7 @@ }; }; @@ -93,7 +93,7 @@ Signed-off-by: Linus Walleij compatible = "cortina,gemini-pata", "faraday,ftide010"; reg = <0x63000000 0x1000>; interrupts = <4 IRQ_TYPE_EDGE_RISING>; -@@ -365,9 +365,11 @@ +@@ -366,9 +366,11 @@ clock-names = "PCLK"; sata = <&sata>; status = "disabled"; @@ -106,7 +106,7 @@ Signed-off-by: Linus Walleij compatible = "cortina,gemini-pata", "faraday,ftide010"; reg = <0x63400000 0x1000>; interrupts = <5 IRQ_TYPE_EDGE_RISING>; -@@ -376,6 +378,8 @@ +@@ -377,6 +379,8 @@ clock-names = "PCLK"; sata = <&sata>; status = "disabled"; diff --git a/target/linux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch b/target/linux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch index 30ff8aeab60..a23f45075f8 100644 --- a/target/linux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch +++ b/target/linux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch @@ -25,7 +25,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -4922,6 +4922,80 @@ static int mv88e6xxx_port_mdb_del(struct +@@ -4926,6 +4926,80 @@ static int mv88e6xxx_port_mdb_del(struct return err; } @@ -106,7 +106,7 @@ Signed-off-by: David S. Miller static int mv88e6xxx_port_egress_floods(struct dsa_switch *ds, int port, bool unicast, bool multicast) { -@@ -4976,6 +5050,8 @@ static const struct dsa_switch_ops mv88e +@@ -4980,6 +5054,8 @@ static const struct dsa_switch_ops mv88e .port_mdb_prepare = mv88e6xxx_port_mdb_prepare, .port_mdb_add = mv88e6xxx_port_mdb_add, .port_mdb_del = mv88e6xxx_port_mdb_del, diff --git a/target/linux/generic/backport-5.4/748-v5.5-net-dsa-mv88e6xxx-fix-broken-if-statement-because-of.patch b/target/linux/generic/backport-5.4/748-v5.5-net-dsa-mv88e6xxx-fix-broken-if-statement-because-of.patch index d8ec1240f7e..37e7a7f2a9c 100644 --- a/target/linux/generic/backport-5.4/748-v5.5-net-dsa-mv88e6xxx-fix-broken-if-statement-because-of.patch +++ b/target/linux/generic/backport-5.4/748-v5.5-net-dsa-mv88e6xxx-fix-broken-if-statement-because-of.patch @@ -19,7 +19,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -4989,7 +4989,7 @@ static void mv88e6xxx_port_mirror_del(st +@@ -4993,7 +4993,7 @@ static void mv88e6xxx_port_mirror_del(st if (chip->info->ops->set_egress_port(chip, direction, dsa_upstream_port(ds, diff --git a/target/linux/generic/pending-5.4/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch b/target/linux/generic/pending-5.4/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch index 653a782f520..cb421f164bd 100644 --- a/target/linux/generic/pending-5.4/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch +++ b/target/linux/generic/pending-5.4/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch @@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -5076,6 +5076,7 @@ static int mv88e6xxx_register_switch(str +@@ -5080,6 +5080,7 @@ static int mv88e6xxx_register_switch(str ds->ops = &mv88e6xxx_switch_ops; ds->ageing_time_min = chip->info->age_time_coeff; ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX; diff --git a/target/linux/layerscape/patches-5.4/302-dts-0010-arm64-dts-ls208xa-accumulated-change-to-ls208xa-boar.patch b/target/linux/layerscape/patches-5.4/302-dts-0010-arm64-dts-ls208xa-accumulated-change-to-ls208xa-boar.patch index 2b1bd825a4a..a763e057249 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0010-arm64-dts-ls208xa-accumulated-change-to-ls208xa-boar.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0010-arm64-dts-ls208xa-accumulated-change-to-ls208xa-boar.patch @@ -702,7 +702,7 @@ binding }; pmu { -@@ -560,15 +559,126 @@ +@@ -559,15 +558,126 @@ #interrupt-cells = <2>; }; @@ -831,7 +831,7 @@ binding }; i2c1: i2c@2010000 { -@@ -579,7 +689,7 @@ +@@ -578,7 +688,7 @@ reg = <0x0 0x2010000 0x0 0x10000>; interrupts = <0 34 0x4>; /* Level high type */ clock-names = "i2c"; @@ -840,7 +840,7 @@ binding }; i2c2: i2c@2020000 { -@@ -590,7 +700,7 @@ +@@ -589,7 +699,7 @@ reg = <0x0 0x2020000 0x0 0x10000>; interrupts = <0 35 0x4>; /* Level high type */ clock-names = "i2c"; @@ -849,7 +849,7 @@ binding }; i2c3: i2c@2030000 { -@@ -601,7 +711,7 @@ +@@ -600,7 +710,7 @@ reg = <0x0 0x2030000 0x0 0x10000>; interrupts = <0 35 0x4>; /* Level high type */ clock-names = "i2c"; @@ -858,7 +858,7 @@ binding }; ifc: ifc@2240000 { -@@ -633,8 +743,8 @@ +@@ -632,8 +742,8 @@ pcie1: pcie@3400000 { compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie"; reg-names = "regs", "config"; @@ -869,7 +869,7 @@ binding #address-cells = <3>; #size-cells = <2>; device_type = "pci"; -@@ -642,6 +752,7 @@ +@@ -641,6 +751,7 @@ num-viewport = <6>; bus-range = <0x0 0xff>; msi-parent = <&its>; @@ -877,7 +877,7 @@ binding #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; interrupt-map = <0000 0 0 1 &gic 0 0 0 109 4>, -@@ -654,8 +765,8 @@ +@@ -653,8 +764,8 @@ pcie2: pcie@3500000 { compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie"; reg-names = "regs", "config"; @@ -888,7 +888,7 @@ binding #address-cells = <3>; #size-cells = <2>; device_type = "pci"; -@@ -663,6 +774,7 @@ +@@ -662,6 +773,7 @@ num-viewport = <6>; bus-range = <0x0 0xff>; msi-parent = <&its>; @@ -896,7 +896,7 @@ binding #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; interrupt-map = <0000 0 0 1 &gic 0 0 0 114 4>, -@@ -675,8 +787,8 @@ +@@ -674,8 +786,8 @@ pcie3: pcie@3600000 { compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie"; reg-names = "regs", "config"; @@ -907,7 +907,7 @@ binding #address-cells = <3>; #size-cells = <2>; device_type = "pci"; -@@ -684,6 +796,7 @@ +@@ -683,6 +795,7 @@ num-viewport = <256>; bus-range = <0x0 0xff>; msi-parent = <&its>; @@ -915,7 +915,7 @@ binding #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; interrupt-map = <0000 0 0 1 &gic 0 0 0 119 4>, -@@ -696,8 +809,8 @@ +@@ -695,8 +808,8 @@ pcie4: pcie@3700000 { compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie"; reg-names = "regs", "config"; @@ -926,7 +926,7 @@ binding #address-cells = <3>; #size-cells = <2>; device_type = "pci"; -@@ -705,6 +818,7 @@ +@@ -704,6 +817,7 @@ num-viewport = <6>; bus-range = <0x0 0xff>; msi-parent = <&its>; @@ -934,7 +934,7 @@ binding #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; interrupt-map = <0000 0 0 1 &gic 0 0 0 124 4>, -@@ -754,11 +868,22 @@ +@@ -753,11 +867,22 @@ snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; }; diff --git a/target/linux/layerscape/patches-5.4/302-dts-0025-arm64-dts-nxp-ls208xa-add-more-thermal-zone-support.patch b/target/linux/layerscape/patches-5.4/302-dts-0025-arm64-dts-nxp-ls208xa-add-more-thermal-zone-support.patch index 42deb82ea33..5434e1f913c 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0025-arm64-dts-nxp-ls208xa-add-more-thermal-zone-support.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0025-arm64-dts-nxp-ls208xa-add-more-thermal-zone-support.patch @@ -146,7 +146,7 @@ Signed-off-by: Yuantian Tang timer: timer { compatible = "arm,armv8-timer"; -@@ -907,3 +872,36 @@ +@@ -906,3 +871,36 @@ }; }; }; diff --git a/target/linux/layerscape/patches-5.4/302-dts-0032-arm64-dts-Added-endianness-information-to-dts-serdes.patch b/target/linux/layerscape/patches-5.4/302-dts-0032-arm64-dts-Added-endianness-information-to-dts-serdes.patch index 25525068150..b19431d5676 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0032-arm64-dts-Added-endianness-information-to-dts-serdes.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0032-arm64-dts-Added-endianness-information-to-dts-serdes.patch @@ -27,7 +27,7 @@ Signed-off-by: Florinel Iordache tmu: tmu@1f80000 { --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi -@@ -834,8 +834,9 @@ +@@ -833,8 +833,9 @@ }; serdes1: serdes@1ea0000 { diff --git a/target/linux/layerscape/patches-5.4/302-dts-0045-arm64-dts-Fix-DWC3-IP-VBUS-glitch-issue-on-Layerscap.patch b/target/linux/layerscape/patches-5.4/302-dts-0045-arm64-dts-Fix-DWC3-IP-VBUS-glitch-issue-on-Layerscap.patch index c2b7e1fde2c..10eca4a0832 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0045-arm64-dts-Fix-DWC3-IP-VBUS-glitch-issue-on-Layerscap.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0045-arm64-dts-Fix-DWC3-IP-VBUS-glitch-issue-on-Layerscap.patch @@ -98,7 +98,7 @@ Signed-off-by: Ran Wang --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi -@@ -820,6 +820,7 @@ +@@ -819,6 +819,7 @@ snps,quirk-frame-length-adjustment = <0x20>; snps,dis_rxdet_inp3_quirk; snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; @@ -106,7 +106,7 @@ Signed-off-by: Ran Wang }; usb1: usb3@3110000 { -@@ -831,6 +832,7 @@ +@@ -830,6 +831,7 @@ snps,quirk-frame-length-adjustment = <0x20>; snps,dis_rxdet_inp3_quirk; snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; diff --git a/target/linux/layerscape/patches-5.4/302-dts-0051-arm64-dts-fsl-layerscape-fix-warnings-when-compiling.patch b/target/linux/layerscape/patches-5.4/302-dts-0051-arm64-dts-fsl-layerscape-fix-warnings-when-compiling.patch index d4875bc8771..7ac2f3166b3 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0051-arm64-dts-fsl-layerscape-fix-warnings-when-compiling.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0051-arm64-dts-fsl-layerscape-fix-warnings-when-compiling.patch @@ -117,7 +117,7 @@ Signed-off-by: Pankaj Bansal * * Abhimanyu Saini * -@@ -525,7 +525,7 @@ +@@ -524,7 +524,7 @@ }; /* TODO: WRIOP (CCSR?) */ @@ -126,7 +126,7 @@ Signed-off-by: Pankaj Bansal * E-MDIO1: 0x1_6000 */ compatible = "fsl,fman-memac-mdio"; -@@ -538,7 +538,7 @@ +@@ -537,7 +537,7 @@ #size-cells = <0>; }; @@ -135,7 +135,7 @@ Signed-off-by: Pankaj Bansal * E-MDIO2: 0x1_7000 */ compatible = "fsl,fman-memac-mdio"; -@@ -550,7 +550,7 @@ +@@ -549,7 +549,7 @@ #size-cells = <0>; }; @@ -144,7 +144,7 @@ Signed-off-by: Pankaj Bansal compatible = "fsl,fman-memac-mdio"; reg = <0x0 0x8c07000 0x0 0x1000>; device_type = "mdio"; -@@ -560,7 +560,7 @@ +@@ -559,7 +559,7 @@ #size-cells = <0>; }; @@ -153,7 +153,7 @@ Signed-off-by: Pankaj Bansal compatible = "fsl,fman-memac-mdio"; reg = <0x0 0x8c0b000 0x0 0x1000>; device_type = "mdio"; -@@ -570,7 +570,7 @@ +@@ -569,7 +569,7 @@ #size-cells = <0>; }; @@ -162,7 +162,7 @@ Signed-off-by: Pankaj Bansal compatible = "fsl,fman-memac-mdio"; reg = <0x0 0x8c0f000 0x0 0x1000>; device_type = "mdio"; -@@ -580,7 +580,7 @@ +@@ -579,7 +579,7 @@ #size-cells = <0>; }; @@ -171,7 +171,7 @@ Signed-off-by: Pankaj Bansal compatible = "fsl,fman-memac-mdio"; reg = <0x0 0x8c13000 0x0 0x1000>; device_type = "mdio"; -@@ -590,7 +590,7 @@ +@@ -589,7 +589,7 @@ #size-cells = <0>; }; @@ -180,7 +180,7 @@ Signed-off-by: Pankaj Bansal status = "disabled"; compatible = "fsl,fman-memac-mdio"; reg = <0x0 0x8c17000 0x0 0x1000>; -@@ -601,7 +601,7 @@ +@@ -600,7 +600,7 @@ #size-cells = <0>; }; @@ -189,7 +189,7 @@ Signed-off-by: Pankaj Bansal status = "disabled"; compatible = "fsl,fman-memac-mdio"; reg = <0x0 0x8c1b000 0x0 0x1000>; -@@ -612,7 +612,7 @@ +@@ -611,7 +611,7 @@ #size-cells = <0>; }; @@ -198,7 +198,7 @@ Signed-off-by: Pankaj Bansal status = "disabled"; compatible = "fsl,fman-memac-mdio"; reg = <0x0 0x8c1f000 0x0 0x1000>; -@@ -623,7 +623,7 @@ +@@ -622,7 +622,7 @@ #size-cells = <0>; }; diff --git a/target/linux/layerscape/patches-5.4/302-dts-0063-arm64-dts-fsl-remove-backplane-support.patch b/target/linux/layerscape/patches-5.4/302-dts-0063-arm64-dts-fsl-remove-backplane-support.patch index d65b222c334..749df043e09 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0063-arm64-dts-fsl-remove-backplane-support.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0063-arm64-dts-fsl-remove-backplane-support.patch @@ -260,7 +260,7 @@ Signed-off-by: Florinel Iordache phy-handle = <&mdio0_phy12>; --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi -@@ -550,90 +550,6 @@ +@@ -549,90 +549,6 @@ #size-cells = <0>; }; @@ -351,7 +351,7 @@ Signed-off-by: Florinel Iordache i2c0: i2c@2000000 { status = "disabled"; compatible = "fsl,vf610-i2c", "fsl,ls208xa-vf610-i2c"; -@@ -835,12 +751,6 @@ +@@ -834,12 +750,6 @@ snps,host-vbus-glitches; }; diff --git a/target/linux/layerscape/patches-5.4/302-dts-0070-arm64-dts-ls1012a-ls1043a-ls1046a-ls1088a-ls208xa-re.patch b/target/linux/layerscape/patches-5.4/302-dts-0070-arm64-dts-ls1012a-ls1043a-ls1046a-ls1088a-ls208xa-re.patch index baa4c79586b..78713d778e1 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0070-arm64-dts-ls1012a-ls1043a-ls1046a-ls1088a-ls208xa-re.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0070-arm64-dts-ls1012a-ls1043a-ls1046a-ls1088a-ls208xa-re.patch @@ -276,7 +276,7 @@ Signed-off-by: Biwen Li }; cpu: cpus { -@@ -757,9 +758,16 @@ +@@ -756,9 +757,16 @@ interrupts = <0 12 4>; }; diff --git a/target/linux/layerscape/patches-5.4/302-dts-0078-arm64-dts-fix-endianness-of-rcpm.patch b/target/linux/layerscape/patches-5.4/302-dts-0078-arm64-dts-fix-endianness-of-rcpm.patch index 53a8a5506ab..4aabcebcae3 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0078-arm64-dts-fix-endianness-of-rcpm.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0078-arm64-dts-fix-endianness-of-rcpm.patch @@ -34,7 +34,7 @@ Signed-off-by: Biwen Li ftm_alarm0: timer@2800000 { --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi -@@ -762,6 +762,7 @@ +@@ -761,6 +761,7 @@ compatible = "fsl,ls208xa-rcpm", "fsl,qoriq-rcpm-2.1+"; reg = <0x0 0x1e34040 0x0 0x18>; #fsl,rcpm-wakeup-cells = <6>; diff --git a/target/linux/layerscape/patches-5.4/302-dts-0097-LF-387-5-arm64-dts-layerscape-add-chip-specific-comp.patch b/target/linux/layerscape/patches-5.4/302-dts-0097-LF-387-5-arm64-dts-layerscape-add-chip-specific-comp.patch index 333fecb3fd6..25d66a4ba65 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0097-LF-387-5-arm64-dts-layerscape-add-chip-specific-comp.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0097-LF-387-5-arm64-dts-layerscape-add-chip-specific-comp.patch @@ -110,7 +110,7 @@ Reviewed-by: Leo Li dr_mode = "host"; --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi -@@ -730,7 +730,7 @@ +@@ -729,7 +729,7 @@ usb0: usb3@3100000 { status = "disabled"; @@ -119,7 +119,7 @@ Reviewed-by: Leo Li reg = <0x0 0x3100000 0x0 0x10000>; interrupts = <0 80 0x4>; /* Level high type */ dr_mode = "host"; -@@ -742,7 +742,7 @@ +@@ -741,7 +741,7 @@ usb1: usb3@3110000 { status = "disabled"; diff --git a/target/linux/layerscape/patches-5.4/302-dts-0099-arm64-dts-layerscape-apply-dma-coherent-for-dwc3-nod.patch b/target/linux/layerscape/patches-5.4/302-dts-0099-arm64-dts-layerscape-apply-dma-coherent-for-dwc3-nod.patch index 5d325baabcd..ef719e393b5 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0099-arm64-dts-layerscape-apply-dma-coherent-for-dwc3-nod.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0099-arm64-dts-layerscape-apply-dma-coherent-for-dwc3-nod.patch @@ -122,7 +122,7 @@ Signed-off-by: Ran Wang --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi -@@ -738,6 +738,7 @@ +@@ -737,6 +737,7 @@ snps,dis_rxdet_inp3_quirk; snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; snps,host-vbus-glitches; @@ -130,7 +130,7 @@ Signed-off-by: Ran Wang }; usb1: usb3@3110000 { -@@ -750,6 +751,7 @@ +@@ -749,6 +750,7 @@ snps,dis_rxdet_inp3_quirk; snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; snps,host-vbus-glitches; diff --git a/target/linux/layerscape/patches-5.4/302-dts-0100-arm64-dts-ls208xa-Update-qspi-node-properties-for-LS.patch b/target/linux/layerscape/patches-5.4/302-dts-0100-arm64-dts-ls208xa-Update-qspi-node-properties-for-LS.patch index 0b2de32302f..6efbe1ecf1a 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0100-arm64-dts-ls208xa-Update-qspi-node-properties-for-LS.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0100-arm64-dts-ls208xa-Update-qspi-node-properties-for-LS.patch @@ -42,7 +42,7 @@ Signed-off-by: Kuldeep Singh }; --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi -@@ -610,16 +610,16 @@ +@@ -609,16 +609,16 @@ }; qspi: spi@20c0000 { diff --git a/target/linux/layerscape/patches-5.4/302-dts-0101-arm64-dts-ls208xa-Remove-dma-coherent-from-dwc3-node.patch b/target/linux/layerscape/patches-5.4/302-dts-0101-arm64-dts-ls208xa-Remove-dma-coherent-from-dwc3-node.patch index dcd3beeb041..dc901753622 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0101-arm64-dts-ls208xa-Remove-dma-coherent-from-dwc3-node.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0101-arm64-dts-ls208xa-Remove-dma-coherent-from-dwc3-node.patch @@ -18,7 +18,7 @@ Signed-off-by: Ran Wang --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi -@@ -738,7 +738,6 @@ +@@ -737,7 +737,6 @@ snps,dis_rxdet_inp3_quirk; snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; snps,host-vbus-glitches; @@ -26,7 +26,7 @@ Signed-off-by: Ran Wang }; usb1: usb3@3110000 { -@@ -751,7 +750,6 @@ +@@ -750,7 +749,6 @@ snps,dis_rxdet_inp3_quirk; snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; snps,host-vbus-glitches; diff --git a/target/linux/layerscape/patches-5.4/701-net-0273-net-dsa-ocelot-add-tsn-support-for-felix-switch.patch b/target/linux/layerscape/patches-5.4/701-net-0273-net-dsa-ocelot-add-tsn-support-for-felix-switch.patch index 72b101bfb0b..22d6c97a72f 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0273-net-dsa-ocelot-add-tsn-support-for-felix-switch.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0273-net-dsa-ocelot-add-tsn-support-for-felix-switch.patch @@ -658,7 +658,7 @@ Signed-off-by: Xiaoliang Yang struct dsa_switch_driver { --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c -@@ -323,6 +323,10 @@ static int dsa_port_setup(struct dsa_por +@@ -325,6 +325,10 @@ static int dsa_port_setup(struct dsa_por if (err) break; diff --git a/target/linux/mediatek/patches-5.4/0310-mtk-bmt-support.patch b/target/linux/mediatek/patches-5.4/0310-mtk-bmt-support.patch index 2a23f8c3dc8..4cef9f9d5ea 100644 --- a/target/linux/mediatek/patches-5.4/0310-mtk-bmt-support.patch +++ b/target/linux/mediatek/patches-5.4/0310-mtk-bmt-support.patch @@ -797,7 +797,7 @@ static int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val) { -@@ -1099,6 +1100,8 @@ static int spinand_probe(struct spi_mem +@@ -1100,6 +1101,8 @@ static int spinand_probe(struct spi_mem if (ret) return ret; @@ -806,7 +806,7 @@ ret = mtd_device_register(mtd, NULL, 0); if (ret) goto err_spinand_cleanup; -@@ -1124,6 +1127,7 @@ static int spinand_remove(struct spi_mem +@@ -1125,6 +1128,7 @@ static int spinand_remove(struct spi_mem if (ret) return ret; diff --git a/target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch b/target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch index e75d76b9cc6..3d62f40544a 100644 --- a/target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch +++ b/target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch @@ -51,7 +51,7 @@ Signed-off-by: Felix Fietkau if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) { ret = device_reset(eth->dev); if (ret) { -@@ -3104,6 +3112,16 @@ static int mtk_probe(struct platform_dev +@@ -3106,6 +3114,16 @@ static int mtk_probe(struct platform_dev } } diff --git a/target/linux/mvebu/patches-5.4/020-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch b/target/linux/mvebu/patches-5.4/020-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch index 9eeddaeba16..cd15b20ed1f 100644 --- a/target/linux/mvebu/patches-5.4/020-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch +++ b/target/linux/mvebu/patches-5.4/020-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch @@ -69,7 +69,7 @@ Signed-off-by: Gregory CLEMENT /* J6 */ --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts -@@ -120,10 +120,6 @@ +@@ -126,10 +126,6 @@ }; }; diff --git a/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch b/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch index 0c7830cb475..b42192d9fd0 100644 --- a/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch +++ b/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch @@ -37,7 +37,7 @@ Signed-off-by: Gregory CLEMENT reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>; --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts -@@ -126,7 +126,6 @@ +@@ -132,7 +132,6 @@ status = "okay"; max-link-speed = <2>; reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>; diff --git a/target/linux/mvebu/patches-5.4/022-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch b/target/linux/mvebu/patches-5.4/022-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch index 04002480cc5..43cda3f29f7 100644 --- a/target/linux/mvebu/patches-5.4/022-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch +++ b/target/linux/mvebu/patches-5.4/022-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch @@ -24,7 +24,7 @@ Signed-off-by: Gregory CLEMENT --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts -@@ -124,7 +124,6 @@ +@@ -130,7 +130,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pcie_reset_pins &pcie_clkreq_pins>; status = "okay"; diff --git a/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch index b011b140c76..f29156340b1 100644 --- a/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch +++ b/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch @@ -22,9 +22,9 @@ Signed-off-by: René van Dorst const __be32 *_id = of_get_property(np, "reg", NULL); struct phylink *phylink; int phy_mode, id, err; -@@ -3035,6 +3036,9 @@ static int mtk_add_mac(struct mtk_eth *e - - eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN; +@@ -3037,6 +3038,9 @@ static int mtk_add_mac(struct mtk_eth *e + + of_platform_device_create(np, NULL, NULL); + if (name) + strlcpy(eth->netdev[id]->name, name, IFNAMSIZ);