From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E1D69CA6015 for ; Fri, 9 Oct 2026 16:11:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Whz6EeGgKypqRBi5YrO/rCW1xhvllxiK3E64CG3XL+M=; b=GTPXm558wF88ewtCxJ1zJeWwJJ RAAPK3BkYVhcn9NGWxLcJrOjaFdcpRmg7tNlQwNl8x0nOVwPlY04j3p42ydGAP+8Ip9TTjXnBj/kQ MKwU0lbhT2qkYA5RAU3UX+jx/XDUkDI8gmluYbsFtGOPRC5e7NjT2YLHtIWGfzoIpBwnZabPFdVnf tUfI2xZ4b9HXym+vdFEqXZ++mGgTg+7kLTsrYIldcZCNYcVHkJlFNzIcJZbXFmmUw2CHl4yeDhq3/ hrnDcGz3argf/kOxAF8gkhj7E/HUzvV6uVNYjkFvrpLhb+O6iYmQ80MbNEfTsuV3XiufnUqxqTW6O 9yedRwjA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xFDC7-00000006cmp-42ZS; Fri, 09 Oct 2026 16:11:39 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xFDC0-00000006ca4-09tu for linux-mediatek@bombadil.infradead.org; Fri, 09 Oct 2026 16:11:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description; bh=Whz6EeGgKypqRBi5YrO/rCW1xhvllxiK3E64CG3XL+M=; b=SPiK8UQ2M/kw6zVX+kMoFdcUlq YUJMD65MXT3z4BwJz1Uczfr6EQKNwq5sITypspGKFpFKpSfd1jVOSYzrtN0CdWm4XHfpx6AH14IS/ g1gZ/90XTjoej4GbW+xXXtAPT9JPo4txKg402aAMj4VqUoKoLVHEKgwcllAzh45n7AYe17qUjCMwI 7AHWdcsgq5t7F7MQlcosZa6HCby9uZrTMT1ooDXyVX+/H6YArqvJ0UmB0UGUbXp95toGNX0WBU0tJ r0DFV3N6QtYc8x35KOH35R8RYCfxJUX/dXjOpr7ZXrasS/5WfdOC2LvM3fT06DWK1cJGu9RFGDrsX fQFGwJdw==; Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by desiato.infradead.org with esmtps (Exim 4.99.2 #2 (Red Hat Linux)) id 1xFDBx-0000000BOnu-0gdP for linux-mediatek@lists.infradead.org; Fri, 09 Oct 2026 16:11:31 +0000 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-48af27fe287so3234597f8f.0 for ; Fri, 09 Oct 2026 09:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791562287; x=1792167087; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=Whz6EeGgKypqRBi5YrO/rCW1xhvllxiK3E64CG3XL+M=; b=aEewpFz2KWh9qkPJL3RxTBGgEFfF245xCFgwKMCH09ZR1XWtw+aP29uNtEBKtGeX7r IT7jfAzcqmSr6vErOs2tR1sKOGTNXF6a72MGf0xkTBwyIQnavFFDIazunX8IfFWF4Lk5 EkEsW5jrnYfHdX1OulYtH8ZUD+tbHdimbxv9Ug3VapDkE0WgmTkK7a8yA89dY1eoA5W5 NVKWlC0R6J6pJyzLO04gauNUXMPQh9NfA+tCGTabkbUVnIYWoSB2sIY03ABuzDWSzudW AuLaRj+kMS1eu1tJscdsf0hEzHrmNtKCKhKxrvdLTpksEXBCqhel14G9K4GprYRwrEm4 pbqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791562287; x=1792167087; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=Whz6EeGgKypqRBi5YrO/rCW1xhvllxiK3E64CG3XL+M=; b=XRqbZarSs5w9iXW9qjd+vKkl6eet0JXxUkSSg39hwd5i2vr3MWLTNhWj/4+SweeuSU UUku9Is51W2s37VWUfqyRui15xPo5DkE8RAsYvXf+J+nWcn2llRmM1AdvDkUhCufn5fH t28SAprP0E62JS0JP5bl6HySdQlIH6AM1dA25ED83Aug+aLgNXa8ceJm4nWVcqF1jPDJ OJTeySoSm7ovywZ2m9G+ayhz4mWcXH1EwwKlguU118Lx8GNpsdqkU3K4L0JffHJtZFVc 2JAj0TmrA+pRNgZyBiYkdR1QxXJn5YEMmrvDuBUXboshUqkzU2mluRw446nl/RhBlqPw hX8A== X-Forwarded-Encrypted: i=1; AKwUvBxEtDnrK8vLeuwbBy3TocQveiMKtMooLUGITGde7/Plf/Qz872Fy0y3VGM1mTX7MzoOBGsXNWsmXPfbTY7rIg==@lists.infradead.org X-Gm-Message-State: AFq9FYKNfxj7NXI2fejR+p1IXwhiRWZyYsHDbTk3ThKzIFZ55Fg3Oh4o iJm2c+O//Xz/gRn4029CJZTeJVN2Gr8lD722jeXQ2SBpJFPPH9SnTKvV X-Gm-Gg: AYBFou0pNXpO2iGOtuuSC+xd5UXcbpJYoYpCykxM4+jVdouKPKlGYYCXp/NsZG4znNg /HHplUZvm9MGQtf33/twm7DoZZ9HBIieSFtxhnnUvVPDZNwPJFGEFt+iDgm3zihLv8IyzMMN3n2 WvkMzddE7eSghPdlB551YDIZWYmyKJnB1nz5irRdE1JMkKByGvYVbAyQznvZ/b45gLz62Einsst GsEXpqS4/c87oTOJU2te9l3o3+hdyOT+PFpaxP4DqzgwrD3hJ8vy6DP6axETySnnNOEcLABWgFD 4/mk/lcWIXC1DYZ7BkZ/loy13StikGQfctvRelx7ldhlJ+oA+BS11ygRL3U/LMz8dnkFi2m/xOd +QjMtELOmnLbRyxyjKrLMh8gLyhVqJ3SEen0k1bBW8ZU7mK8ZdUvqqZGQXmejtFnFk0hZkB+Naq MX+eArJBg29OrQ3YhFcTR7IOJkw63lZWIsCNvqSXK+wKZmZrAQZTcNSCRxgYI/kuUxEs1KOn1fX FM7kVx+LeMd8Gm0bdHzYYslDk12GEIAkiy6/6kQPcXPho9PvS8yxT0121j24693UQjjEEWLk8+X EP93NLkoDVwsAXZi7FE4TCSdqsIt X-Received: by 2002:a05:6000:46da:b0:48b:1276:72e7 with SMTP id ffacd0b85a97d-48dba9db139mr3567737f8f.13.1791562287342; Fri, 09 Oct 2026 09:11:27 -0700 (PDT) Received: from Ansuel-XPS24.localdomain (host-213-45-9-252.retail.telecomitalia.it. [213.45.9.252]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-48db94e2f08sm4744701f8f.15.2026.10.09.09.11.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2026 09:11:26 -0700 (PDT) From: Christian Marangi To: Christian Marangi , Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Vladimir Oltean , Matthias Brugger , AngeloGioacchino Del Regno , "Chester A. Unal" , Daniel Golle , Heiner Kallweit , Russell King , Simon Horman , Joris Vaisvila , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, netdev@vger.kernel.org, mfd@lists.linux.dev, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v25 08/10] net: dsa: move mediatek DSA driver in dedicated directory Date: Fri, 9 Oct 2026 18:10:53 +0200 Message-ID: <20261009161102.38961-9-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261009161102.38961-1-ansuelsmth@gmail.com> References: <20261009161102.38961-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261009_171129_438443_8A4326C1 X-CRM114-Status: GOOD ( 19.61 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org To tidy things up and better organize DSA drivers, move the Mediatek related driver to the dedicated Vendor directory. MAINTAINERS file is updated accordingly to reference the new location. Signed-off-by: Christian Marangi --- MAINTAINERS | 6 +-- drivers/net/dsa/Kconfig | 45 +------------------- drivers/net/dsa/Makefile | 5 +-- drivers/net/dsa/mediatek/Kconfig | 45 ++++++++++++++++++++ drivers/net/dsa/mediatek/Makefile | 5 +++ drivers/net/dsa/{ => mediatek}/mt7530-mdio.c | 0 drivers/net/dsa/{ => mediatek}/mt7530-mmio.c | 0 drivers/net/dsa/{ => mediatek}/mt7530.c | 0 drivers/net/dsa/{ => mediatek}/mt7530.h | 0 drivers/net/dsa/{ => mediatek}/mt7628.c | 0 10 files changed, 55 insertions(+), 51 deletions(-) create mode 100644 drivers/net/dsa/mediatek/Kconfig create mode 100644 drivers/net/dsa/mediatek/Makefile rename drivers/net/dsa/{ => mediatek}/mt7530-mdio.c (100%) rename drivers/net/dsa/{ => mediatek}/mt7530-mmio.c (100%) rename drivers/net/dsa/{ => mediatek}/mt7530.c (100%) rename drivers/net/dsa/{ => mediatek}/mt7530.h (100%) rename drivers/net/dsa/{ => mediatek}/mt7628.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 53dcff93f896..e16c14ea38a1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16841,9 +16841,9 @@ M: Chester A. Unal M: Daniel Golle L: netdev@vger.kernel.org S: Maintained -F: drivers/net/dsa/mt7530-mdio.c -F: drivers/net/dsa/mt7530-mmio.c -F: drivers/net/dsa/mt7530.* +F: drivers/net/dsa/mediatek/mt7530-mdio.c +F: drivers/net/dsa/mediatek/mt7530-mmio.c +F: drivers/net/dsa/mediatek/mt7530.* F: net/dsa/tag_mtk.c MEDIATEK T7XX 5G WWAN MODEM DRIVER diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig index fe8cd5338fda..ffc26eb3e899 100644 --- a/drivers/net/dsa/Kconfig +++ b/drivers/net/dsa/Kconfig @@ -28,50 +28,7 @@ source "drivers/net/dsa/hirschmann/Kconfig" source "drivers/net/dsa/lantiq/Kconfig" -config NET_DSA_MT7530 - tristate "MediaTek MT7530 and MT7531 Ethernet switch support" - select NET_DSA_TAG_MTK - select REGMAP_IRQ - imply NET_DSA_MT7530_MDIO - imply NET_DSA_MT7530_MMIO - help - This enables support for the MediaTek MT7530 and MT7531 Ethernet - switch chips. Multi-chip module MT7530 in MT7621AT, MT7621DAT, - MT7621ST and MT7623AI SoCs, and built-in switch in MT7988 SoC are - supported as well. - -config NET_DSA_MT7530_MDIO - tristate "MediaTek MT7530 MDIO interface driver" - depends on NET_DSA_MT7530 - select MEDIATEK_GE_PHY - select PCS_MTK_LYNXI - help - This enables support for the MediaTek MT7530 and MT7531 switch - chips which are connected via MDIO, as well as multi-chip - module MT7530 which can be found in the MT7621AT, MT7621DAT, - MT7621ST and MT7623AI SoCs. - -config NET_DSA_MT7530_MMIO - tristate "MediaTek MT7530 MMIO interface driver" - depends on NET_DSA_MT7530 - depends on HAS_IOMEM - imply MEDIATEK_GE_SOC_PHY - help - This enables support for the built-in Ethernet switch found - in the MediaTek MT7988 SoC. - The switch is a similar design as MT7531, but the switch registers - are directly mapped into the SoCs register space rather than being - accessible via MDIO. - -config NET_DSA_MT7628 - tristate "MediaTek MT7628 Embedded Ethernet switch support" - depends on HAS_IOMEM && (SOC_MT7620 || COMPILE_TEST) - select NET_DSA_TAG_MT7628 - select MEDIATEK_FE_SOC_PHY - select REGMAP_MMIO - help - This enables support for the built-in Ethernet switch found - in the MT7628 SoC. +source "drivers/net/dsa/mediatek/Kconfig" config NET_DSA_MV88E6060 tristate "Marvell 88E6060 ethernet switch chip support" diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile index 7e637d56b35c..ee4784a9839b 100644 --- a/drivers/net/dsa/Makefile +++ b/drivers/net/dsa/Makefile @@ -2,10 +2,6 @@ obj-$(CONFIG_NET_DSA_BCM_SF2) += bcm-sf2.o bcm-sf2-objs := bcm_sf2.o bcm_sf2_cfp.o obj-$(CONFIG_NET_DSA_LOOP) += dsa_loop.o -obj-$(CONFIG_NET_DSA_MT7530) += mt7530.o -obj-$(CONFIG_NET_DSA_MT7530_MDIO) += mt7530-mdio.o -obj-$(CONFIG_NET_DSA_MT7530_MMIO) += mt7530-mmio.o -obj-$(CONFIG_NET_DSA_MT7628) += mt7628.o obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o obj-$(CONFIG_NET_DSA_RZN1_A5PSW) += rzn1_a5psw.o obj-$(CONFIG_NET_DSA_SMSC_LAN9303) += lan9303-core.o @@ -17,6 +13,7 @@ obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX_SPI) += vitesse-vsc73xx-spi.o obj-y += b53/ obj-y += hirschmann/ obj-y += lantiq/ +obj-y += mediatek/ obj-y += microchip/ obj-y += motorcomm/ obj-y += mv88e6xxx/ diff --git a/drivers/net/dsa/mediatek/Kconfig b/drivers/net/dsa/mediatek/Kconfig new file mode 100644 index 000000000000..ef62481662fd --- /dev/null +++ b/drivers/net/dsa/mediatek/Kconfig @@ -0,0 +1,45 @@ +# SPDX-License-Identifier: GPL-2.0-only +config NET_DSA_MT7530 + tristate "MediaTek MT7530 and MT7531 Ethernet switch support" + select NET_DSA_TAG_MTK + select REGMAP_IRQ + imply NET_DSA_MT7530_MDIO + imply NET_DSA_MT7530_MMIO + help + This enables support for the MediaTek MT7530 and MT7531 Ethernet + switch chips. Multi-chip module MT7530 in MT7621AT, MT7621DAT, + MT7621ST and MT7623AI SoCs, and built-in switch in MT7988 SoC are + supported as well. + +config NET_DSA_MT7530_MDIO + tristate "MediaTek MT7530 MDIO interface driver" + depends on NET_DSA_MT7530 + select MEDIATEK_GE_PHY + select PCS_MTK_LYNXI + help + This enables support for the MediaTek MT7530 and MT7531 switch + chips which are connected via MDIO, as well as multi-chip + module MT7530 which can be found in the MT7621AT, MT7621DAT, + MT7621ST and MT7623AI SoCs. + +config NET_DSA_MT7530_MMIO + tristate "MediaTek MT7530 MMIO interface driver" + depends on NET_DSA_MT7530 + depends on HAS_IOMEM + imply MEDIATEK_GE_SOC_PHY + help + This enables support for the built-in Ethernet switch found + in the MediaTek MT7988 SoC. + The switch is a similar design as MT7531, but the switch registers + are directly mapped into the SoCs register space rather than being + accessible via MDIO. + +config NET_DSA_MT7628 + tristate "MediaTek MT7628 Embedded Ethernet switch support" + depends on HAS_IOMEM && (SOC_MT7620 || COMPILE_TEST) + select NET_DSA_TAG_MT7628 + select MEDIATEK_FE_SOC_PHY + select REGMAP_MMIO + help + This enables support for the built-in Ethernet switch found + in the MT7628 SoC. diff --git a/drivers/net/dsa/mediatek/Makefile b/drivers/net/dsa/mediatek/Makefile new file mode 100644 index 000000000000..0ed6e11f292e --- /dev/null +++ b/drivers/net/dsa/mediatek/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_NET_DSA_MT7530) += mt7530.o +obj-$(CONFIG_NET_DSA_MT7530_MDIO) += mt7530-mdio.o +obj-$(CONFIG_NET_DSA_MT7530_MMIO) += mt7530-mmio.o +obj-$(CONFIG_NET_DSA_MT7628) += mt7628.o diff --git a/drivers/net/dsa/mt7530-mdio.c b/drivers/net/dsa/mediatek/mt7530-mdio.c similarity index 100% rename from drivers/net/dsa/mt7530-mdio.c rename to drivers/net/dsa/mediatek/mt7530-mdio.c diff --git a/drivers/net/dsa/mt7530-mmio.c b/drivers/net/dsa/mediatek/mt7530-mmio.c similarity index 100% rename from drivers/net/dsa/mt7530-mmio.c rename to drivers/net/dsa/mediatek/mt7530-mmio.c diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mediatek/mt7530.c similarity index 100% rename from drivers/net/dsa/mt7530.c rename to drivers/net/dsa/mediatek/mt7530.c diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mediatek/mt7530.h similarity index 100% rename from drivers/net/dsa/mt7530.h rename to drivers/net/dsa/mediatek/mt7530.h diff --git a/drivers/net/dsa/mt7628.c b/drivers/net/dsa/mediatek/mt7628.c similarity index 100% rename from drivers/net/dsa/mt7628.c rename to drivers/net/dsa/mediatek/mt7628.c -- 2.55.0