> To keep the generic PHY directory tidy, move the PCIe PHY driver for > Airoha AN7581 SoC to a dedicated directory. > > Also rename the driver and add the relevant SoC name to the .c and .h > file in preparation for support of PCIe and USB PHY driver for Airoha > AN7583 SoC that use a completely different implementation and > calibration for PHYs and will have their own dedicated drivers. > > The rename permits to better identify the specific usage of the driver > in the future once the airoha PHY directory will have multiple driver > for multiple SoC. > > The config is changed from PHY_AIROHA_PCIE to PHY_AIROHA_AN7581_PCIE. > > Signed-off-by: Christian Marangi Acked-by: Lorenzo Bianconi > --- > MAINTAINERS | 4 ++-- > drivers/phy/Kconfig | 11 +---------- > drivers/phy/Makefile | 4 ++-- > drivers/phy/airoha/Kconfig | 13 +++++++++++++ > drivers/phy/airoha/Makefile | 3 +++ > .../phy-an7581-pcie-regs.h} | 2 +- > .../{phy-airoha-pcie.c => airoha/phy-an7581-pcie.c} | 6 +++--- > 7 files changed, 25 insertions(+), 18 deletions(-) > create mode 100644 drivers/phy/airoha/Kconfig > create mode 100644 drivers/phy/airoha/Makefile > rename drivers/phy/{phy-airoha-pcie-regs.h => airoha/phy-an7581-pcie-regs.h} (99%) > rename drivers/phy/{phy-airoha-pcie.c => airoha/phy-an7581-pcie.c} (99%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 932044785a39..7bea8c620da8 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -759,8 +759,8 @@ M: Lorenzo Bianconi > L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) > S: Maintained > F: Documentation/devicetree/bindings/phy/airoha,en7581-pcie-phy.yaml > -F: drivers/phy/phy-airoha-pcie-regs.h > -F: drivers/phy/phy-airoha-pcie.c > +F: drivers/phy/airoha/phy-an7581-pcie-regs.h > +F: drivers/phy/airoha/phy-an7581-pcie.c > > AIROHA SPI SNFI DRIVER > M: Lorenzo Bianconi > diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig > index 227b9a4c612e..f9cd765a3ccc 100644 > --- a/drivers/phy/Kconfig > +++ b/drivers/phy/Kconfig > @@ -46,16 +46,6 @@ config GENERIC_PHY_MIPI_DPHY > Provides a number of helpers a core functions for MIPI D-PHY > drivers to us. > > -config PHY_AIROHA_PCIE > - tristate "Airoha PCIe-PHY Driver" > - depends on ARCH_AIROHA || COMPILE_TEST > - depends on OF > - select GENERIC_PHY > - help > - Say Y here to add support for Airoha PCIe PHY driver. > - This driver create the basic PHY instance and provides initialize > - callback for PCIe GEN3 port. > - > config PHY_CAN_TRANSCEIVER > tristate "CAN transceiver PHY" > select GENERIC_PHY > @@ -133,6 +123,7 @@ config PHY_XGENE > help > This option enables support for APM X-Gene SoC multi-purpose PHY. > > +source "drivers/phy/airoha/Kconfig" > source "drivers/phy/allwinner/Kconfig" > source "drivers/phy/amlogic/Kconfig" > source "drivers/phy/apple/Kconfig" > diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile > index f49d83f00a3d..84062279fa63 100644 > --- a/drivers/phy/Makefile > +++ b/drivers/phy/Makefile > @@ -7,7 +7,6 @@ obj-$(CONFIG_PHY_COMMON_PROPS) += phy-common-props.o > obj-$(CONFIG_PHY_COMMON_PROPS_TEST) += phy-common-props-test.o > obj-$(CONFIG_GENERIC_PHY) += phy-core.o > obj-$(CONFIG_GENERIC_PHY_MIPI_DPHY) += phy-core-mipi-dphy.o > -obj-$(CONFIG_PHY_AIROHA_PCIE) += phy-airoha-pcie.o > obj-$(CONFIG_PHY_CAN_TRANSCEIVER) += phy-can-transceiver.o > obj-$(CONFIG_PHY_GOOGLE_USB) += phy-google-usb.o > obj-$(CONFIG_USB_LGM_PHY) += phy-lgm-usb.o > @@ -17,7 +16,8 @@ obj-$(CONFIG_PHY_PISTACHIO_USB) += phy-pistachio-usb.o > obj-$(CONFIG_PHY_SNPS_EUSB2) += phy-snps-eusb2.o > obj-$(CONFIG_PHY_XGENE) += phy-xgene.o > > -obj-$(CONFIG_GENERIC_PHY) += allwinner/ \ > +obj-$(CONFIG_GENERIC_PHY) += airoha/ \ > + allwinner/ \ > amlogic/ \ > apple/ \ > broadcom/ \ > diff --git a/drivers/phy/airoha/Kconfig b/drivers/phy/airoha/Kconfig > new file mode 100644 > index 000000000000..9a1b625a7701 > --- /dev/null > +++ b/drivers/phy/airoha/Kconfig > @@ -0,0 +1,13 @@ > +# SPDX-License-Identifier: GPL-2.0-only > +# > +# Phy drivers for Airoha devices > +# > +config PHY_AIROHA_AN7581_PCIE > + tristate "Airoha AN7581 PCIe-PHY Driver" > + depends on ARCH_AIROHA || COMPILE_TEST > + depends on OF > + select GENERIC_PHY > + help > + Say Y here to add support for Airoha AN7581 PCIe PHY driver. > + This driver create the basic PHY instance and provides initialize > + callback for PCIe GEN3 port. > diff --git a/drivers/phy/airoha/Makefile b/drivers/phy/airoha/Makefile > new file mode 100644 > index 000000000000..912f3e11a061 > --- /dev/null > +++ b/drivers/phy/airoha/Makefile > @@ -0,0 +1,3 @@ > +# SPDX-License-Identifier: GPL-2.0 > + > +obj-$(CONFIG_PHY_AIROHA_AN7581_PCIE) += phy-an7581-pcie.o > diff --git a/drivers/phy/phy-airoha-pcie-regs.h b/drivers/phy/airoha/phy-an7581-pcie-regs.h > similarity index 99% > rename from drivers/phy/phy-airoha-pcie-regs.h > rename to drivers/phy/airoha/phy-an7581-pcie-regs.h > index 58572c793722..b938a7b468fe 100644 > --- a/drivers/phy/phy-airoha-pcie-regs.h > +++ b/drivers/phy/airoha/phy-an7581-pcie-regs.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0-only */ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (c) 2024 AIROHA Inc > * Author: Lorenzo Bianconi > diff --git a/drivers/phy/phy-airoha-pcie.c b/drivers/phy/airoha/phy-an7581-pcie.c > similarity index 99% > rename from drivers/phy/phy-airoha-pcie.c > rename to drivers/phy/airoha/phy-an7581-pcie.c > index 56e9ade8a9fd..81ddf0e7638b 100644 > --- a/drivers/phy/phy-airoha-pcie.c > +++ b/drivers/phy/airoha/phy-an7581-pcie.c > @@ -13,7 +13,7 @@ > #include > #include > > -#include "phy-airoha-pcie-regs.h" > +#include "phy-an7581-pcie-regs.h" > > #define LEQ_LEN_CTRL_MAX_VAL 7 > #define FREQ_LOCK_MAX_ATTEMPT 10 > @@ -1279,12 +1279,12 @@ MODULE_DEVICE_TABLE(of, airoha_pcie_phy_of_match); > static struct platform_driver airoha_pcie_phy_driver = { > .probe = airoha_pcie_phy_probe, > .driver = { > - .name = "airoha-pcie-phy", > + .name = "airoha-an7581-pcie-phy", > .of_match_table = airoha_pcie_phy_of_match, > }, > }; > module_platform_driver(airoha_pcie_phy_driver); > > -MODULE_DESCRIPTION("Airoha PCIe PHY driver"); > +MODULE_DESCRIPTION("Airoha AN7581 PCIe PHY driver"); > MODULE_AUTHOR("Lorenzo Bianconi "); > MODULE_LICENSE("GPL"); > -- > 2.53.0 >