mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 09:39:00 +00:00
ec6293febc
Ran update_kernel.sh in a fresh clone without any existing toolchains.
Manually rebased:
pending-5.4/611-netfilter_match_bypass_default_table.patch
The upstream change affecting this patch is the revert of an earlier
kernel commit. Therefore, we just revert our corresponding changes
in [1].
Build system: x86_64
Build-tested: ipq806x/R7800
[1] 9b1b89229f ("kernel: bump 5.4 to 5.4.86")
Signed-off-by: John Audia <graysky@archlinux.us>
[adjust manually rebased patch, add explanation]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
151 lines
4.6 KiB
Diff
151 lines
4.6 KiB
Diff
From 4cb6a451112308b2679c567ac680bc74ab93a92a Mon Sep 17 00:00:00 2001
|
|
From: Ran Wang <ran.wang_1@nxp.com>
|
|
Date: Fri, 22 Nov 2019 14:18:49 +0800
|
|
Subject: [PATCH] LF-387-5 arm64: dts: layerscape: add chip-specific compatible
|
|
string to usb nodes
|
|
|
|
To allow USB dwc3 driver to conduct some chip-scpeific configuring.
|
|
Cover all arm64 based Layerscape SoCs.
|
|
|
|
Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
|
|
Reviewed-by: Jun Li <jun.li@nxp.com>
|
|
Reviewed-by: Leo Li <leo.li@nxp.com>
|
|
---
|
|
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 2 +-
|
|
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 6 +++---
|
|
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 6 +++---
|
|
arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 4 ++--
|
|
arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 4 ++--
|
|
arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 4 ++--
|
|
6 files changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
|
|
@@ -444,7 +444,7 @@
|
|
};
|
|
|
|
usb0: usb3@2f00000 {
|
|
- compatible = "snps,dwc3";
|
|
+ compatible = "fsl,ls1012a-dwc3", "snps,dwc3";
|
|
reg = <0x0 0x2f00000 0x0 0x10000>;
|
|
interrupts = <0 60 0x4>;
|
|
dr_mode = "host";
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
|
|
@@ -695,7 +695,7 @@
|
|
dma-ranges = <0x0 0x0 0x0 0x0 0x100 0x00000000>;
|
|
|
|
usb0: usb3@2f00000 {
|
|
- compatible = "snps,dwc3";
|
|
+ compatible = "fsl,ls1043a-dwc3", "snps,dwc3";
|
|
reg = <0x0 0x2f00000 0x0 0x10000>;
|
|
interrupts = <0 60 0x4>;
|
|
dr_mode = "host";
|
|
@@ -709,7 +709,7 @@
|
|
};
|
|
|
|
usb1: usb3@3000000 {
|
|
- compatible = "snps,dwc3";
|
|
+ compatible = "fsl,ls1043a-dwc3", "snps,dwc3";
|
|
reg = <0x0 0x3000000 0x0 0x10000>;
|
|
interrupts = <0 61 0x4>;
|
|
dr_mode = "host";
|
|
@@ -723,7 +723,7 @@
|
|
};
|
|
|
|
usb2: usb3@3100000 {
|
|
- compatible = "snps,dwc3";
|
|
+ compatible = "fsl,ls1043a-dwc3", "snps,dwc3";
|
|
reg = <0x0 0x3100000 0x0 0x10000>;
|
|
interrupts = <0 63 0x4>;
|
|
dr_mode = "host";
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
|
|
@@ -594,7 +594,7 @@
|
|
dma-ranges = <0x0 0x0 0x0 0x0 0x100 0x00000000>;
|
|
|
|
usb0: usb@2f00000 {
|
|
- compatible = "snps,dwc3";
|
|
+ compatible = "fsl,ls1046a-dwc3", "snps,dwc3";
|
|
reg = <0x0 0x2f00000 0x0 0x10000>;
|
|
interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
|
|
dr_mode = "host";
|
|
@@ -607,7 +607,7 @@
|
|
};
|
|
|
|
usb1: usb@3000000 {
|
|
- compatible = "snps,dwc3";
|
|
+ compatible = "fsl,ls1046a-dwc3", "snps,dwc3";
|
|
reg = <0x0 0x3000000 0x0 0x10000>;
|
|
interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
|
|
dr_mode = "host";
|
|
@@ -620,7 +620,7 @@
|
|
};
|
|
|
|
usb2: usb@3100000 {
|
|
- compatible = "snps,dwc3";
|
|
+ compatible = "fsl,ls1046a-dwc3", "snps,dwc3";
|
|
reg = <0x0 0x3100000 0x0 0x10000>;
|
|
interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
|
|
dr_mode = "host";
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
|
|
@@ -394,7 +394,7 @@
|
|
};
|
|
|
|
usb0: usb3@3100000 {
|
|
- compatible = "snps,dwc3";
|
|
+ compatible = "fsl,ls1088a-dwc3", "snps,dwc3";
|
|
reg = <0x0 0x3100000 0x0 0x10000>;
|
|
interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;
|
|
dr_mode = "host";
|
|
@@ -406,7 +406,7 @@
|
|
};
|
|
|
|
usb1: usb3@3110000 {
|
|
- compatible = "snps,dwc3";
|
|
+ compatible = "fsl,ls1088a-dwc3", "snps,dwc3";
|
|
reg = <0x0 0x3110000 0x0 0x10000>;
|
|
interrupts = <0 81 IRQ_TYPE_LEVEL_HIGH>;
|
|
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 @@
|
|
|
|
usb0: usb3@3100000 {
|
|
status = "disabled";
|
|
- compatible = "snps,dwc3";
|
|
+ compatible = "fsl,ls2088a-dwc3", "snps,dwc3";
|
|
reg = <0x0 0x3100000 0x0 0x10000>;
|
|
interrupts = <0 80 0x4>; /* Level high type */
|
|
dr_mode = "host";
|
|
@@ -742,7 +742,7 @@
|
|
|
|
usb1: usb3@3110000 {
|
|
status = "disabled";
|
|
- compatible = "snps,dwc3";
|
|
+ compatible = "fsl,ls2088a-dwc3", "snps,dwc3";
|
|
reg = <0x0 0x3110000 0x0 0x10000>;
|
|
interrupts = <0 81 0x4>; /* Level high type */
|
|
dr_mode = "host";
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
|
|
@@ -864,7 +864,7 @@
|
|
};
|
|
|
|
usb0: usb@3100000 {
|
|
- compatible = "snps,dwc3";
|
|
+ compatible = "fsl,lx2160a-dwc3", "snps,dwc3";
|
|
reg = <0x0 0x3100000 0x0 0x10000>;
|
|
interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
|
|
dr_mode = "host";
|
|
@@ -878,7 +878,7 @@
|
|
};
|
|
|
|
usb1: usb@3110000 {
|
|
- compatible = "snps,dwc3";
|
|
+ compatible = "fsl,lx2160a-dwc3", "snps,dwc3";
|
|
reg = <0x0 0x3110000 0x0 0x10000>;
|
|
interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
|
|
dr_mode = "host";
|