mfd: hi6421-spmi-pmic: move driver from staging

This driver is ready for mainstream. So, move it out of staging.

Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/dd150f3ffa19c2dda0171f7dbe1dd63cce2a7af5.1627025657.git.mchehab+huawei@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml
similarity index 100%
rename from drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml
rename to Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml

diff --git a/MAINTAINERS b/MAINTAINERS
index 6c8be73..09e0dfe 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8433,6 +8433,13 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml
 F:     drivers/spmi/hisi-spmi-controller.c
 
+HISILICON SPMI PMIC DRIVER FOR HIKEY 6421v600
+M:     Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+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>
 S:     Maintained

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 6a3fd2d..01bb42f 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -510,6 +510,22 @@ config MFD_HI6421_PMIC
          menus in order to enable them.
          We communicate with the Hi6421 via memory-mapped I/O.
 
+config MFD_HI6421_SPMI
+       tristate "HiSilicon Hi6421v600 SPMI PMU/Codec IC"
+       depends on OF
+       depends on SPMI
+       select MFD_CORE
+       select REGMAP_SPMI
+       help
+         Add support for HiSilicon Hi6421v600 SPMI PMIC. Hi6421 includes
+         multi-functions, such as regulators, RTC, codec, Coulomb counter,
+         etc.
+
+         This driver includes core APIs _only_. You have to select
+         individual components like voltage regulators under corresponding
+         menus in order to enable them.
+         We communicate with the Hi6421v600 via a SPMI bus.
+
 config MFD_HI655X_PMIC
        tristate "HiSilicon Hi655X series PMU/Codec IC"
        depends on ARCH_HISI || COMPILE_TEST

diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 8116c19..570b9ff 100644 (file)
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -231,6 +231,7 @@ obj-$(CONFIG_MFD_IPAQ_MICRO)        += ipaq-micro.o
 obj-$(CONFIG_MFD_IQS62X)       += iqs62x.o
 obj-$(CONFIG_MFD_MENF21BMC)    += menf21bmc.o
 obj-$(CONFIG_MFD_HI6421_PMIC)  += hi6421-pmic-core.o
+obj-$(CONFIG_MFD_HI6421_SPMI)  += hi6421-spmi-pmic.o
 obj-$(CONFIG_MFD_HI655X_PMIC)   += hi655x-pmic.o
 obj-$(CONFIG_MFD_DLN2)         += dln2.o
 obj-$(CONFIG_MFD_RT4831)       += rt4831.o

diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/mfd/hi6421-spmi-pmic.c
similarity index 100%
rename from drivers/staging/hikey9xx/hi6421-spmi-pmic.c
rename to drivers/mfd/hi6421-spmi-pmic.c

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index c8eaae6..03ee99d 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -102,6 +102,4 @@ source "drivers/staging/qlge/Kconfig"
 
 source "drivers/staging/wfx/Kconfig"
 
-source "drivers/staging/hikey9xx/Kconfig"
-
 endif # STAGING

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 818b6f9..9a4c0e6 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -41,4 +41,3 @@ obj-$(CONFIG_XIL_AXIS_FIFO)   += axis-fifo/
 obj-$(CONFIG_FIELDBUS_DEV)     += fieldbus/
 obj-$(CONFIG_QLGE)             += qlge/
 obj-$(CONFIG_WFX)              += wfx/
-obj-y                          += hikey9xx/

diff --git a/drivers/staging/hikey9xx/Kconfig b/drivers/staging/hikey9xx/Kconfig
deleted file mode 100644 (file)
index 9f53df9..0000000
--- a/drivers/staging/hikey9xx/Kconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-
-# to be placed at drivers/mfd
-config MFD_HI6421_SPMI
-       tristate "HiSilicon Hi6421v600 SPMI PMU/Codec IC"
-       depends on HAS_IOMEM
-       depends on OF
-       depends on SPMI
-       select MFD_CORE
-       select REGMAP_SPMI
-       help
-         Add support for HiSilicon Hi6421v600 SPMI PMIC. Hi6421 includes
-         multi-functions, such as regulators, RTC, codec, Coulomb counter,
-         etc.
-
-         This driver includes core APIs _only_. You have to select
-         individual components like voltage regulators under corresponding
-         menus in order to enable them.
-         We communicate with the Hi6421v600 via a SPMI bus.

diff --git a/drivers/staging/hikey9xx/Makefile b/drivers/staging/hikey9xx/Makefile
deleted file mode 100644 (file)
index e3108d7..0000000
--- a/drivers/staging/hikey9xx/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-
-obj-$(CONFIG_MFD_HI6421_SPMI)          += hi6421-spmi-pmic.o

diff --git a/drivers/staging/hikey9xx/TODO b/drivers/staging/hikey9xx/TODO
deleted file mode 100644 (file)
index 65e7996..0000000
--- 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.