mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 5.4 to 5.4.155 (#8102)
* 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> * kernel: bump 5.4 to 5.4.154 All patches automatically rebased. Signed-off-by: John Audia <graysky@archlinux.us> * kernel: bump 5.4 to 5.4.155 All patches automatically rebased. Signed-off-by: John Audia <graysky@archlinux.us> Co-authored-by: John Audia <graysky@archlinux.us>
This commit is contained in:
parent
13384d4c51
commit
69753f8625
@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL
|
||||
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
|
||||
endif
|
||||
|
||||
LINUX_VERSION-5.4 = .152
|
||||
LINUX_VERSION-5.4 = .155
|
||||
LINUX_VERSION-5.10 = .75
|
||||
|
||||
LINUX_KERNEL_HASH-5.4.152 = 8044c7134c5eed21af9662f1c5399a5d8781b5bc2d8979e9ad06b4435a0a5ed5
|
||||
LINUX_KERNEL_HASH-5.4.155 = cc0c0f902748d251cb22d0e69e3b8d260c447eb0072ef853da15da6cce775038
|
||||
LINUX_KERNEL_HASH-5.10.75 = 0a2b2f5fefb90773190aaef4726ac363e03992aedc424b0a57eca092d084304b
|
||||
|
||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||
|
@ -48,7 +48,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
||||
|
||||
#include "xhci.h"
|
||||
#include "xhci-trace.h"
|
||||
@@ -64,6 +66,44 @@
|
||||
@@ -65,6 +67,44 @@
|
||||
#define PCI_DEVICE_ID_ASMEDIA_2142_XHCI 0x2142
|
||||
#define PCI_DEVICE_ID_ASMEDIA_3242_XHCI 0x3242
|
||||
|
||||
@ -93,7 +93,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
||||
static const char hcd_name[] = "xhci_hcd";
|
||||
|
||||
static struct hc_driver __read_mostly xhci_pci_hc_driver;
|
||||
@@ -309,6 +349,873 @@ static void xhci_pme_acpi_rtd3_enable(st
|
||||
@@ -311,6 +351,873 @@ static void xhci_pme_acpi_rtd3_enable(st
|
||||
static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
|
||||
#endif /* CONFIG_ACPI */
|
||||
|
||||
@ -967,7 +967,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
||||
/* called during probe() after chip reset completes */
|
||||
static int xhci_pci_setup(struct usb_hcd *hcd)
|
||||
{
|
||||
@@ -350,6 +1257,27 @@ static int xhci_pci_probe(struct pci_dev
|
||||
@@ -352,6 +1259,27 @@ static int xhci_pci_probe(struct pci_dev
|
||||
struct hc_driver *driver;
|
||||
struct usb_hcd *hcd;
|
||||
|
||||
@ -995,7 +995,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
||||
driver = (struct hc_driver *)id->driver_data;
|
||||
|
||||
/* Prevent runtime suspending between USB-2 and USB-3 initialization */
|
||||
@@ -411,6 +1339,16 @@ static void xhci_pci_remove(struct pci_d
|
||||
@@ -413,6 +1341,16 @@ static void xhci_pci_remove(struct pci_d
|
||||
{
|
||||
struct xhci_hcd *xhci;
|
||||
|
||||
@ -1012,7 +1012,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
||||
xhci = hcd_to_xhci(pci_get_drvdata(dev));
|
||||
xhci->xhc_state |= XHCI_STATE_REMOVING;
|
||||
|
||||
@@ -550,6 +1488,11 @@ static int xhci_pci_resume(struct usb_hc
|
||||
@@ -552,6 +1490,11 @@ static int xhci_pci_resume(struct usb_hc
|
||||
if (pdev->vendor == PCI_VENDOR_ID_INTEL)
|
||||
usb_enable_intel_xhci_ports(pdev);
|
||||
|
||||
|
@ -13,7 +13,7 @@ produce a noisy warning.
|
||||
|
||||
--- a/drivers/usb/host/xhci-pci.c
|
||||
+++ b/drivers/usb/host/xhci-pci.c
|
||||
@@ -288,6 +288,7 @@ static void xhci_pci_quirks(struct devic
|
||||
@@ -290,6 +290,7 @@ static void xhci_pci_quirks(struct devic
|
||||
pdev->device == 0x0015) {
|
||||
xhci->quirks |= XHCI_RESET_ON_RESUME;
|
||||
xhci->quirks |= XHCI_ZERO_64B_REGS;
|
||||
|
@ -202,7 +202,7 @@
|
||||
+subsys_initcall(ar5312_gpio_init);
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -190,6 +190,7 @@ config ATH25
|
||||
@@ -192,6 +192,7 @@ config ATH25
|
||||
select CEVT_R4K
|
||||
select CSRC_R4K
|
||||
select DMA_NONCOHERENT
|
||||
|
@ -15,7 +15,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
|
||||
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -218,6 +218,8 @@ config ATH79
|
||||
@@ -220,6 +220,8 @@ config ATH79
|
||||
select SYS_SUPPORTS_BIG_ENDIAN
|
||||
select SYS_SUPPORTS_MIPS16
|
||||
select SYS_SUPPORTS_ZBOOT_UART_PROM
|
||||
|
@ -24,7 +24,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -3207,6 +3207,15 @@ F: Documentation/devicetree/bindings/mip
|
||||
@@ -3208,6 +3208,15 @@ F: Documentation/devicetree/bindings/mip
|
||||
F: arch/mips/bcm47xx/*
|
||||
F: arch/mips/include/asm/mach-bcm47xx/*
|
||||
|
||||
|
@ -117,7 +117,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
+ };
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -3212,7 +3212,7 @@ M: Rafał Miłecki <rafal@milecki.pl>
|
||||
@@ -3213,7 +3213,7 @@ M: Rafał Miłecki <rafal@milecki.pl>
|
||||
M: bcm-kernel-feedback-list@broadcom.com
|
||||
L: netdev@vger.kernel.org
|
||||
S: Maintained
|
||||
|
@ -24,7 +24,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -3213,7 +3213,7 @@ M: bcm-kernel-feedback-list@broadcom.com
|
||||
@@ -3214,7 +3214,7 @@ M: bcm-kernel-feedback-list@broadcom.com
|
||||
L: netdev@vger.kernel.org
|
||||
S: Maintained
|
||||
F: Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
|
||||
|
@ -24,7 +24,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -3414,6 +3414,16 @@ L: linux-mips@vger.kernel.org
|
||||
@@ -3415,6 +3415,16 @@ L: linux-mips@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/firmware/broadcom/*
|
||||
|
||||
|
@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -292,6 +292,9 @@ config BCM63XX
|
||||
@@ -294,6 +294,9 @@ config BCM63XX
|
||||
select SYNC_R4K
|
||||
select DMA_NONCOHERENT
|
||||
select IRQ_MIPS_CPU
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
device, it has to decide which ones to send first, which ones to
|
||||
--- a/net/sched/sch_api.c
|
||||
+++ b/net/sched/sch_api.c
|
||||
@@ -2272,7 +2272,7 @@ static int __init pktsched_init(void)
|
||||
@@ -2278,7 +2278,7 @@ static int __init pktsched_init(void)
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -2379,6 +2379,12 @@ config MIPS_VPE_LOADER
|
||||
@@ -2381,6 +2381,12 @@ config MIPS_VPE_LOADER
|
||||
Includes a loader for loading an elf relocatable object
|
||||
onto another VPE and running it.
|
||||
|
||||
|
@ -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 @@
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -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";
|
||||
};
|
||||
|
@ -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 {
|
||||
|
@ -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 @@
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -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;
|
||||
};
|
||||
};
|
||||
|
@ -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>;
|
||||
};
|
||||
|
@ -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>;
|
||||
|
@ -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 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -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>;
|
||||
|
@ -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>;
|
||||
|
@ -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;
|
||||
|
@ -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";
|
||||
|
@ -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";
|
||||
|
@ -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 {
|
||||
|
@ -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>;
|
||||
|
@ -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 {
|
||||
|
@ -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 {
|
||||
|
@ -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>;
|
||||
|
@ -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>,
|
||||
|
@ -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>;
|
||||
|
@ -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>;
|
||||
|
@ -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";
|
||||
|
@ -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 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -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";
|
||||
|
@ -16,7 +16,7 @@ Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -13437,6 +13437,8 @@ S: Maintained
|
||||
@@ -13438,6 +13438,8 @@ S: Maintained
|
||||
F: drivers/bus/fsl-mc/
|
||||
F: Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
|
||||
F: Documentation/networking/device_drivers/freescale/dpaa2/overview.rst
|
||||
|
@ -31,7 +31,7 @@ Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
|
||||
+Users: Userspace drivers and management tools
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -13439,6 +13439,7 @@ F: Documentation/devicetree/bindings/mis
|
||||
@@ -13440,6 +13440,7 @@ F: Documentation/devicetree/bindings/mis
|
||||
F: Documentation/networking/device_drivers/freescale/dpaa2/overview.rst
|
||||
F: Documentation/networking/dpaa2/overview.rst
|
||||
F: include/uapi/linux/fsl_mc.h
|
||||
|
@ -24,7 +24,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -10825,6 +10825,7 @@ M: Microchip Linux Driver Support <UNGLi
|
||||
@@ -10826,6 +10826,7 @@ M: Microchip Linux Driver Support <UNGLi
|
||||
L: netdev@vger.kernel.org
|
||||
S: Supported
|
||||
F: drivers/net/ethernet/mscc/
|
||||
|
@ -39,7 +39,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -17355,6 +17355,13 @@ S: Maintained
|
||||
@@ -17356,6 +17356,13 @@ S: Maintained
|
||||
F: drivers/input/serio/userio.c
|
||||
F: include/uapi/linux/userio.h
|
||||
|
||||
|
@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -17360,6 +17360,7 @@ M: Vladimir Oltean <vladimir.oltean@nxp.
|
||||
@@ -17361,6 +17361,7 @@ M: Vladimir Oltean <vladimir.oltean@nxp.
|
||||
M: Claudiu Manoil <claudiu.manoil@nxp.com>
|
||||
L: netdev@vger.kernel.org
|
||||
S: Maintained
|
||||
|
@ -15,7 +15,7 @@ Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -6575,6 +6575,14 @@ F: drivers/ptp/ptp_qoriq_debugfs.c
|
||||
@@ -6576,6 +6576,14 @@ F: drivers/ptp/ptp_qoriq_debugfs.c
|
||||
F: include/linux/fsl/ptp_qoriq.h
|
||||
F: Documentation/devicetree/bindings/ptp/ptp-qoriq.txt
|
||||
|
||||
|
@ -21,7 +21,7 @@ From http://git.kiszka.org/?p=linux.git;a=shortlog;h=refs/heads/queues/jailhouse
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -8773,6 +8773,7 @@ L: jailhouse-dev@googlegroups.com
|
||||
@@ -8774,6 +8774,7 @@ L: jailhouse-dev@googlegroups.com
|
||||
S: Maintained
|
||||
F: arch/x86/kernel/jailhouse.c
|
||||
F: arch/x86/include/asm/jailhouse_para.h
|
||||
|
@ -100,7 +100,7 @@ Reviewed-by: Sahil Malhotra <sahil.malhotra@nxp.com>
|
||||
+ $ keyctl load secure kmk-master "load 'cat secure_key.blob'" @u
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -9074,6 +9074,17 @@ F: include/keys/trusted-type.h
|
||||
@@ -9075,6 +9075,17 @@ F: include/keys/trusted-type.h
|
||||
F: security/keys/trusted.c
|
||||
F: include/keys/trusted.h
|
||||
|
||||
|
@ -23,7 +23,7 @@ Reviewed-by: Sahil Malhotra <sahil.malhotra@nxp.com>
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -9084,6 +9084,7 @@ F: include/keys/secure-type.h
|
||||
@@ -9085,6 +9085,7 @@ F: include/keys/secure-type.h
|
||||
F: security/keys/secure_key.c
|
||||
F: security/keys/securekey_desc.c
|
||||
F: security/keys/securekey_desc.h
|
||||
|
@ -34,7 +34,7 @@ Reviewed-by: Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -12503,7 +12503,7 @@ M: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
|
||||
@@ -12504,7 +12504,7 @@ M: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
|
||||
L: linux-pci@vger.kernel.org
|
||||
S: Supported
|
||||
F: Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
|
||||
|
@ -20,7 +20,7 @@ Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -12500,6 +12500,7 @@ F: drivers/ntb/hw/mscc/
|
||||
@@ -12501,6 +12501,7 @@ F: drivers/ntb/hw/mscc/
|
||||
PCI DRIVER FOR MOBIVEIL PCIE IP
|
||||
M: Karthikeyan Mitran <m.karthikeyan@mobiveil.co.in>
|
||||
M: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
|
||||
|
@ -12,7 +12,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -6597,6 +6597,12 @@ F: drivers/soc/fsl/qe/
|
||||
@@ -6598,6 +6598,12 @@ F: drivers/soc/fsl/qe/
|
||||
F: include/soc/fsl/*qe*.h
|
||||
F: include/soc/fsl/*ucc*.h
|
||||
|
||||
|
@ -42,7 +42,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
|
||||
retval = xhci_enter_test_mode(xhci, test_mode, wIndex,
|
||||
--- a/drivers/usb/host/xhci-ring.c
|
||||
+++ b/drivers/usb/host/xhci-ring.c
|
||||
@@ -3624,6 +3624,129 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *
|
||||
@@ -3630,6 +3630,129 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -174,7 +174,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
|
||||
* bursts that are required to move all packets in this TD. Only SuperSpeed
|
||||
--- a/drivers/usb/host/xhci.c
|
||||
+++ b/drivers/usb/host/xhci.c
|
||||
@@ -5385,6 +5385,7 @@ static const struct hc_driver xhci_hc_dr
|
||||
@@ -5390,6 +5390,7 @@ static const struct hc_driver xhci_hc_dr
|
||||
.disable_usb3_lpm_timeout = xhci_disable_usb3_lpm_timeout,
|
||||
.find_raw_port_number = xhci_find_raw_port_number,
|
||||
.clear_tt_buffer_complete = xhci_clear_tt_buffer_complete,
|
||||
|
@ -22,7 +22,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
|
||||
|
||||
--- a/drivers/usb/host/xhci-ring.c
|
||||
+++ b/drivers/usb/host/xhci-ring.c
|
||||
@@ -2091,12 +2091,9 @@ static int process_ctrl_td(struct xhci_h
|
||||
@@ -2097,12 +2097,9 @@ static int process_ctrl_td(struct xhci_h
|
||||
|
||||
switch (trb_comp_code) {
|
||||
case COMP_SUCCESS:
|
||||
|
@ -24,7 +24,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
|
||||
|
||||
--- a/drivers/usb/host/xhci.c
|
||||
+++ b/drivers/usb/host/xhci.c
|
||||
@@ -5406,6 +5406,8 @@ void xhci_init_driver(struct hc_driver *
|
||||
@@ -5411,6 +5411,8 @@ void xhci_init_driver(struct hc_driver *
|
||||
drv->check_bandwidth = over->check_bandwidth;
|
||||
if (over->reset_bandwidth)
|
||||
drv->reset_bandwidth = over->reset_bandwidth;
|
||||
|
@ -11,7 +11,7 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
|
||||
|
||||
--- a/drivers/gpio/gpio-pca953x.c
|
||||
+++ b/drivers/gpio/gpio-pca953x.c
|
||||
@@ -879,10 +879,12 @@ static int pca953x_irq_setup(struct pca9
|
||||
@@ -881,10 +881,12 @@ static int pca953x_irq_setup(struct pca9
|
||||
for (i = 0; i < NBANK(chip); i++)
|
||||
chip->irq_stat[i] &= reg_direction[i];
|
||||
mutex_init(&chip->irq_lock);
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/ethernet/Kconfig
|
||||
+++ b/drivers/net/ethernet/Kconfig
|
||||
@@ -159,6 +159,7 @@ source "drivers/net/ethernet/pasemi/Kcon
|
||||
@@ -160,6 +160,7 @@ source "drivers/net/ethernet/pasemi/Kcon
|
||||
source "drivers/net/ethernet/pensando/Kconfig"
|
||||
source "drivers/net/ethernet/qlogic/Kconfig"
|
||||
source "drivers/net/ethernet/qualcomm/Kconfig"
|
||||
|
@ -10,7 +10,7 @@
|
||||
platforms += sgi-ip27
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -631,6 +631,26 @@ config RALINK
|
||||
@@ -633,6 +633,26 @@ config RALINK
|
||||
select ARCH_HAS_RESET_CONTROLLER
|
||||
select RESET_CONTROLLER
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/ethernet/Kconfig
|
||||
+++ b/drivers/net/ethernet/Kconfig
|
||||
@@ -163,6 +163,13 @@ source "drivers/net/ethernet/rdc/Kconfig
|
||||
@@ -164,6 +164,13 @@ source "drivers/net/ethernet/rdc/Kconfig
|
||||
source "drivers/net/ethernet/realtek/Kconfig"
|
||||
source "drivers/net/ethernet/renesas/Kconfig"
|
||||
source "drivers/net/ethernet/rocker/Kconfig"
|
||||
|
Loading…
Reference in New Issue
Block a user