mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 08:21:14 +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>
133 lines
3.4 KiB
Diff
133 lines
3.4 KiB
Diff
From 4ed0fefb58b5788368fea2c69d646ee4f2e9e012 Mon Sep 17 00:00:00 2001
|
|
From: Calvin Johnson <calvin.johnson@nxp.com>
|
|
Date: Mon, 10 Dec 2018 10:03:51 +0530
|
|
Subject: [PATCH] arm64: dts: ls1012a: reorganize pfe_mac nodes
|
|
|
|
To keep platform specific properties in the platform dts files,
|
|
remove pfe_mac nodes from dtsi and define them in dts files.
|
|
|
|
Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
|
|
---
|
|
arch/arm64/boot/dts/freescale/fsl-ls1012a-2g5rdb.dts | 4 ++--
|
|
arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts | 4 ++--
|
|
arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts | 4 ++--
|
|
arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 4 ++--
|
|
arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 4 ++--
|
|
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 5 -----
|
|
6 files changed, 10 insertions(+), 15 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-2g5rdb.dts
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-2g5rdb.dts
|
|
@@ -52,7 +52,7 @@
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
- ethernet@0 {
|
|
+ pfe_mac0: ethernet@0 {
|
|
compatible = "fsl,pfe-gemac-port";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
@@ -62,7 +62,7 @@
|
|
phy-handle = <&sgmii_phy1>;
|
|
};
|
|
|
|
- ethernet@1 {
|
|
+ pfe_mac1: ethernet@1 {
|
|
compatible = "fsl,pfe-gemac-port";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts
|
|
@@ -84,7 +84,7 @@
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
- ethernet@0 {
|
|
+ pfe_mac0: ethernet@0 {
|
|
compatible = "fsl,pfe-gemac-port";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
@@ -94,7 +94,7 @@
|
|
phy-handle = <&sgmii_phy1>;
|
|
};
|
|
|
|
- ethernet@1 {
|
|
+ pfe_mac1: ethernet@1 {
|
|
compatible = "fsl,pfe-gemac-port";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts
|
|
@@ -105,7 +105,7 @@
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
- ethernet@0 {
|
|
+ pfe_mac0: ethernet@0 {
|
|
compatible = "fsl,pfe-gemac-port";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
@@ -116,7 +116,7 @@
|
|
phy-handle = <&sgmii_phy1>;
|
|
};
|
|
|
|
- ethernet@1 {
|
|
+ pfe_mac1: ethernet@1 {
|
|
compatible = "fsl,pfe-gemac-port";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
|
|
@@ -142,7 +142,7 @@
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
- ethernet@0 {
|
|
+ pfe_mac0: ethernet@0 {
|
|
compatible = "fsl,pfe-gemac-port";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
@@ -152,7 +152,7 @@
|
|
phy-handle = <&sgmii_phy1>;
|
|
};
|
|
|
|
- ethernet@1 {
|
|
+ pfe_mac1: ethernet@1 {
|
|
compatible = "fsl,pfe-gemac-port";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
|
|
@@ -53,7 +53,7 @@
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
- ethernet@0 {
|
|
+ pfe_mac0: ethernet@0 {
|
|
compatible = "fsl,pfe-gemac-port";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
@@ -63,7 +63,7 @@
|
|
phy-handle = <&sgmii_phy>;
|
|
};
|
|
|
|
- ethernet@1 {
|
|
+ pfe_mac1: ethernet@1 {
|
|
compatible = "fsl,pfe-gemac-port";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
|
|
@@ -530,11 +530,6 @@
|
|
clock-names = "pfe";
|
|
|
|
status = "okay";
|
|
- pfe_mac0: ethernet@0 {
|
|
- };
|
|
-
|
|
- pfe_mac1: ethernet@1 {
|
|
- };
|
|
};
|
|
|
|
firmware {
|