lkml.org 
[lkml]   [2021]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 10/14] phy: phy-hi3670-usb3: move driver from staging into phy
    Date
    The phy USB3 driver for Hisilicon 970 (hi3670) is ready
    for mainstream. Mode it from staging into the main driver's
    phy/ directory.

    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    ---
    .../bindings/phy/hisilicon,hi3670-usb3.yaml | 0
    MAINTAINERS | 9 ++++++++-
    drivers/phy/hisilicon/Kconfig | 10 ++++++++++
    drivers/phy/hisilicon/Makefile | 1 +
    .../hikey9xx => phy/hisilicon}/phy-hi3670-usb3.c | 0
    drivers/staging/hikey9xx/Kconfig | 11 -----------
    drivers/staging/hikey9xx/Makefile | 2 --
    7 files changed, 19 insertions(+), 14 deletions(-)
    rename drivers/staging/hikey9xx/phy-hi3670-usb3.yaml => Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml (100%)
    rename drivers/{staging/hikey9xx => phy/hisilicon}/phy-hi3670-usb3.c (100%)

    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 992fe3b0900a..fb49e654a1db 100644
    --- a/MAINTAINERS
    +++ b/MAINTAINERS
    @@ -18371,7 +18371,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
    @@ -18379,6 +18379,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,kirin970-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 1c73053bcc98..4d008cfc279c 100644
    --- 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 92e874ae9c74..51729868145b 100644
    --- 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 82bb4a22b286..88bdf5655d20 100644
    --- 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 1924fadac952..9371dcc3d35b 100644
    --- a/drivers/staging/hikey9xx/Makefile
    +++ b/drivers/staging/hikey9xx/Makefile
    @@ -1,7 +1,5 @@
    # 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
    obj-$(CONFIG_REGULATOR_HI6421V600) += hi6421v600-regulator.o
    --
    2.29.2
    \
     
     \ /
      Last update: 2021-01-29 20:54    [W:14.949 / U:0.980 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site