phy: move spacemit pcie driver to its subfolder

Commit fe4bc1a08638 ("phy: spacemit: support K1 USB2.0 PHY controller")
created spacemit subfolder with usb driver while commit 57e920b92724
("phy: spacemit: Introduce PCIe/combo PHY") added pcie driver in phy
folder. Move latter into spacemit subfolder and rename file to
phy-k1-pcie.c

Reviewed-by: Alex Elder <elder@riscstar.com>
Reviewed-by: Yixun Lan <dlan@kernel.org>
Link: https://patch.msgid.link/20260223064240.386617-1-vkoul@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 02467dfd4fb0a738a1e070533a3cfbc7d74d4ddd..c0574e44f0a3436aded80a126c93f4010b0cf66d 100644 (file)
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -134,18 +134,6 @@ config PHY_NXP_PTN3222
          schemes. It supports all three USB 2.0 data rates: Low Speed, Full
          Speed and High Speed.
 
-config PHY_SPACEMIT_K1_PCIE
-       tristate "PCIe and combo PHY driver for the SpacemiT K1 SoC"
-       depends on ARCH_SPACEMIT || COMPILE_TEST
-       depends on COMMON_CLK
-       depends on HAS_IOMEM
-       depends on OF
-       select GENERIC_PHY
-       default ARCH_SPACEMIT
-       help
-         Enable support for the PCIe and USB 3 combo PHY and two
-         PCIe-only PHYs used in the SpacemiT K1 SoC.
-
 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 a648c2e02a830638c4a5e68601f94dd613a0eb96..2773d596e543310db3d90a367a8ebdf5ae9585c7 100644 (file)
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_PHY_SNPS_EUSB2)          += phy-snps-eusb2.o
 obj-$(CONFIG_USB_LGM_PHY)              += phy-lgm-usb.o
 obj-$(CONFIG_PHY_AIROHA_PCIE)          += phy-airoha-pcie.o
 obj-$(CONFIG_PHY_NXP_PTN3222)          += phy-nxp-ptn3222.o
-obj-$(CONFIG_PHY_SPACEMIT_K1_PCIE)     += phy-spacemit-k1-pcie.o
 obj-$(CONFIG_GENERIC_PHY)              += allwinner/   \
                                           amlogic/     \
                                           apple/       \

diff --git a/drivers/phy/spacemit/Kconfig b/drivers/phy/spacemit/Kconfig
index 0136aee2e8a2f5f484da136b26f80130794b992c..50b0005acf663490716fefdf6a7a50bf535aa1d1 100644 (file)
--- a/drivers/phy/spacemit/Kconfig
+++ b/drivers/phy/spacemit/Kconfig
@@ -2,6 +2,18 @@
 #
 # Phy drivers for SpacemiT platforms
 #
+config PHY_SPACEMIT_K1_PCIE
+       tristate "PCIe and combo PHY driver for the SpacemiT K1 SoC"
+       depends on ARCH_SPACEMIT || COMPILE_TEST
+       depends on COMMON_CLK
+       depends on HAS_IOMEM
+       depends on OF
+       select GENERIC_PHY
+       default ARCH_SPACEMIT
+       help
+         Enable support for the PCIe and USB 3 combo PHY and two
+         PCIe-only PHYs used in the SpacemiT K1 SoC.
+
 config PHY_SPACEMIT_K1_USB2
        tristate "SpacemiT K1 USB 2.0 PHY support"
        depends on (ARCH_SPACEMIT || COMPILE_TEST) && OF

diff --git a/drivers/phy/spacemit/Makefile b/drivers/phy/spacemit/Makefile
index fec0b425a948541b39b814caef0b05e1e002d92f..a821a21d614229af8e873b5e6f85b4ea968e5636 100644 (file)
--- a/drivers/phy/spacemit/Makefile
+++ b/drivers/phy/spacemit/Makefile
@@ -1,2 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
+obj-$(CONFIG_PHY_SPACEMIT_K1_PCIE)             += phy-k1-pcie.o
 obj-$(CONFIG_PHY_SPACEMIT_K1_USB2)             += phy-k1-usb2.o

diff --git a/drivers/phy/phy-spacemit-k1-pcie.c b/drivers/phy/spacemit/phy-k1-pcie.c
similarity index 100%
rename from drivers/phy/phy-spacemit-k1-pcie.c
rename to drivers/phy/spacemit/phy-k1-pcie.c