Skip to content

Commit 16dc079

Browse files
LorenzoBianconigregkh
authored andcommitted
net: airoha: Move airoha_eth driver in a dedicated folder
[ Upstream commit fb3dda8 ] The airoha_eth driver has no codebase shared with mtk_eth_soc one. Moreover, the upcoming features (flowtable hw offloading, PCS, ..) will not reuse any code from MediaTek driver. Move the Airoha driver in a dedicated folder. Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Signed-off-by: Paolo Abeni <pabeni@redhat.com> Stable-dep-of: 86e51aa ("net: airoha: Fix skb->priority underflow in airoha_dev_select_queue()") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent fb4ac6f commit 16dc079

7 files changed

Lines changed: 27 additions & 9 deletions

File tree

drivers/net/ethernet/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ source "drivers/net/ethernet/actions/Kconfig"
2020
source "drivers/net/ethernet/adaptec/Kconfig"
2121
source "drivers/net/ethernet/aeroflex/Kconfig"
2222
source "drivers/net/ethernet/agere/Kconfig"
23+
source "drivers/net/ethernet/airoha/Kconfig"
24+
source "drivers/net/ethernet/mellanox/Kconfig"
2325
source "drivers/net/ethernet/alacritech/Kconfig"
2426
source "drivers/net/ethernet/allwinner/Kconfig"
2527
source "drivers/net/ethernet/alteon/Kconfig"

drivers/net/ethernet/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ obj-$(CONFIG_NET_VENDOR_ADAPTEC) += adaptec/
1010
obj-$(CONFIG_GRETH) += aeroflex/
1111
obj-$(CONFIG_NET_VENDOR_ADI) += adi/
1212
obj-$(CONFIG_NET_VENDOR_AGERE) += agere/
13+
obj-$(CONFIG_NET_VENDOR_AIROHA) += airoha/
1314
obj-$(CONFIG_NET_VENDOR_ALACRITECH) += alacritech/
1415
obj-$(CONFIG_NET_VENDOR_ALLWINNER) += allwinner/
1516
obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
config NET_VENDOR_AIROHA
3+
bool "Airoha devices"
4+
depends on ARCH_AIROHA || COMPILE_TEST
5+
help
6+
If you have a Airoha SoC with ethernet, say Y.
7+
8+
if NET_VENDOR_AIROHA
9+
10+
config NET_AIROHA
11+
tristate "Airoha SoC Gigabit Ethernet support"
12+
depends on NET_DSA || !NET_DSA
13+
select PAGE_POOL
14+
help
15+
This driver supports the gigabit ethernet MACs in the
16+
Airoha SoC family.
17+
18+
endif #NET_VENDOR_AIROHA
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
#
3+
# Airoha for the Mediatek SoCs built-in ethernet macs
4+
#
5+
6+
obj-$(CONFIG_NET_AIROHA) += airoha_eth.o
File renamed without changes.

drivers/net/ethernet/mediatek/Kconfig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@ config NET_VENDOR_MEDIATEK
77

88
if NET_VENDOR_MEDIATEK
99

10-
config NET_AIROHA
11-
tristate "Airoha SoC Gigabit Ethernet support"
12-
depends on NET_DSA || !NET_DSA
13-
select PAGE_POOL
14-
help
15-
This driver supports the gigabit ethernet MACs in the
16-
Airoha SoC family.
17-
1810
config NET_MEDIATEK_SOC_WED
1911
depends on ARCH_MEDIATEK || COMPILE_TEST
2012
def_bool NET_MEDIATEK_SOC != n

drivers/net/ethernet/mediatek/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ mtk_eth-$(CONFIG_NET_MEDIATEK_SOC_WED) += mtk_wed_debugfs.o
1111
endif
1212
obj-$(CONFIG_NET_MEDIATEK_SOC_WED) += mtk_wed_ops.o
1313
obj-$(CONFIG_NET_MEDIATEK_STAR_EMAC) += mtk_star_emac.o
14-
obj-$(CONFIG_NET_AIROHA) += airoha_eth.o

0 commit comments

Comments
 (0)