spmi: hisi-spmi-controller: move driver from staging

The Hisilicon 6421v600 SPMI driver is ready for mainstream.

So, move it from staging.

Acked-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/35b9f9169889c1f4d51eff8bf2035450c9e02576.1624606660.git.mchehab+huawei@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

diff --git a/MAINTAINERS b/MAINTAINERS
index c5730484254c68c681fbe8d0ed69ecf4b618d0de..13339228f065b75652fde61d6cdb2502151789d9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8282,6 +8282,13 @@ S:       Maintained
 W:     http://www.hisilicon.com
 F:     drivers/spi/spi-hisi-kunpeng.c
 
+HISILICON SPMI CONTROLLER DRIVER FOR HIKEY 970
+M:     Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml
+F:     drivers/spmi/hisi-spmi-controller.c
+
 HISILICON STAGING DRIVERS FOR HIKEY 960/970
 M:     Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
 S:     Maintained

diff --git a/drivers/spmi/Kconfig b/drivers/spmi/Kconfig
index a53bad541f1a34686cb5b14a60708923db823de1..2874b6c26028b45136bd3dc2b2c3ebff95ae94ea 100644 (file)
--- a/drivers/spmi/Kconfig
+++ b/drivers/spmi/Kconfig
@@ -11,6 +11,15 @@ menuconfig SPMI
 
 if SPMI
 
+config SPMI_HISI3670
+       tristate "Hisilicon 3670 SPMI Controller"
+       select IRQ_DOMAIN_HIERARCHY
+       depends on HAS_IOMEM
+       help
+         If you say yes to this option, support will be included for the
+         built-in SPMI PMIC Arbiter interface on Hisilicon 3670
+         processors.
+
 config SPMI_MSM_PMIC_ARB
        tristate "Qualcomm MSM SPMI Controller (PMIC Arbiter)"
        select IRQ_DOMAIN_HIERARCHY

diff --git a/drivers/spmi/Makefile b/drivers/spmi/Makefile
index 55a94cadeffe4b0a955b48ef7219f53db3f8e959..6e092e6f290c0c71b1851551440214e63a037c48 100644 (file)
--- a/drivers/spmi/Makefile
+++ b/drivers/spmi/Makefile
@@ -4,4 +4,5 @@
 #
 obj-$(CONFIG_SPMI)     += spmi.o
 
+obj-$(CONFIG_SPMI_HISI3670)    += hisi-spmi-controller.o
 obj-$(CONFIG_SPMI_MSM_PMIC_ARB)        += spmi-pmic-arb.o

diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/spmi/hisi-spmi-controller.c
similarity index 100%
rename from drivers/staging/hikey9xx/hisi-spmi-controller.c
rename to drivers/spmi/hisi-spmi-controller.c

diff --git a/drivers/staging/hikey9xx/Kconfig b/drivers/staging/hikey9xx/Kconfig
index 3ceda03f2864b69760f1616b94ae30bff1ba51da..9f53df9068fee0f9829b601a604f4f43cccf52ae 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/spmi
-config SPMI_HISI3670
-       tristate "Hisilicon 3670 SPMI Controller"
-       select IRQ_DOMAIN_HIERARCHY
-       depends on HAS_IOMEM
-       depends on SPMI
-       help
-         If you say yes to this option, support will be included for the
-         built-in SPMI PMIC Arbiter interface on Hisilicon 3670
-         processors.
-
 # to be placed at drivers/mfd
 config MFD_HI6421_SPMI
        tristate "HiSilicon Hi6421v600 SPMI PMU/Codec IC"

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

diff --git a/drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml b/drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml
index 3b23ad56b31ac984ffad8555f1defc4afdef5aba..d57316c57d7b0df54d628af63361a733cc7b90ef 100644 (file)
--- a/drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml
+++ b/drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml
@@ -17,7 +17,7 @@ description: |
   node.
 
   The SPMI controller part is provided by
-  drivers/staging/hikey9xx/hisilicon,hisi-spmi-controller.yaml.
+  Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml
 
 properties:
   $nodename: