Commit e5a77529 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-phy-split-at803x' 

Christian Marangi says:

====================
net: phy: split at803x

This is the last patchset of a long series of cleanup and
preparation to make at803x better maintainable and permit
the addition of other QCOM PHY Families.

A shared library modules is created since many QCOM PHY share
similar/exact implementation and are reused.

This series doesn't introduce any new code but just move the
function around and introduce a new module for all the functions
that are shared between the 3 different PHY family.

Since the drivers are actually detached, new probe function are
introduced that allocate the specific priv struct for the PHYs.

After this patch, qca808x will be further generalized as LED
and cable test function are also used by the QCA807x PHYs.
This is just for reference and the additional function move will
be done on the relates specific series.

This is also needed in preparation for the introduction of
qca807x PHYs family and PHY package concept.
====================

Link: https://lore.kernel.org/r/20240129141600.2592-1-ansuelsmth@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3a78983d c89414ad

drivers/net/phy/Kconfig

+1 −6
Original line number Diff line number Diff line
@@ -335,12 +335,7 @@ config NCN26000_PHY 
	  Currently supports the NCN26000 10BASE-T1S Industrial PHY

	  with MII interface.



config AT803X_PHY

	tristate "Qualcomm Atheros AR803X PHYs and QCA833x PHYs"

	depends on REGULATOR

	help

	  Currently supports the AR8030, AR8031, AR8033, AR8035 and internal

	  QCA8337(Internal qca8k PHY) model

source "drivers/net/phy/qcom/Kconfig"



config QSEMI_PHY

	tristate "Quality Semiconductor PHYs"

drivers/net/phy/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ obj-$(CONFIG_ADIN_PHY) += adin.o 
obj-$(CONFIG_ADIN1100_PHY)	+= adin1100.o

obj-$(CONFIG_AMD_PHY)		+= amd.o

obj-$(CONFIG_AQUANTIA_PHY)	+= aquantia/

obj-$(CONFIG_AT803X_PHY)	+= at803x.o

ifdef CONFIG_AX88796B_RUST_PHY

  obj-$(CONFIG_AX88796B_PHY)	+= ax88796b_rust.o

else
@@ -91,6 +90,7 @@ endif 
obj-$(CONFIG_NXP_C45_TJA11XX_PHY)	+= nxp-c45-tja.o

obj-$(CONFIG_NXP_CBTX_PHY)	+= nxp-cbtx.o

obj-$(CONFIG_NXP_TJA11XX_PHY)	+= nxp-tja11xx.o

obj-y				+= qcom/

obj-$(CONFIG_QSEMI_PHY)		+= qsemi.o

obj-$(CONFIG_REALTEK_PHY)	+= realtek.o

obj-$(CONFIG_RENESAS_PHY)	+= uPD60620.o

drivers/net/phy/qcom/Kconfig

0 → 100644
+22 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config QCOM_NET_PHYLIB

	tristate



config AT803X_PHY

	tristate "Qualcomm Atheros AR803X PHYs"

	select QCOM_NET_PHYLIB

	depends on REGULATOR

	help

	  Currently supports the AR8030, AR8031, AR8033, AR8035 model



config QCA83XX_PHY

	tristate "Qualcomm Atheros QCA833x PHYs"

	select QCOM_NET_PHYLIB

	help

	  Currently supports the internal QCA8337(Internal qca8k PHY) model



config QCA808X_PHY

	tristate "Qualcomm QCA808x PHYs"

	select QCOM_NET_PHYLIB

	help

	  Currently supports the QCA8081 model

drivers/net/phy/qcom/Makefile

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_QCOM_NET_PHYLIB)	+= qcom-phy-lib.o

obj-$(CONFIG_AT803X_PHY)	+= at803x.o

obj-$(CONFIG_QCA83XX_PHY)	+= qca83xx.o

obj-$(CONFIG_QCA808X_PHY)	+= qca808x.o

drivers/net/phy/at803x.c→drivers/net/phy/qcom/at803x.c

+1140 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.