kernel: bump 5.4 to 5.4.153

Removed upstreamed:
  backport-5.4/070-v5.5-MIPS-BPF-Restore-MIPS32-cBPF-JIT.patch

All other patches automatically rebased.

Signed-off-by: John Audia <graysky@archlinux.us>
This commit is contained in:
John Audia 2021-10-13 15:14:17 -04:00 committed by Hauke Mehrtens
parent be3e260f92
commit 9ad3ef27b9
26 changed files with 51 additions and 1701 deletions

View File

@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif
LINUX_VERSION-5.4 = .152
LINUX_VERSION-5.4 = .153
LINUX_VERSION-5.10 = .72
LINUX_KERNEL_HASH-5.4.152 = 8044c7134c5eed21af9662f1c5399a5d8781b5bc2d8979e9ad06b4435a0a5ed5
LINUX_KERNEL_HASH-5.4.153 = 6d9f07c9d611e5a7317eb6d5114880bad5c2dc1ac48d89f861b887d2f4295f49
LINUX_KERNEL_HASH-5.10.72 = b4d635afe7646ac6a6617c738e747ba0a6006675cd9735d18f672f8b1fba4c7c
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))

View File

@ -12,7 +12,7 @@ Signed-off-by: Xiaowei Bao <xiaowei.bao@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -631,6 +631,56 @@
@@ -649,6 +649,56 @@
};
};

View File

@ -85,10 +85,14 @@ Signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com>
*
* Harninder Rai <harninder.rai@nxp.com>
*
@@ -287,6 +287,26 @@
status = "disabled";
};
@@ -301,6 +301,26 @@
reg = <0x0 0x2190000 0x0 0x10000>;
interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&sysclk>, <&clockgen 4 1>;
+ clock-names = "ipg", "per";
+ status = "disabled";
+ };
+
+ can0: can@2180000 {
+ compatible = "fsl,ls1028ar1-flexcan",
+ "fsl,lx2160ar1-flexcan";
@ -105,10 +109,6 @@ Signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com>
+ reg = <0x0 0x2190000 0x0 0x10000>;
+ interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&sysclk>, <&clockgen 4 1>;
+ clock-names = "ipg", "per";
+ status = "disabled";
+ };
+
duart0: serial@21c0500 {
compatible = "fsl,ns16550", "ns16550a";
reg = <0x00 0x21c0500 0x0 0x100>;
clock-names = "ipg", "per";
status = "disabled";
};

View File

@ -12,8 +12,8 @@ Signed-off-by: Yuantian Tang <andy.tang@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -538,6 +538,16 @@
clock-names = "apb_pclk", "wdog_clk";
@@ -556,6 +556,16 @@
clock-names = "wdog_clk", "apb_pclk";
};
+ gpu@f0c0000 {

View File

@ -13,7 +13,7 @@ Signed-off-by: Sahil Malhotra <sahil.malhotra@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -771,6 +771,13 @@
@@ -789,6 +789,13 @@
};
};

View File

@ -24,7 +24,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
cpus {
#address-cells = <1>;
#size-cells = <0>;
@@ -769,6 +773,19 @@
@@ -787,6 +791,19 @@
little-endian;
};
};

View File

@ -22,7 +22,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -750,7 +750,9 @@
@@ -768,7 +768,9 @@
/* PF1: VF0-1 BAR0 - non-prefetchable memory */
0x82000000 0x0 0x00000000 0x1 0xf8210000 0x0 0x020000
/* PF1: VF0-1 BAR2 - prefetchable memory */
@ -33,7 +33,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
enetc_port0: ethernet@0,0 {
compatible = "fsl,enetc";
@@ -766,12 +768,66 @@
@@ -784,12 +786,66 @@
#address-cells = <1>;
#size-cells = <0>;
};

View File

@ -15,7 +15,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -732,7 +732,6 @@
@@ -750,7 +750,6 @@
reg = <0x01 0xf0000000 0x0 0x100000>;
#address-cells = <3>;
#size-cells = <2>;
@ -23,7 +23,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
msi-parent = <&its>;
device_type = "pci";
bus-range = <0x0 0x0>;
@@ -785,6 +784,8 @@
@@ -803,6 +802,8 @@
switch@0,5 {
compatible = "mscc,felix-switch";
reg = <0x000500 0 0 0 0>;

View File

@ -14,7 +14,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -814,6 +814,7 @@
@@ -832,6 +832,7 @@
};
port@5 {
reg = <5>;
@ -22,7 +22,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
fixed-link {
speed = <1000>;
full-duplex;
@@ -821,7 +822,7 @@
@@ -839,7 +840,7 @@
};
};
};

View File

@ -14,7 +14,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -836,6 +836,7 @@
@@ -854,6 +854,7 @@
compatible = "fsl,ls1028a-rcpm", "fsl,qoriq-rcpm-2.1+";
reg = <0x0 0x1e34040 0x0 0x1c>;
#fsl,rcpm-wakeup-cells = <7>;

View File

@ -13,7 +13,7 @@ Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -695,10 +695,10 @@
@@ -713,10 +713,10 @@
msi-parent = <&its>;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;
@ -28,7 +28,7 @@ Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
status = "disabled";
};
@@ -720,10 +720,10 @@
@@ -738,10 +738,10 @@
msi-parent = <&its>;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;

View File

@ -16,7 +16,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -689,6 +689,7 @@
@@ -707,6 +707,7 @@
#size-cells = <2>;
device_type = "pci";
dma-coherent;
@ -24,7 +24,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
bus-range = <0x0 0xff>;
ranges = <0x81000000 0x0 0x00000000 0x80 0x00010000 0x0 0x00010000 /* downstream I/O */
0x82000000 0x0 0x40000000 0x80 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
@@ -714,6 +715,7 @@
@@ -732,6 +733,7 @@
#size-cells = <2>;
device_type = "pci";
dma-coherent;

