aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-11-11 15:30:36 -0500
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-11-18 21:13:46 +0100
commit667f6c7f49c94213ca43a42ad5a9e23abfd81861 (patch)
treea16e6cc807cda32e1dfbaef1a0de486d5ba1166c /target/linux/mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch
parent79f3f1358bf993a5d7ae14eba9cea2686b40841d (diff)
downloadupstream-667f6c7f49c94213ca43a42ad5a9e23abfd81861.tar.gz
upstream-667f6c7f49c94213ca43a42ad5a9e23abfd81861.tar.bz2
upstream-667f6c7f49c94213ca43a42ad5a9e23abfd81861.zip
kernel: bump 5.4 to 5.4.77
Manually rebased patches: bcm27xx/patches-5.4/950-0135-spi-spi-bcm2835-Disable-forced-software-CS.patch generic-backport/744-v5.5-net-sfp-soft-status-and-control-support.patch layerscape/patches-5.4/819-uart-0005-tty-serial-fsl_lpuart-enable-dma-mode-for-imx8qxp.patch mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch Removed: layerscape/patches-5.4/819-uart-0012-tty-serial-lpuart-add-LS1028A-support.patch All modifications made by update_kernel.sh Build system: x86_64 Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711, lantiq/Easybox 904 xDSL, x86_64 Run-tested: ipq806x/R7800, lantiq/Easybox 904 xDSL, x86_64 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> Co-developed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch')
-rw-r--r--target/linux/mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/target/linux/mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch b/target/linux/mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch
index 61225387dd..927670d8b3 100644
--- a/target/linux/mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch
+++ b/target/linux/mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch
@@ -30,7 +30,6 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
---
.../dts/marvell/armada-3720-espressobin-v7-emmc.dts | 10 ++++++++--
.../boot/dts/marvell/armada-3720-espressobin-v7.dts | 10 ++++++++--
- .../boot/dts/marvell/armada-3720-espressobin.dtsi | 12 ++++++++----
3 files changed, 24 insertions(+), 8 deletions(-)
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
@@ -87,48 +86,3 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
reg = <3>;
label = "wan";
phy-handle = <&switch0phy2>;
---- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
-+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
-@@ -21,6 +21,10 @@
-
- aliases {
- ethernet0 = &eth0;
-+ /* for dsa slave device */
-+ ethernet1 = &switch0port1;
-+ ethernet2 = &switch0port2;
-+ ethernet3 = &switch0port3;
- serial0 = &uart0;
- serial1 = &uart1;
- };
-@@ -147,7 +151,7 @@
- #address-cells = <1>;
- #size-cells = <0>;
-
-- port@0 {
-+ switch0port0: port@0 {
- reg = <0>;
- label = "cpu";
- ethernet = <&eth0>;
-@@ -158,19 +162,19 @@
- };
- };
-
-- port@1 {
-+ switch0port1: port@1 {
- reg = <1>;
- label = "wan";
- phy-handle = <&switch0phy0>;
- };
-
-- port@2 {
-+ switch0port2: port@2 {
- reg = <2>;
- label = "lan0";
- phy-handle = <&switch0phy1>;
- };
-
-- port@3 {
-+ switch0port3: port@3 {
- reg = <3>;
- label = "lan1";
- phy-handle = <&switch0phy2>;