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 <graysky@archlinux.us>
This commit is contained in:
committed by
Hauke Mehrtens
parent
f038a169a0
commit
28ef764026
@@ -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>;
|
||||
};
|
||||
|
||||
|
||||
@@ -146,7 +146,7 @@ Signed-off-by: Yuantian Tang <andy.tang@nxp.com>
|
||||
|
||||
timer: timer {
|
||||
compatible = "arm,armv8-timer";
|
||||
@@ -907,3 +872,36 @@
|
||||
@@ -906,3 +871,36 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -27,7 +27,7 @@ Signed-off-by: Florinel Iordache <florinel.iordache@nxp.com>
|
||||
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 {
|
||||
|
||||
@@ -98,7 +98,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
|
||||
|
||||
--- 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 <ran.wang_1@nxp.com>
|
||||
};
|
||||
|
||||
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>;
|
||||
|
||||
@@ -117,7 +117,7 @@ Signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com>
|
||||
*
|
||||
* Abhimanyu Saini <abhimanyu.saini@nxp.com>
|
||||
*
|
||||
@@ -525,7 +525,7 @@
|
||||
@@ -524,7 +524,7 @@
|
||||
};
|
||||
|
||||
/* TODO: WRIOP (CCSR?) */
|
||||
@@ -126,7 +126,7 @@ Signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com>
|
||||
* 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 <pankaj.bansal@nxp.com>
|
||||
* 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 <pankaj.bansal@nxp.com>
|
||||
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 <pankaj.bansal@nxp.com>
|
||||
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 <pankaj.bansal@nxp.com>
|
||||
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 <pankaj.bansal@nxp.com>
|
||||
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 <pankaj.bansal@nxp.com>
|
||||
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 <pankaj.bansal@nxp.com>
|
||||
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 <pankaj.bansal@nxp.com>
|
||||
status = "disabled";
|
||||
compatible = "fsl,fman-memac-mdio";
|
||||
reg = <0x0 0x8c1f000 0x0 0x1000>;
|
||||
@@ -623,7 +623,7 @@
|
||||
@@ -622,7 +622,7 @@
|
||||
#size-cells = <0>;
|
||||
};
|
||||
|
||||
|
||||
@@ -260,7 +260,7 @@ Signed-off-by: Florinel Iordache <florinel.iordache@nxp.com>
|
||||
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 <florinel.iordache@nxp.com>
|
||||
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;
|
||||
};
|
||||
|
||||
|
||||
@@ -276,7 +276,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
};
|
||||
|
||||
cpu: cpus {
|
||||
@@ -757,9 +758,16 @@
|
||||
@@ -756,9 +757,16 @@
|
||||
interrupts = <0 12 4>;
|
||||
};
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
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>;
|
||||
|
||||
@@ -110,7 +110,7 @@ Reviewed-by: Leo Li <leo.li@nxp.com>
|
||||
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 <leo.li@nxp.com>
|
||||
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";
|
||||
|
||||
@@ -122,7 +122,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
|
||||
|
||||
--- 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 <ran.wang_1@nxp.com>
|
||||
};
|
||||
|
||||
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;
|
||||
|
||||
@@ -42,7 +42,7 @@ Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
|
||||
};
|
||||
--- 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 {
|
||||
|
||||
@@ -18,7 +18,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
|
||||
|
||||
--- 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 <ran.wang_1@nxp.com>
|
||||
};
|
||||
|
||||
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;
|
||||
|
||||
@@ -658,7 +658,7 @@ Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
|
||||
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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user