From 81995a5e77c0cc5bf5b59ef4bec78b969c020013 Mon Sep 17 00:00:00 2001 From: John Audia Date: Sat, 27 Nov 2021 15:40:46 -0500 Subject: kernel: bump 5.4 to 5.4.162 All patches automatically rebased. Build system: x86_64 Build-tested: ramips/mt7621* *I am hit with the binutils 2.37 bug so I had to revert 7f1edbd41295dff9f2127b169fbc086c0fb2c14e in order to downgrade to 2.35.1 Signed-off-by: John Audia --- .../302-dts-0011-ARM-dts-accumulated-change.patch | 14 +++++++------- ...-ARM-dts-Fix-DWC3-IP-VBUS-glitch-issue-on-LS1021A.patch | 2 +- ...-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch | 7 ++++--- ...-dts-ls1021a-fix-that-FlexTimer-cannot-wakeup-sys.patch | 2 +- ...403-ARM64-dts-fsl-Add-clock-names-mclk0-for-SAI-n.patch | 4 ++-- 5 files changed, 15 insertions(+), 14 deletions(-) (limited to 'target/linux/layerscape') diff --git a/target/linux/layerscape/patches-5.4/302-dts-0011-ARM-dts-accumulated-change.patch b/target/linux/layerscape/patches-5.4/302-dts-0011-ARM-dts-accumulated-change.patch index c49c4db2a7..6f3181d65a 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0011-ARM-dts-accumulated-change.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0011-ARM-dts-accumulated-change.patch @@ -75,7 +75,7 @@ Signed-off-by: Li Yang big-endian; }; -@@ -371,7 +372,7 @@ +@@ -338,7 +339,7 @@ }; i2c0: i2c@2180000 { @@ -84,7 +84,7 @@ Signed-off-by: Li Yang #address-cells = <1>; #size-cells = <0>; reg = <0x0 0x2180000 0x0 0x10000>; -@@ -380,11 +381,12 @@ +@@ -347,11 +348,12 @@ clocks = <&clockgen 4 1>; dma-names = "tx", "rx"; dmas = <&edma0 1 39>, <&edma0 1 38>; @@ -98,7 +98,7 @@ Signed-off-by: Li Yang #address-cells = <1>; #size-cells = <0>; reg = <0x0 0x2190000 0x0 0x10000>; -@@ -393,6 +395,7 @@ +@@ -360,6 +362,7 @@ clocks = <&clockgen 4 1>; dma-names = "tx", "rx"; dmas = <&edma0 1 37>, <&edma0 1 36>; @@ -106,7 +106,7 @@ Signed-off-by: Li Yang status = "disabled"; }; -@@ -579,6 +582,16 @@ +@@ -546,6 +549,16 @@ status = "disabled"; }; @@ -123,7 +123,7 @@ Signed-off-by: Li Yang pwm1: pwm@29e0000 { compatible = "fsl,vf610-ftm-pwm"; #pwm-cells = <3>; -@@ -861,6 +874,8 @@ +@@ -828,6 +841,8 @@ dr_mode = "host"; snps,quirk-frame-length-adjustment = <0x20>; snps,dis_rxdet_inp3_quirk; @@ -132,7 +132,7 @@ Signed-off-by: Li Yang snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; }; -@@ -869,7 +884,9 @@ +@@ -836,7 +851,9 @@ reg = <0x00 0x03400000 0x0 0x00010000 /* controller registers */ 0x40 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; @@ -143,7 +143,7 @@ Signed-off-by: Li Yang fsl,pcie-scfg = <&scfg 0>; #address-cells = <3>; #size-cells = <2>; -@@ -893,7 +910,9 @@ +@@ -860,7 +877,9 @@ reg = <0x00 0x03500000 0x0 0x00010000 /* controller registers */ 0x48 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; diff --git a/target/linux/layerscape/patches-5.4/302-dts-0046-ARM-dts-Fix-DWC3-IP-VBUS-glitch-issue-on-LS1021A.patch b/target/linux/layerscape/patches-5.4/302-dts-0046-ARM-dts-Fix-DWC3-IP-VBUS-glitch-issue-on-LS1021A.patch index de9de09913..e80fe0a45e 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0046-ARM-dts-Fix-DWC3-IP-VBUS-glitch-issue-on-LS1021A.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0046-ARM-dts-Fix-DWC3-IP-VBUS-glitch-issue-on-LS1021A.patch @@ -10,7 +10,7 @@ Signed-off-by: Ran Wang --- a/arch/arm/boot/dts/ls1021a.dtsi +++ b/arch/arm/boot/dts/ls1021a.dtsi -@@ -877,6 +877,7 @@ +@@ -844,6 +844,7 @@ usb3-lpm-capable; snps,dis-u1u2-when-u3-quirk; snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; diff --git a/target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch b/target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch index d8412c2b50..2d63cc0b55 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch @@ -24,7 +24,7 @@ Signed-off-by: Biwen Li }; cpus { -@@ -582,16 +583,6 @@ +@@ -549,16 +550,6 @@ status = "disabled"; }; @@ -41,7 +41,7 @@ Signed-off-by: Biwen Li pwm1: pwm@29e0000 { compatible = "fsl,vf610-ftm-pwm"; #pwm-cells = <3>; -@@ -1003,5 +994,18 @@ +@@ -970,6 +961,19 @@ big-endian; }; @@ -59,4 +59,5 @@ Signed-off-by: Biwen Li + big-endian; + }; }; - }; + + thermal-zones { diff --git a/target/linux/layerscape/patches-5.4/302-dts-0087-arm-dts-ls1021a-fix-that-FlexTimer-cannot-wakeup-sys.patch b/target/linux/layerscape/patches-5.4/302-dts-0087-arm-dts-ls1021a-fix-that-FlexTimer-cannot-wakeup-sys.patch index f677abad87..cebd74524b 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0087-arm-dts-ls1021a-fix-that-FlexTimer-cannot-wakeup-sys.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0087-arm-dts-ls1021a-fix-that-FlexTimer-cannot-wakeup-sys.patch @@ -14,7 +14,7 @@ Signed-off-by: Biwen Li --- a/arch/arm/boot/dts/ls1021a.dtsi +++ b/arch/arm/boot/dts/ls1021a.dtsi -@@ -998,6 +998,12 @@ +@@ -965,6 +965,12 @@ compatible = "fsl,ls1021a-rcpm", "fsl,qoriq-rcpm-2.1+"; reg = <0x0 0x1ee2140 0x0 0x8>; #fsl,rcpm-wakeup-cells = <2>; diff --git a/target/linux/layerscape/patches-5.4/302-dts-0098-LF-403-ARM64-dts-fsl-Add-clock-names-mclk0-for-SAI-n.patch b/target/linux/layerscape/patches-5.4/302-dts-0098-LF-403-ARM64-dts-fsl-Add-clock-names-mclk0-for-SAI-n.patch index a6611b0b12..2cb3cfd7d8 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0098-LF-403-ARM64-dts-fsl-Add-clock-names-mclk0-for-SAI-n.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0098-LF-403-ARM64-dts-fsl-Add-clock-names-mclk0-for-SAI-n.patch @@ -15,7 +15,7 @@ Signed-off-by: Alison Wang --- a/arch/arm/boot/dts/ls1021a.dtsi +++ b/arch/arm/boot/dts/ls1021a.dtsi -@@ -682,8 +682,9 @@ +@@ -649,8 +649,9 @@ reg = <0x0 0x2b50000 0x0 0x10000>; interrupts = ; clocks = <&clockgen 4 1>, <&clockgen 4 1>, @@ -27,7 +27,7 @@ Signed-off-by: Alison Wang dma-names = "tx", "rx"; dmas = <&edma0 1 47>, <&edma0 1 46>; -@@ -696,8 +697,9 @@ +@@ -663,8 +664,9 @@ reg = <0x0 0x2b60000 0x0 0x10000>; interrupts = ; clocks = <&clockgen 4 1>, <&clockgen 4 1>, -- cgit v1.2.3