Skip to content

Commit d7301c4

Browse files
committed
Merge branch 'oxnas=dwmac-removal'
Neil Armstrong says: ==================== net: ethernet: dwmac: oxnas glue removal With [1] removing MPCore SMP support, this makes the OX820 barely usable, associated with a clear lack of maintainance, development and migration to dt-schema it's clear that Linux support for OX810 and OX820 should be removed. In addition, the OX810 hasn't been booted for years and isn't even present in an ARM config file. For the OX820, lack of USB and SATA support makes the platform not usable in the current Linux support and relies on off-tree drivers hacked from the vendor (defunct for years) sources. The last users are in the OpenWRT distribution, and today's removal means support will still be in stable 6.1 LTS kernel until end of 2026. If someone wants to take over the development even with lack of SMP, I'll be happy to hand off maintainance. It has been a fun time adding support for this architecture, but it's time to get over! This patchset only removes net changes, and is derived from: https://lore.kernel.org/r/20230630-topic-oxnas-upstream-remove-v2-0-fb6ab3dea87c@linaro.org --- Changes in v3: - Removed applied changes - Added Andy's tags - Reduced for net - Link to v2: https://lore.kernel.org/r/20230630-topic-oxnas-upstream-remove-v2-0-fb6ab3dea87c@linaro.org Changes in v2: - s/maintainance/maintenance/ - added acked/review tags - dropped already applied patches - drop RFC - Link to v1: https://lore.kernel.org/r/20230331-topic-oxnas-upstream-remove-v1-0-5bd58fd1dd1f@linaro.org ==================== Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents 0a368a5 + 6d7d66a commit d7301c4

File tree

4 files changed

+0
-297
lines changed

4 files changed

+0
-297
lines changed

Documentation/devicetree/bindings/net/oxnas-dwmac.txt

Lines changed: 0 additions & 41 deletions
This file was deleted.

drivers/net/ethernet/stmicro/stmmac/Kconfig

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -121,17 +121,6 @@ config DWMAC_MESON
121121
the stmmac device driver. This driver is used for Meson6,
122122
Meson8, Meson8b and GXBB SoCs.
123123

124-
config DWMAC_OXNAS
125-
tristate "Oxford Semiconductor OXNAS dwmac support"
126-
default ARCH_OXNAS
127-
depends on OF && COMMON_CLK && (ARCH_OXNAS || COMPILE_TEST)
128-
select MFD_SYSCON
129-
help
130-
Support for Ethernet controller on Oxford Semiconductor OXNAS SoCs.
131-
132-
This selects the Oxford Semiconductor OXNASSoC glue layer support for
133-
the stmmac device driver. This driver is used for OX820.
134-
135124
config DWMAC_QCOM_ETHQOS
136125
tristate "Qualcomm ETHQOS support"
137126
default ARCH_QCOM

drivers/net/ethernet/stmicro/stmmac/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ obj-$(CONFIG_DWMAC_IPQ806X) += dwmac-ipq806x.o
1919
obj-$(CONFIG_DWMAC_LPC18XX) += dwmac-lpc18xx.o
2020
obj-$(CONFIG_DWMAC_MEDIATEK) += dwmac-mediatek.o
2121
obj-$(CONFIG_DWMAC_MESON) += dwmac-meson.o dwmac-meson8b.o
22-
obj-$(CONFIG_DWMAC_OXNAS) += dwmac-oxnas.o
2322
obj-$(CONFIG_DWMAC_QCOM_ETHQOS) += dwmac-qcom-ethqos.o
2423
obj-$(CONFIG_DWMAC_ROCKCHIP) += dwmac-rk.o
2524
obj-$(CONFIG_DWMAC_SOCFPGA) += dwmac-altr-socfpga.o

drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c

Lines changed: 0 additions & 244 deletions
This file was deleted.

0 commit comments

Comments
 (0)