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 13/14] regulator: hi6421v600-regulator: move it from staging
    Date
    This driver is ready for mainstream. Move it out of staging.

    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    ---
    MAINTAINERS | 7 +------
    drivers/regulator/Kconfig | 9 +++++++++
    drivers/regulator/Makefile | 1 +
    .../hikey9xx => regulator}/hi6421v600-regulator.c | 0
    drivers/staging/Kconfig | 2 --
    drivers/staging/Makefile | 1 -
    drivers/staging/hikey9xx/Kconfig | 12 ------------
    drivers/staging/hikey9xx/Makefile | 3 ---
    drivers/staging/hikey9xx/TODO | 5 -----
    9 files changed, 11 insertions(+), 29 deletions(-)
    rename drivers/{staging/hikey9xx => regulator}/hi6421v600-regulator.c (100%)
    delete mode 100644 drivers/staging/hikey9xx/Kconfig
    delete mode 100644 drivers/staging/hikey9xx/Makefile
    delete mode 100644 drivers/staging/hikey9xx/TODO

    diff --git a/MAINTAINERS b/MAINTAINERS
    index 241f11b7d48a..5c5ad946c5d5 100644
    --- a/MAINTAINERS
    +++ b/MAINTAINERS
    @@ -8091,12 +8091,7 @@ L: linux-kernel@vger.kernel.org
    S: Maintained
    F: Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml
    F: drivers/mfd/hi6421-spmi-pmic.c
    -
    -HISILICON STAGING DRIVERS FOR HIKEY 960/970
    -M: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    -L: devel@driverdev.osuosl.org
    -S: Maintained
    -F: drivers/staging/hikey9xx/
    +F: drivers/regulator/hi6421v600-regulator.c

    HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT
    M: Zaibo Xu <xuzaibo@huawei.com>
    diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
    index 5abdd29fb9f3..a520c313a00d 100644
    --- a/drivers/regulator/Kconfig
    +++ b/drivers/regulator/Kconfig
    @@ -423,6 +423,15 @@ config REGULATOR_HI655X
    This driver provides support for the voltage regulators of the
    Hisilicon Hi655x PMIC device.

    +config REGULATOR_HI6421V600
    + tristate "HiSilicon Hi6421v600 PMIC voltage regulator support"
    + depends on MFD_HI6421_SPMI && OF
    + select REGMAP
    + help
    + This driver provides support for the voltage regulators on
    + HiSilicon Hi6421v600 PMU / Codec IC.
    + This is used on Kirin 3670 boards, like HiKey 970.
    +
    config REGULATOR_ISL9305
    tristate "Intersil ISL9305 regulator"
    depends on I2C
    diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
    index 680e539f6579..77e519d2bc68 100644
    --- a/drivers/regulator/Makefile
    +++ b/drivers/regulator/Makefile
    @@ -49,6 +49,7 @@ obj-$(CONFIG_REGULATOR_FAN53880) += fan53880.o
    obj-$(CONFIG_REGULATOR_GPIO) += gpio-regulator.o
    obj-$(CONFIG_REGULATOR_HI6421) += hi6421-regulator.o
    obj-$(CONFIG_REGULATOR_HI6421V530) += hi6421v530-regulator.o
    +obj-$(CONFIG_REGULATOR_HI6421V600) += hi6421v600-regulator.o
    obj-$(CONFIG_REGULATOR_HI655X) += hi655x-regulator.o
    obj-$(CONFIG_REGULATOR_ISL6271A) += isl6271a-regulator.o
    obj-$(CONFIG_REGULATOR_ISL9305) += isl9305.o
    diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/regulator/hi6421v600-regulator.c
    similarity index 100%
    rename from drivers/staging/hikey9xx/hi6421v600-regulator.c
    rename to drivers/regulator/hi6421v600-regulator.c
    diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
    index b22f73d7bfc4..db7ec218644f 100644
    --- a/drivers/staging/Kconfig
    +++ b/drivers/staging/Kconfig
    @@ -112,6 +112,4 @@ source "drivers/staging/wimax/Kconfig"

    source "drivers/staging/wfx/Kconfig"

    -source "drivers/staging/hikey9xx/Kconfig"
    -
    endif # STAGING
    diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
    index 2245059e69c7..7b0ef538dcce 100644
    --- a/drivers/staging/Makefile
    +++ b/drivers/staging/Makefile
    @@ -46,4 +46,3 @@ obj-$(CONFIG_KPC2000) += kpc2000/
    obj-$(CONFIG_QLGE) += qlge/
    obj-$(CONFIG_WIMAX) += wimax/
    obj-$(CONFIG_WFX) += wfx/
    -obj-y += hikey9xx/
    diff --git a/drivers/staging/hikey9xx/Kconfig b/drivers/staging/hikey9xx/Kconfig
    deleted file mode 100644
    index b17c047aa700..000000000000
    --- a/drivers/staging/hikey9xx/Kconfig
    +++ /dev/null
    @@ -1,12 +0,0 @@
    -# SPDX-License-Identifier: GPL-2.0
    -
    -# to be placed at drivers/regulator
    -config REGULATOR_HI6421V600
    - tristate "HiSilicon Hi6421v600 PMIC voltage regulator support"
    - depends on MFD_HI6421_SPMI && OF
    - depends on REGULATOR
    - select REGMAP
    - help
    - This driver provides support for the voltage regulators on
    - HiSilicon Hi6421v600 PMU / Codec IC.
    - This is used on Kirin 3670 boards, like HiKey 970.
    diff --git a/drivers/staging/hikey9xx/Makefile b/drivers/staging/hikey9xx/Makefile
    deleted file mode 100644
    index 4d63184e6086..000000000000
    --- a/drivers/staging/hikey9xx/Makefile
    +++ /dev/null
    @@ -1,3 +0,0 @@
    -# SPDX-License-Identifier: GPL-2.0
    -
    -obj-$(CONFIG_REGULATOR_HI6421V600) += hi6421v600-regulator.o
    diff --git a/drivers/staging/hikey9xx/TODO b/drivers/staging/hikey9xx/TODO
    deleted file mode 100644
    index 65e7996a3066..000000000000
    --- a/drivers/staging/hikey9xx/TODO
    +++ /dev/null
    @@ -1,5 +0,0 @@
    -ToDo list:
    -
    -- Port other drivers needed by Hikey 960/970;
    -- Test drivers on Hikey 960;
    -- Validate device tree bindings.
    --
    2.29.2
    \
     
     \ /
      Last update: 2021-01-29 20:56    [W:3.244 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site