phy: phy-hi3670-usb3: move driver from staging into phy

The phy USB3 driver for Hisilicon 970 (hi3670) is ready
for mainstream. Mode it from staging into the main driver's
phy/ directory.

Acked-by: Rob Herring <robh@kernel.org>
Acked-By: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/dcf66a01aaeaab93cda52f9a283ecbdf9fa71bb8.1624606660.git.mchehab+huawei@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/hikey9xx/phy-hi3670-usb3.yaml b/Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml
similarity index 100%
rename from drivers/staging/hikey9xx/phy-hi3670-usb3.yaml
rename to Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml

diff --git a/MAINTAINERS b/MAINTAINERS
index 9bf553e53f0faaeadd5eb8dbecf857413aa7bd0b..c5730484254c68c681fbe8d0ed69ecf4b618d0de 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -18878,7 +18878,7 @@ L:      linux-usb@vger.kernel.org
 S:     Maintained
 F:     drivers/usb/roles/intel-xhci-usb-role-switch.c
 
-USB IP DRIVER FOR HISILICON KIRIN
+USB IP DRIVER FOR HISILICON KIRIN 960
 M:     Yu Chen <chenyu56@huawei.com>
 M:     Binghui Wang <wangbinghui@hisilicon.com>
 L:     linux-usb@vger.kernel.org
@@ -18886,6 +18886,13 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml
 F:     drivers/phy/hisilicon/phy-hi3660-usb3.c
 
+USB IP DRIVER FOR HISILICON KIRIN 970
+M:     Mauro Carvalho Chehab <mchehab@kernel.org>
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml
+F:     drivers/phy/hisilicon/phy-kirin970-usb3.c
+
 USB ISP116X DRIVER
 M:     Olav Kongas <ok@artecdesign.ee>
 L:     linux-usb@vger.kernel.org

diff --git a/drivers/phy/hisilicon/Kconfig b/drivers/phy/hisilicon/Kconfig
index 1c73053bcc98234faf485f4f53ef49edd7a5c312..4d008cfc279c67c501c220c1c95acaf6a20f4363 100644 (file)
--- a/drivers/phy/hisilicon/Kconfig
+++ b/drivers/phy/hisilicon/Kconfig
@@ -23,6 +23,16 @@ config PHY_HI3660_USB
 
          To compile this driver as a module, choose M here.
 
+config PHY_HI3670_USB
+       tristate "hi3670 USB PHY support"
+       depends on (ARCH_HISI && ARM64) || COMPILE_TEST
+       select GENERIC_PHY
+       select MFD_SYSCON
+       help
+         Enable this to support the HISILICON HI3670 USB PHY.
+
+         To compile this driver as a module, choose M here.
+
 config PHY_HISTB_COMBPHY
        tristate "HiSilicon STB SoCs COMBPHY support"
        depends on (ARCH_HISI && ARM64) || COMPILE_TEST

diff --git a/drivers/phy/hisilicon/Makefile b/drivers/phy/hisilicon/Makefile
index 92e874ae9c744ec13bc420bed33a060159db1512..51729868145b07988401a783b8a4d51dbacc1e24 100644 (file)
--- a/drivers/phy/hisilicon/Makefile
+++ b/drivers/phy/hisilicon/Makefile
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_PHY_HI6220_USB)           += phy-hi6220-usb.o
 obj-$(CONFIG_PHY_HI3660_USB)           += phy-hi3660-usb3.o
+obj-$(CONFIG_PHY_HI3670_USB)           += phy-hi3670-usb3.o
 obj-$(CONFIG_PHY_HISTB_COMBPHY)                += phy-histb-combphy.o
 obj-$(CONFIG_PHY_HISI_INNO_USB2)       += phy-hisi-inno-usb2.o
 obj-$(CONFIG_PHY_HIX5HD2_SATA)         += phy-hix5hd2-sata.o

diff --git a/drivers/staging/hikey9xx/phy-hi3670-usb3.c b/drivers/phy/hisilicon/phy-hi3670-usb3.c
similarity index 100%
rename from drivers/staging/hikey9xx/phy-hi3670-usb3.c
rename to drivers/phy/hisilicon/phy-hi3670-usb3.c

diff --git a/drivers/staging/hikey9xx/Kconfig b/drivers/staging/hikey9xx/Kconfig
index c4dc1016edf22eba53ceb101e42897292a61c971..3ceda03f2864b69760f1616b94ae30bff1ba51da 100644 (file)
--- a/drivers/staging/hikey9xx/Kconfig
+++ b/drivers/staging/hikey9xx/Kconfig
@@ -1,16 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
 
-# to be placed at drivers/phy
-config PHY_HI3670_USB
-       tristate "hi3670 USB PHY support"
-       depends on (ARCH_HISI && ARM64) || COMPILE_TEST
-       select GENERIC_PHY
-       select MFD_SYSCON
-       help
-         Enable this to support the HISILICON HI3670 USB PHY.
-
-         To compile this driver as a module, choose M here.
-
 # to be placed at drivers/spmi
 config SPMI_HISI3670
        tristate "Hisilicon 3670 SPMI Controller"

diff --git a/drivers/staging/hikey9xx/Makefile b/drivers/staging/hikey9xx/Makefile
index 9103735d837750c77b3b697f48d74d089397ec81..42d4861045255bb07cf29c11d114b11d3b671b69 100644 (file)
--- a/drivers/staging/hikey9xx/Makefile
+++ b/drivers/staging/hikey9xx/Makefile
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
 
-obj-$(CONFIG_PHY_HI3670_USB)           += phy-hi3670-usb3.o
-
 obj-$(CONFIG_SPMI_HISI3670)            += hisi-spmi-controller.o
 obj-$(CONFIG_MFD_HI6421_SPMI)          += hi6421-spmi-pmic.o