View File

@ -43,7 +43,7 @@ Signed-off-by: Shawn Guo <shawnguo@kernel.org>
reboot {
compatible ="syscon-reboot";
regmap = <&rst>;
@@ -862,7 +848,8 @@
@@ -880,7 +866,8 @@
interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>,
<0 223 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "DE", "SE";

View File

@ -24,7 +24,7 @@ Signed-off-by: Shawn Guo <shawnguo@kernel.org>
clocks = <&osc_27m>;
};
@@ -848,7 +848,7 @@
@@ -866,7 +866,7 @@
interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>,
<0 223 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "DE", "SE";

View File

@ -17,7 +17,7 @@ Signed-off-by: Wen He <wen.he_1@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -856,7 +856,23 @@
@@ -874,7 +874,23 @@
port {
dp0_out: endpoint {

View File

@ -15,7 +15,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -795,6 +795,8 @@
@@ -813,6 +813,8 @@
/* internal to-cpu ports */
port@4 {
reg = <4>;
@ -24,7 +24,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
fixed-link {
speed = <1000>;
full-duplex;
@@ -803,6 +805,8 @@
@@ -821,6 +823,8 @@
port@5 {
reg = <5>;
ethernet = <&enetc_port3>;

View File

@ -14,7 +14,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -770,7 +770,6 @@
@@ -788,7 +788,6 @@
little-endian;
};
switch@0,5 {

View File

@ -22,7 +22,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -797,7 +797,7 @@
@@ -815,7 +815,7 @@
phy-mode = "gmii";
fixed-link {

View File

@ -27,7 +27,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -755,7 +755,7 @@
@@ -773,7 +773,7 @@
#address-cells = <1>;
#size-cells = <0>;
};
@ -36,7 +36,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
compatible = "fsl,enetc";
reg = <0x000200 0 0 0 0>;
fixed-link {
@@ -794,6 +794,7 @@
@@ -812,6 +812,7 @@
/* internal to-cpu ports */
port@4 {
reg = <4>;
@ -44,7 +44,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
phy-mode = "gmii";
fixed-link {
@@ -803,7 +804,6 @@
@@ -821,7 +822,6 @@
};
port@5 {
reg = <5>;
@ -52,7 +52,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
phy-mode = "gmii";
fixed-link {
@@ -816,6 +816,8 @@
@@ -834,6 +834,8 @@
enetc_port3: ethernet@0,6 {
compatible = "fsl,enetc";
reg = <0x000600 0 0 0 0>;

View File

@ -67,7 +67,7 @@ Signed-off-by: Alison Wang <alison.wang@nxp.com>
<&edma0 1 44>;
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -544,8 +544,9 @@
@@ -562,8 +562,9 @@
reg = <0x0 0xf100000 0x0 0x10000>;
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 1>, <&clockgen 4 1>,
@ -79,7 +79,7 @@ Signed-off-by: Alison Wang <alison.wang@nxp.com>
dma-names = "tx", "rx";
dmas = <&edma0 1 4>,
<&edma0 1 3>;
@@ -558,8 +559,9 @@
@@ -576,8 +577,9 @@
reg = <0x0 0xf110000 0x0 0x10000>;
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 1>, <&clockgen 4 1>,
@ -91,7 +91,7 @@ Signed-off-by: Alison Wang <alison.wang@nxp.com>
dma-names = "tx", "rx";
dmas = <&edma0 1 6>,
<&edma0 1 5>;
@@ -572,8 +574,9 @@
@@ -590,8 +592,9 @@
reg = <0x0 0xf130000 0x0 0x10000>;
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 1>, <&clockgen 4 1>,

View File

@ -34,7 +34,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
sata: sata@3200000 {
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -381,6 +381,7 @@
@@ -399,6 +399,7 @@
snps,dis_rxdet_inp3_quirk;
snps,quirk-frame-length-adjustment = <0x20>;
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
@ -42,7 +42,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
};
usb1: usb@3110000 {
@@ -391,6 +392,7 @@
@@ -409,6 +410,7 @@
snps,dis_rxdet_inp3_quirk;
snps,quirk-frame-length-adjustment = <0x20>;
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;

View File

@ -14,7 +14,7 @@ Signed-off-by: Peng Ma <peng.ma@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -327,7 +327,7 @@
@@ -345,7 +345,7 @@
edma0: dma-controller@22c0000 {
#dma-cells = <2>;

View File

@ -12,7 +12,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -810,6 +810,7 @@
@@ -828,6 +828,7 @@
port@5 {
reg = <5>;
phy-mode = "gmii";

View File

@ -385,7 +385,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
&sai4 {
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -774,30 +774,39 @@
@@ -792,30 +792,39 @@
clocks = <&clockgen 2 3>;
little-endian;
};
@ -432,7 +432,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
reg = <4>;
ethernet = <&enetc_port2>;
phy-mode = "gmii";
@@ -807,7 +816,8 @@
@@ -825,7 +834,8 @@
full-duplex;
};
};
@ -442,7 +442,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
reg = <5>;
phy-mode = "gmii";
status = "disabled";
@@ -819,6 +829,7 @@
@@ -837,6 +847,7 @@
};
};
};

View File

@ -13,7 +13,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -788,21 +788,25 @@
@@ -806,21 +806,25 @@
mscc_felix_port0: port@0 {
reg = <0>;
status = "disabled";