From: Pawel Dembicki Date: Thu, 14 Mar 2024 13:37:55 +0000 (+0100) Subject: kirkwood: refresh 6.6 patches X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fstintel.git;a=commitdiff_plain;h=70dd237ebd814b31e8a9a0e92c2a23733b65bf1e kirkwood: refresh 6.6 patches Removed upstream merged: 002-6.2-ARM-dts-kirkwood-Add-Zyxel-NSA310S-board.patch 003-6.5-ARM-dts-kirkwood-Add-Endian-4i-Edge-200-board.patch 004-6.4-ARM-dts-kirkwood-Add-missing-phy-mode-and-fixed-link.patch 005-6.7-net-dsa-mv88e6xxx-fix-marvell-6350-switch-probing.patch Manually refreshed: 100-ib62x0.patch 101-iconnect.patch 102-dockstar.patch 103-iomega-ix2-200.patch 105-linksys-viper-dts.patch 106-goflexnet.patch 107-01-zyxel-nsa3x0-common-nand-partitions.patch 107-03-nsa325.patch 109-pogoplug_v4.patch 110-pogo_e02.patch 111-l-50.patch 112-sheevaplug.patch 113-readynas_duo_v2.patch 114-ctera-c-200-v1.patch 115-nsa310s.patch 116-4i-edge-200.patch 117-netgear_stora.patch 203-blackarmor-nas220.patch Signed-off-by: Pawel Dembicki --- diff --git a/target/linux/kirkwood/patches-6.6/002-6.2-ARM-dts-kirkwood-Add-Zyxel-NSA310S-board.patch b/target/linux/kirkwood/patches-6.6/002-6.2-ARM-dts-kirkwood-Add-Zyxel-NSA310S-board.patch deleted file mode 100644 index 09e71813cd..0000000000 --- a/target/linux/kirkwood/patches-6.6/002-6.2-ARM-dts-kirkwood-Add-Zyxel-NSA310S-board.patch +++ /dev/null @@ -1,301 +0,0 @@ -From e977a103840c57d72b52cbc8c17f87f86ef9aa8d Mon Sep 17 00:00:00 2001 -From: Pawel Dembicki -Date: Sat, 29 Oct 2022 22:57:38 +0200 -Subject: [PATCH] ARM: dts: kirkwood: Add Zyxel NSA310S board - -Zyxel NSA310S is a NAS based on Marvell kirkwood SoC. - -Specification: - - Processor Marvell 88F6702 1 GHz - - 256MB RAM - - 128MB NAND - - 1x GBE LAN port (PHY: Marvell 88E1318) - - 2x USB 2.0 - - 1x SATA - - 3x button - - 7x leds - - serial on J1 connector (115200 8N1) (GND-NOPIN-RX-TX-VCC) - -Tested-by: Tony Dinh -Signed-off-by: Pawel Dembicki -Acked-by: Adam Baker -Reviewed-by: Andrew Lunn -Signed-off-by: Gregory CLEMENT ---- - arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/kirkwood-nsa310s.dts | 259 +++++++++++++++++++++++++ - 2 files changed, 260 insertions(+) - create mode 100644 arch/arm/boot/dts/kirkwood-nsa310s.dts - ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -356,6 +356,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ - kirkwood-ns2mini.dtb \ - kirkwood-nsa310.dtb \ - kirkwood-nsa310a.dtb \ -+ kirkwood-nsa310s.dtb \ - kirkwood-nsa320.dtb \ - kirkwood-nsa325.dtb \ - kirkwood-openblocks_a6.dtb \ ---- /dev/null -+++ b/arch/arm/boot/dts/kirkwood-nsa310s.dts -@@ -0,0 +1,259 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * ZyXEL NSA310S Board Description -+ * Copyright 2020-2022 Pawel Dembicki -+ * Copyright (c) 2015-2021, Tony Dinh -+ * Copyright (c) 2014, Adam Baker -+ * Based upon the board setup file created by Peter Schildmann -+ */ -+/dts-v1/; -+ -+#include "kirkwood.dtsi" -+#include "kirkwood-6281.dtsi" -+#include -+ -+/ { -+ model = "ZyXEL NSA310S"; -+ compatible = "zyxel,nsa310s", "marvell,kirkwood-88f6702", "marvell,kirkwood"; -+ -+ memory { -+ device_type = "memory"; -+ reg = <0x00000000 0x10000000>; -+ }; -+ -+ chosen { -+ bootargs = "console=ttyS0,115200n8 earlyprintk"; -+ stdout-path = &uart0; -+ }; -+ -+ gpio_poweroff { -+ compatible = "gpio-poweroff"; -+ pinctrl-0 = <&pmx_pwr_off>; -+ pinctrl-names = "default"; -+ gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ keys { -+ compatible = "gpio-keys"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ pinctrl-0 = <&pmx_buttons>; -+ pinctrl-names = "default"; -+ -+ power { -+ label = "Power Button"; -+ linux,code = ; -+ gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ copy { -+ label = "Copy Button"; -+ linux,code = ; -+ gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; -+ }; -+ -+ reset { -+ label = "Reset Button"; -+ linux,code = ; -+ gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ pinctrl-0 = <&pmx_leds>; -+ pinctrl-names = "default"; -+ -+ led-1 { -+ function = LED_FUNCTION_DISK_ERR; -+ color = ; -+ gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ led-2 { -+ function = LED_FUNCTION_USB; -+ color = ; -+ gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "usb-host"; -+ }; -+ -+ led-3 { -+ function = LED_FUNCTION_DISK; -+ color = ; -+ gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "ata1"; -+ }; -+ -+ led-4 { -+ function = LED_FUNCTION_INDICATOR; -+ color = ; -+ gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ led-5 { -+ function = LED_FUNCTION_INDICATOR; -+ color = ; -+ gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ led-6 { -+ function = LED_FUNCTION_STATUS; -+ color = ; -+ gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "default-on"; -+ }; -+ -+ led-7 { -+ function = LED_FUNCTION_STATUS; -+ color = ; -+ gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; -+ }; -+ }; -+ -+ usb0_power: regulator@1 { -+ compatible = "regulator-fixed"; -+ regulator-name = "USB Power"; -+ -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ regulator-always-on; -+ regulator-boot-on; -+ gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ sata1_power: regulator@2 { -+ compatible = "regulator-fixed"; -+ regulator-name = "SATA1 Power"; -+ -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ regulator-always-on; -+ regulator-boot-on; -+ gpio = <&gpio1 1 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ thermal-zones { -+ disk-thermal { -+ polling-delay = <20000>; -+ polling-delay-passive = <2000>; -+ -+ thermal-sensors = <&hdd_temp>; -+ -+ trips { -+ disk_alert: disk-alert { -+ temperature = <40000>; -+ hysteresis = <5000>; -+ type = "active"; -+ }; -+ disk_crit: disk-crit { -+ temperature = <60000>; -+ hysteresis = <2000>; -+ type = "critical"; -+ }; -+ }; -+ }; -+ }; -+}; -+ -+ -+ð0 { -+ status = "okay"; -+ -+ ethernet0-port@0 { -+ phy-handle = <ðphy0>; -+ }; -+}; -+ -+&i2c0 { -+ status = "okay"; -+ -+ rtc@68 { -+ compatible = "htk,ht1382"; -+ reg = <0x68>; -+ }; -+}; -+ -+&mdio { -+ status = "okay"; -+ -+ ethphy0: ethernet-phy@1 { -+ reg = <1>; -+ phy-mode = "rgmii-id"; -+ marvell,reg-init = <0x1 0x16 0x0 0x3>, -+ <0x1 0x10 0x0 0x1017>, -+ <0x1 0x11 0x0 0x4408>, -+ <0x1 0x16 0x0 0x0>; -+ }; -+}; -+ -+&nand { -+ status = "okay"; -+ chip-delay = <35>; -+ -+ partition@0 { -+ label = "uboot"; -+ reg = <0x0000000 0x00c0000>; -+ read-only; -+ }; -+ partition@c0000 { -+ label = "uboot_env"; -+ reg = <0x00c0000 0x0080000>; -+ }; -+ partition@140000 { -+ label = "ubi"; -+ reg = <0x0140000 0x7ec0000>; -+ }; -+}; -+ -+&pciec { -+ status = "okay"; -+}; -+ -+&pcie0 { -+ status = "okay"; -+}; -+ -+&pinctrl { -+ pinctrl-names = "default"; -+ -+ pmx_buttons: pmx-buttons { -+ marvell,pins = "mpp24", "mpp25", "mpp26"; -+ marvell,function = "gpio"; -+ }; -+ -+ pmx_leds: pmx-leds { -+ marvell,pins = "mpp13", "mpp15", "mpp16", "mpp22", "mpp23", -+ "mpp28", "mpp29"; -+ marvell,function = "gpio"; -+ }; -+ -+ pmx_power: pmx-power { -+ marvell,pins = "mpp21", "mpp33"; -+ marvell,function = "gpio"; -+ }; -+ -+ pmx_pwr_off: pmx-pwr-off { -+ marvell,pins = "mpp27"; -+ marvell,function = "gpio"; -+ }; -+}; -+ -+&rtc { -+ status = "disabled"; -+}; -+ -+&sata { -+ status = "okay"; -+ nr-ports = <1>; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ hdd_temp: sata-port@0 { -+ reg = <0>; -+ #thermal-sensor-cells = <0>; -+ }; -+}; -+ -+&uart0 { -+ status = "okay"; -+}; diff --git a/target/linux/kirkwood/patches-6.6/003-6.5-ARM-dts-kirkwood-Add-Endian-4i-Edge-200-board.patch b/target/linux/kirkwood/patches-6.6/003-6.5-ARM-dts-kirkwood-Add-Endian-4i-Edge-200-board.patch deleted file mode 100644 index cde281526b..0000000000 --- a/target/linux/kirkwood/patches-6.6/003-6.5-ARM-dts-kirkwood-Add-Endian-4i-Edge-200-board.patch +++ /dev/null @@ -1,249 +0,0 @@ -From 5668d088ee4ea05db9daaae0645d1d1f579b20f9 Mon Sep 17 00:00:00 2001 -From: Pawel Dembicki -Date: Mon, 3 Oct 2022 09:34:43 +0200 -Subject: ARM: dts: kirkwood: Add Endian 4i Edge 200 board - -Add Endian 4i Edge 200 is 5-port firewall. -It have also clone: Endian UTM Mini (The same hardware, with added WLAN -card). - -Hardware: - - SoC: Marvell 88F6281-A1 ARMv5TE Processor 1.2GHz - - Ram: 512MB (4x Nanya NT5TU128M8GE-AC) - - NAND Flash: 512MB (Micron 29F4G08AAC) - - Lan 1-4: 4x GBE (Marvell 88E6171R-TFJ2) - - Lan 5: 1x GBE (Marvell 88E1116R-NNC1) - - Storage: MicroSD Slot - - MCPIE: MiniPCIe Slot present [fitted with SparkLan WPEA-110N/E - (Atheros AR9280 chipset) in Endian UTM Mini WLAN only] - - USB: 1x USB 2.0 port - - Console: RJ-45 port - - LEDs: 3x GPIO controlled - -Signed-off-by: Pawel Dembicki -Reviewed-by: Andrew Lunn -Signed-off-by: Gregory CLEMENT ---- - arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/kirkwood-4i-edge-200.dts | 205 +++++++++++++++++++++++++++++ - 2 files changed, 206 insertions(+) - create mode 100644 arch/arm/boot/dts/kirkwood-4i-edge-200.dts - ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -300,6 +300,7 @@ dtb-$(CONFIG_ARCH_KEYSTONE) += \ - keystone-k2g-evm.dtb \ - keystone-k2g-ice.dtb - dtb-$(CONFIG_MACH_KIRKWOOD) += \ -+ kirkwood-4i-edge-200.dtb \ - kirkwood-b3.dtb \ - kirkwood-blackarmor-nas220.dtb \ - kirkwood-c200-v1.dtb \ ---- /dev/null -+++ b/arch/arm/boot/dts/kirkwood-4i-edge-200.dts -@@ -0,0 +1,205 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Endian 4i Edge 200 Board Description -+ * Note: Endian UTM Mini is hardware clone of Endian Edge 200 -+ * Copyright 2021-2022 Pawel Dembicki -+ */ -+ -+/dts-v1/; -+ -+#include "kirkwood.dtsi" -+#include "kirkwood-6281.dtsi" -+#include -+ -+/ { -+ model = "Endian 4i Edge 200"; -+ compatible = "endian,4i-edge-200", "marvell,kirkwood-88f6281", "marvell,kirkwood"; -+ -+ memory { -+ device_type = "memory"; -+ reg = <0x00000000 0x20000000>; -+ }; -+ -+ chosen { -+ bootargs = "console=ttyS0,115200n8"; -+ stdout-path = &uart0; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ pinctrl-0 = <&pmx_led>; -+ pinctrl-names = "default"; -+ -+ led-1 { -+ function = LED_FUNCTION_SD; -+ color = ; -+ gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "mmc0"; -+ }; -+ -+ led-2 { -+ function = LED_FUNCTION_STATUS; -+ color = ; -+ gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ led-3 { -+ function = LED_FUNCTION_STATUS; -+ color = ; -+ gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>; -+ }; -+ }; -+}; -+ -+ð0 { -+ status = "okay"; -+}; -+ -+ð0port { -+ speed = <1000>; -+ duplex = <1>; -+}; -+ -+ð1 { -+ status = "okay"; -+}; -+ -+ð1port { -+ phy-handle = <ðphyb>; -+}; -+ -+&mdio { -+ status = "okay"; -+ -+ ethphyb: ethernet-phy@b { -+ reg = <0x0b>; -+ -+ marvell,reg-init = -+ /* link-activity, bi-color mode 4 */ -+ <3 0x10 0xfff0 0xf>; /* Reg 3,16 <- 0xzzzf */ -+ }; -+ -+ switch0: switch@11 { -+ compatible = "marvell,mv88e6085"; -+ reg = <0x11>; -+ -+ ports { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ port@0 { -+ reg = <0>; -+ label = "port1"; -+ }; -+ -+ port@1 { -+ reg = <1>; -+ label = "port2"; -+ }; -+ -+ port@2 { -+ reg = <2>; -+ label = "port3"; -+ }; -+ -+ port@3 { -+ reg = <3>; -+ label = "port4"; -+ }; -+ -+ port@5 { -+ reg = <5>; -+ phy-mode = "rgmii-id"; -+ ethernet = <ð0port>; -+ -+ fixed-link { -+ speed = <1000>; -+ full-duplex; -+ }; -+ }; -+ }; -+ }; -+}; -+ -+&nand { -+ status = "okay"; -+ pinctrl-0 = <&pmx_nand>; -+ pinctrl-names = "default"; -+ -+ partition@0 { -+ label = "u-boot"; -+ reg = <0x00000000 0x000a0000>; -+ read-only; -+ }; -+ -+ partition@a0000 { -+ label = "u-boot-env"; -+ reg = <0x000a0000 0x00060000>; -+ read-only; -+ }; -+ -+ partition@100000 { -+ label = "kernel"; -+ reg = <0x00100000 0x00400000>; -+ }; -+ -+ partition@500000 { -+ label = "ubi"; -+ reg = <0x00500000 0x1fb00000>; -+ }; -+}; -+ -+&pciec { -+ status = "okay"; -+}; -+ -+&pcie0 { -+ status = "okay"; -+}; -+ -+&pinctrl { -+ pinctrl-0 = <&pmx_sysrst>; -+ pinctrl-names = "default"; -+ -+ pmx_sysrst: pmx-sysrst { -+ marvell,pins = "mpp6"; -+ marvell,function = "sysrst"; -+ }; -+ -+ pmx_sdio_cd: pmx-sdio-cd { -+ marvell,pins = "mpp28"; -+ marvell,function = "gpio"; -+ }; -+ -+ pmx_led: pmx-led { -+ marvell,pins = "mpp34", "mpp35", "mpp49"; -+ marvell,function = "gpio"; -+ }; -+}; -+ -+&rtc { -+ status = "okay"; -+}; -+ -+&sata_phy0 { -+ status = "disabled"; -+}; -+ -+&sata_phy1 { -+ status = "disabled"; -+}; -+ -+&sdio { -+ pinctrl-0 = <&pmx_sdio_cd>; -+ pinctrl-names = "default"; -+ status = "okay"; -+ cd-gpios = <&gpio0 28 9>; -+}; -+ -+&uart0 { -+ status = "okay"; -+}; -+ -+&usb0 { -+ status = "okay"; -+}; diff --git a/target/linux/kirkwood/patches-6.6/004-6.4-ARM-dts-kirkwood-Add-missing-phy-mode-and-fixed-link.patch b/target/linux/kirkwood/patches-6.6/004-6.4-ARM-dts-kirkwood-Add-missing-phy-mode-and-fixed-link.patch deleted file mode 100644 index fd7adc3584..0000000000 --- a/target/linux/kirkwood/patches-6.6/004-6.4-ARM-dts-kirkwood-Add-missing-phy-mode-and-fixed-link.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 8aea8659a5f3ae8dc63c9f632ce1f676a1483556 Mon Sep 17 00:00:00 2001 -From: Andrew Lunn -Date: Fri, 7 Apr 2023 17:17:20 +0200 -Subject: [PATCH] ARM: dts: kirkwood: Add missing phy-mode and fixed links - -The DSA framework has got more picky about always having a phy-mode -for the CPU port. The Kirkwood Ethernet is an RGMII port. Set the -switch to impose the RGMII delays. - -Additionally, the cpu label has never actually been used in the -binding, so remove it. - -Signed-off-by: Andrew Lunn -Signed-off-by: Gregory CLEMENT ---- - arch/arm/boot/dts/kirkwood-dir665.dts | 3 ++- - arch/arm/boot/dts/kirkwood-l-50.dts | 2 +- - arch/arm/boot/dts/kirkwood-linksys-viper.dts | 3 ++- - arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 3 ++- - arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 2 +- - 5 files changed, 8 insertions(+), 5 deletions(-) - ---- a/arch/arm/boot/dts/kirkwood-dir665.dts -+++ b/arch/arm/boot/dts/kirkwood-dir665.dts -@@ -232,7 +232,7 @@ - - port@6 { - reg = <6>; -- label = "cpu"; -+ phy-mode = "rgmii-id"; - ethernet = <ð0port>; - fixed-link { - speed = <1000>; -@@ -251,6 +251,7 @@ - ethernet0-port@0 { - speed = <1000>; - duplex = <1>; -+ phy-mode = "rgmii"; - }; - }; - ---- a/arch/arm/boot/dts/kirkwood-l-50.dts -+++ b/arch/arm/boot/dts/kirkwood-l-50.dts -@@ -254,7 +254,6 @@ - - port@6 { - reg = <6>; -- label = "cpu"; - phy-mode = "rgmii-id"; - ethernet = <ð1port>; - fixed-link { -@@ -330,6 +329,7 @@ - ethernet1-port@0 { - speed = <1000>; - duplex = <1>; -+ phy-mode = "rgmii"; - }; - }; - ---- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts -+++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts -@@ -198,7 +198,7 @@ - - port@5 { - reg = <5>; -- label = "cpu"; -+ phy-mode = "rgmii-id"; - ethernet = <ð0port>; - fixed-link { - speed = <1000>; -@@ -221,6 +221,7 @@ - ethernet0-port@0 { - speed = <1000>; - duplex = <1>; -+ phy-mode = "rgmii"; - }; - }; - ---- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts -+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts -@@ -149,7 +149,7 @@ - - port@5 { - reg = <5>; -- label = "cpu"; -+ phy-mode = "rgmii-id"; - ethernet = <ð0port>; - fixed-link { - speed = <1000>; -@@ -166,6 +166,7 @@ - ethernet0-port@0 { - speed = <1000>; - duplex = <1>; -+ phy-mode = "rgmii"; - }; - }; - ---- a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi -+++ b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi -@@ -105,7 +105,7 @@ - - port@5 { - reg = <5>; -- label = "cpu"; -+ phy-mode = "rgmii-id"; - ethernet = <ð0port>; - fixed-link { - speed = <1000>; diff --git a/target/linux/kirkwood/patches-6.6/005-6.7-net-dsa-mv88e6xxx-fix-marvell-6350-switch-probing.patch b/target/linux/kirkwood/patches-6.6/005-6.7-net-dsa-mv88e6xxx-fix-marvell-6350-switch-probing.patch deleted file mode 100644 index cd838394d9..0000000000 --- a/target/linux/kirkwood/patches-6.6/005-6.7-net-dsa-mv88e6xxx-fix-marvell-6350-switch-probing.patch +++ /dev/null @@ -1,89 +0,0 @@ -From b3f1a164c7f742503dc7159011f7ad6b092b660e Mon Sep 17 00:00:00 2001 -From: Greg Ungerer -Date: Fri, 24 Nov 2023 14:15:28 +1000 -Subject: [PATCH] net: dsa: mv88e6xxx: fix marvell 6350 switch probing - -As of commit de5c9bf40c45 ("net: phylink: require supported_interfaces to -be filled") Marvell 88e6350 switches fail to be probed: - - ... - mv88e6085 d0072004.mdio-mii:11: switch 0x3710 detected: Marvell 88E6350, revision 2 - mv88e6085 d0072004.mdio-mii:11: phylink: error: empty supported_interfaces - error creating PHYLINK: -22 - mv88e6085: probe of d0072004.mdio-mii:11 failed with error -22 - ... - -The problem stems from the use of mv88e6185_phylink_get_caps() to get -the device capabilities. Create a new dedicated phylink_get_caps for the -6351 family (which the 6350 is one of) to properly support their set of -capabilities. - -According to chip.h the 6351 switch family includes the 6171, 6175, 6350 -and 6351 switches, so update each of these to use the correct -phylink_get_caps. - -Fixes: de5c9bf40c45 ("net: phylink: require supported_interfaces to be filled") -Signed-off-by: Greg Ungerer -Reviewed-by: Andrew Lunn -Signed-off-by: David S. Miller ---- - drivers/net/dsa/mv88e6xxx/chip.c | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - ---- a/drivers/net/dsa/mv88e6xxx/chip.c -+++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -652,6 +652,18 @@ static void mv88e6250_phylink_get_caps(s - config->mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100; - } - -+static void mv88e6351_phylink_get_caps(struct mv88e6xxx_chip *chip, int port, -+ struct phylink_config *config) -+{ -+ unsigned long *supported = config->supported_interfaces; -+ -+ /* Translate the default cmode */ -+ mv88e6xxx_translate_cmode(chip->ports[port].cmode, supported); -+ -+ config->mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 | -+ MAC_1000FD; -+} -+ - static int mv88e6352_get_port4_serdes_cmode(struct mv88e6xxx_chip *chip) - { - u16 reg, val; -@@ -4498,7 +4510,7 @@ static const struct mv88e6xxx_ops mv88e6 - .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, - .stu_getnext = mv88e6352_g1_stu_getnext, - .stu_loadpurge = mv88e6352_g1_stu_loadpurge, -- .phylink_get_caps = mv88e6185_phylink_get_caps, -+ .phylink_get_caps = mv88e6351_phylink_get_caps, - }; - - static const struct mv88e6xxx_ops mv88e6172_ops = { -@@ -4599,7 +4611,7 @@ static const struct mv88e6xxx_ops mv88e6 - .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, - .stu_getnext = mv88e6352_g1_stu_getnext, - .stu_loadpurge = mv88e6352_g1_stu_loadpurge, -- .phylink_get_caps = mv88e6185_phylink_get_caps, -+ .phylink_get_caps = mv88e6351_phylink_get_caps, - }; - - static const struct mv88e6xxx_ops mv88e6176_ops = { -@@ -5256,7 +5268,7 @@ static const struct mv88e6xxx_ops mv88e6 - .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, - .stu_getnext = mv88e6352_g1_stu_getnext, - .stu_loadpurge = mv88e6352_g1_stu_loadpurge, -- .phylink_get_caps = mv88e6185_phylink_get_caps, -+ .phylink_get_caps = mv88e6351_phylink_get_caps, - }; - - static const struct mv88e6xxx_ops mv88e6351_ops = { -@@ -5302,7 +5314,7 @@ static const struct mv88e6xxx_ops mv88e6 - .stu_loadpurge = mv88e6352_g1_stu_loadpurge, - .avb_ops = &mv88e6352_avb_ops, - .ptp_ops = &mv88e6352_ptp_ops, -- .phylink_get_caps = mv88e6185_phylink_get_caps, -+ .phylink_get_caps = mv88e6351_phylink_get_caps, - }; - - static const struct mv88e6xxx_ops mv88e6352_ops = { diff --git a/target/linux/kirkwood/patches-6.6/100-ib62x0.patch b/target/linux/kirkwood/patches-6.6/100-ib62x0.patch index 0637c24b63..1ee05f837f 100644 --- a/target/linux/kirkwood/patches-6.6/100-ib62x0.patch +++ b/target/linux/kirkwood/patches-6.6/100-ib62x0.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/kirkwood-ib62x0.dts -+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts +--- a/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts ++++ b/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts @@ -6,7 +6,14 @@ / { diff --git a/target/linux/kirkwood/patches-6.6/101-iconnect.patch b/target/linux/kirkwood/patches-6.6/101-iconnect.patch index 935e2dfcf5..cd1813d0a6 100644 --- a/target/linux/kirkwood/patches-6.6/101-iconnect.patch +++ b/target/linux/kirkwood/patches-6.6/101-iconnect.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/kirkwood-iconnect.dts -+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts +--- a/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts ++++ b/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts @@ -8,6 +8,13 @@ model = "Iomega Iconnect"; compatible = "iom,iconnect-1.1", "iom,iconnect", "marvell,kirkwood-88f6281", "marvell,kirkwood"; diff --git a/target/linux/kirkwood/patches-6.6/102-dockstar.patch b/target/linux/kirkwood/patches-6.6/102-dockstar.patch index 127f84962c..e97f15cab4 100644 --- a/target/linux/kirkwood/patches-6.6/102-dockstar.patch +++ b/target/linux/kirkwood/patches-6.6/102-dockstar.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/kirkwood-dockstar.dts -+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts +--- a/arch/arm/boot/dts/marvell/kirkwood-dockstar.dts ++++ b/arch/arm/boot/dts/marvell/kirkwood-dockstar.dts @@ -8,6 +8,13 @@ model = "Seagate FreeAgent Dockstar"; compatible = "seagate,dockstar", "marvell,kirkwood-88f6281", "marvell,kirkwood"; diff --git a/target/linux/kirkwood/patches-6.6/103-iomega-ix2-200.patch b/target/linux/kirkwood/patches-6.6/103-iomega-ix2-200.patch index db04c09f76..0251a10600 100644 --- a/target/linux/kirkwood/patches-6.6/103-iomega-ix2-200.patch +++ b/target/linux/kirkwood/patches-6.6/103-iomega-ix2-200.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts -+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts +--- a/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts ++++ b/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts @@ -8,6 +8,13 @@ model = "Iomega StorCenter ix2-200"; compatible = "iom,ix2-200", "marvell,kirkwood-88f6281", "marvell,kirkwood"; diff --git a/target/linux/kirkwood/patches-6.6/105-linksys-viper-dts.patch b/target/linux/kirkwood/patches-6.6/105-linksys-viper-dts.patch index b1604ec92c..6eb83003a2 100644 --- a/target/linux/kirkwood/patches-6.6/105-linksys-viper-dts.patch +++ b/target/linux/kirkwood/patches-6.6/105-linksys-viper-dts.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts -+++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts +--- a/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts ++++ b/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts @@ -24,6 +24,10 @@ }; diff --git a/target/linux/kirkwood/patches-6.6/106-goflexnet.patch b/target/linux/kirkwood/patches-6.6/106-goflexnet.patch index 82cf90841e..b664009b85 100644 --- a/target/linux/kirkwood/patches-6.6/106-goflexnet.patch +++ b/target/linux/kirkwood/patches-6.6/106-goflexnet.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/kirkwood-goflexnet.dts -+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts +--- a/arch/arm/boot/dts/marvell/kirkwood-goflexnet.dts ++++ b/arch/arm/boot/dts/marvell/kirkwood-goflexnet.dts @@ -8,6 +8,13 @@ model = "Seagate GoFlex Net"; compatible = "seagate,goflexnet", "marvell,kirkwood-88f6281", "marvell,kirkwood"; diff --git a/target/linux/kirkwood/patches-6.6/107-01-zyxel-nsa3x0-common-nand-partitions.patch b/target/linux/kirkwood/patches-6.6/107-01-zyxel-nsa3x0-common-nand-partitions.patch index df654033fd..a73d82b892 100644 --- a/target/linux/kirkwood/patches-6.6/107-01-zyxel-nsa3x0-common-nand-partitions.patch +++ b/target/linux/kirkwood/patches-6.6/107-01-zyxel-nsa3x0-common-nand-partitions.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi -+++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi +--- a/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi ++++ b/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi @@ -112,40 +112,16 @@ partition@0 { diff --git a/target/linux/kirkwood/patches-6.6/107-03-nsa325.patch b/target/linux/kirkwood/patches-6.6/107-03-nsa325.patch index 374c0895a9..b3f19924db 100644 --- a/target/linux/kirkwood/patches-6.6/107-03-nsa325.patch +++ b/target/linux/kirkwood/patches-6.6/107-03-nsa325.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/kirkwood-nsa325.dts -+++ b/arch/arm/boot/dts/kirkwood-nsa325.dts +--- a/arch/arm/boot/dts/marvell/kirkwood-nsa325.dts ++++ b/arch/arm/boot/dts/marvell/kirkwood-nsa325.dts @@ -15,6 +15,13 @@ model = "ZyXEL NSA325"; compatible = "zyxel,nsa325", "marvell,kirkwood-88f6282", "marvell,kirkwood"; diff --git a/target/linux/kirkwood/patches-6.6/109-pogoplug_v4.patch b/target/linux/kirkwood/patches-6.6/109-pogoplug_v4.patch index 4273eb9af1..ed7e4e4ff0 100644 --- a/target/linux/kirkwood/patches-6.6/109-pogoplug_v4.patch +++ b/target/linux/kirkwood/patches-6.6/109-pogoplug_v4.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts -+++ b/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts +--- a/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts ++++ b/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts @@ -18,12 +18,20 @@ compatible = "cloudengines,pogoplugv4", "marvell,kirkwood-88f6192", "marvell,kirkwood"; diff --git a/target/linux/kirkwood/patches-6.6/110-pogo_e02.patch b/target/linux/kirkwood/patches-6.6/110-pogo_e02.patch index fc384d3521..21b929dda7 100644 --- a/target/linux/kirkwood/patches-6.6/110-pogo_e02.patch +++ b/target/linux/kirkwood/patches-6.6/110-pogo_e02.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/kirkwood-pogo_e02.dts -+++ b/arch/arm/boot/dts/kirkwood-pogo_e02.dts +--- a/arch/arm/boot/dts/marvell/kirkwood-pogo_e02.dts ++++ b/arch/arm/boot/dts/marvell/kirkwood-pogo_e02.dts @@ -20,6 +20,13 @@ compatible = "cloudengines,pogoe02", "marvell,kirkwood-88f6281", "marvell,kirkwood"; diff --git a/target/linux/kirkwood/patches-6.6/111-l-50.patch b/target/linux/kirkwood/patches-6.6/111-l-50.patch index bc933cb610..08897d4fae 100644 --- a/target/linux/kirkwood/patches-6.6/111-l-50.patch +++ b/target/linux/kirkwood/patches-6.6/111-l-50.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/kirkwood-l-50.dts -+++ b/arch/arm/boot/dts/kirkwood-l-50.dts +--- a/arch/arm/boot/dts/marvell/kirkwood-l-50.dts ++++ b/arch/arm/boot/dts/marvell/kirkwood-l-50.dts @@ -18,6 +18,13 @@ reg = <0x00000000 0x20000000>; }; diff --git a/target/linux/kirkwood/patches-6.6/112-sheevaplug.patch b/target/linux/kirkwood/patches-6.6/112-sheevaplug.patch index d1ff9884a0..e8e83bdbba 100644 --- a/target/linux/kirkwood/patches-6.6/112-sheevaplug.patch +++ b/target/linux/kirkwood/patches-6.6/112-sheevaplug.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi -+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi +--- a/arch/arm/boot/dts/marvell/kirkwood-sheevaplug-common.dtsi ++++ b/arch/arm/boot/dts/marvell/kirkwood-sheevaplug-common.dtsi @@ -78,13 +78,8 @@ }; @@ -16,8 +16,8 @@ }; }; ---- a/arch/arm/boot/dts/kirkwood-sheevaplug.dts -+++ b/arch/arm/boot/dts/kirkwood-sheevaplug.dts +--- a/arch/arm/boot/dts/marvell/kirkwood-sheevaplug.dts ++++ b/arch/arm/boot/dts/marvell/kirkwood-sheevaplug.dts @@ -13,6 +13,13 @@ model = "Globalscale Technologies SheevaPlug"; compatible = "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood"; diff --git a/target/linux/kirkwood/patches-6.6/113-readynas_duo_v2.patch b/target/linux/kirkwood/patches-6.6/113-readynas_duo_v2.patch index c6452c55a3..9cb2ad102c 100644 --- a/target/linux/kirkwood/patches-6.6/113-readynas_duo_v2.patch +++ b/target/linux/kirkwood/patches-6.6/113-readynas_duo_v2.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts -+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts +--- a/arch/arm/boot/dts/marvell/kirkwood-netgear_readynas_duo_v2.dts ++++ b/arch/arm/boot/dts/marvell/kirkwood-netgear_readynas_duo_v2.dts @@ -19,6 +19,13 @@ reg = <0x00000000 0x10000000>; }; diff --git a/target/linux/kirkwood/patches-6.6/114-ctera-c-200-v1.patch b/target/linux/kirkwood/patches-6.6/114-ctera-c-200-v1.patch index eb62e1a5ed..7e93089616 100644 --- a/target/linux/kirkwood/patches-6.6/114-ctera-c-200-v1.patch +++ b/target/linux/kirkwood/patches-6.6/114-ctera-c-200-v1.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/kirkwood-c200-v1.dts -+++ b/arch/arm/boot/dts/kirkwood-c200-v1.dts +--- a/arch/arm/boot/dts/marvell/kirkwood-c200-v1.dts ++++ b/arch/arm/boot/dts/marvell/kirkwood-c200-v1.dts @@ -14,6 +14,14 @@ model = "Ctera C200 V1"; compatible = "ctera,c200-v1", "marvell,kirkwood-88f6281", "marvell,kirkwood"; diff --git a/target/linux/kirkwood/patches-6.6/115-nsa310s.patch b/target/linux/kirkwood/patches-6.6/115-nsa310s.patch index 4c6e08f49c..2f43dd960c 100644 --- a/target/linux/kirkwood/patches-6.6/115-nsa310s.patch +++ b/target/linux/kirkwood/patches-6.6/115-nsa310s.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/kirkwood-nsa310s.dts -+++ b/arch/arm/boot/dts/kirkwood-nsa310s.dts +--- a/arch/arm/boot/dts/marvell/kirkwood-nsa310s.dts ++++ b/arch/arm/boot/dts/marvell/kirkwood-nsa310s.dts @@ -16,6 +16,13 @@ model = "ZyXEL NSA310S"; compatible = "zyxel,nsa310s", "marvell,kirkwood-88f6702", "marvell,kirkwood"; diff --git a/target/linux/kirkwood/patches-6.6/116-4i-edge-200.patch b/target/linux/kirkwood/patches-6.6/116-4i-edge-200.patch index ffc46c29dc..62a3074097 100644 --- a/target/linux/kirkwood/patches-6.6/116-4i-edge-200.patch +++ b/target/linux/kirkwood/patches-6.6/116-4i-edge-200.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/kirkwood-4i-edge-200.dts -+++ b/arch/arm/boot/dts/kirkwood-4i-edge-200.dts +--- a/arch/arm/boot/dts/marvell/kirkwood-4i-edge-200.dts ++++ b/arch/arm/boot/dts/marvell/kirkwood-4i-edge-200.dts @@ -20,6 +20,13 @@ reg = <0x00000000 0x20000000>; }; diff --git a/target/linux/kirkwood/patches-6.6/117-netgear_stora.patch b/target/linux/kirkwood/patches-6.6/117-netgear_stora.patch index c7518933b2..db0bdb4228 100644 --- a/target/linux/kirkwood/patches-6.6/117-netgear_stora.patch +++ b/target/linux/kirkwood/patches-6.6/117-netgear_stora.patch @@ -1,6 +1,6 @@ ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -375,6 +375,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ +--- a/arch/arm/boot/dts/marvell/Makefile ++++ b/arch/arm/boot/dts/marvell/Makefile +@@ -157,6 +157,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ kirkwood-rs411.dtb \ kirkwood-sheevaplug.dtb \ kirkwood-sheevaplug-esata.dtb \ diff --git a/target/linux/kirkwood/patches-6.6/203-blackarmor-nas220.patch b/target/linux/kirkwood/patches-6.6/203-blackarmor-nas220.patch index e04a28206a..8ceac179cb 100644 --- a/target/linux/kirkwood/patches-6.6/203-blackarmor-nas220.patch +++ b/target/linux/kirkwood/patches-6.6/203-blackarmor-nas220.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts -+++ b/arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts +--- a/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts ++++ b/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts @@ -17,6 +17,13 @@ compatible = "seagate,blackarmor-nas220","marvell,kirkwood-88f6192", "marvell,kirkwood";