Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Mauro Carvalho Chehab and committed by
Greg Kroah-Hartman
e562cf3a 8de6b7ed

+18 -13
+7
MAINTAINERS
··· 8282 8282 W: http://www.hisilicon.com 8283 8283 F: drivers/spi/spi-hisi-kunpeng.c 8284 8284 8285 + HISILICON SPMI CONTROLLER DRIVER FOR HIKEY 970 8286 + M: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> 8287 + L: linux-kernel@vger.kernel.org 8288 + S: Maintained 8289 + F: Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml 8290 + F: drivers/spmi/hisi-spmi-controller.c 8291 + 8285 8292 HISILICON STAGING DRIVERS FOR HIKEY 960/970 8286 8293 M: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> 8287 8294 S: Maintained
+9
drivers/spmi/Kconfig
··· 11 11 12 12 if SPMI 13 13 14 + config SPMI_HISI3670 15 + tristate "Hisilicon 3670 SPMI Controller" 16 + select IRQ_DOMAIN_HIERARCHY 17 + depends on HAS_IOMEM 18 + help 19 + If you say yes to this option, support will be included for the 20 + built-in SPMI PMIC Arbiter interface on Hisilicon 3670 21 + processors. 22 + 14 23 config SPMI_MSM_PMIC_ARB 15 24 tristate "Qualcomm MSM SPMI Controller (PMIC Arbiter)" 16 25 select IRQ_DOMAIN_HIERARCHY
+1
drivers/spmi/Makefile
··· 4 4 # 5 5 obj-$(CONFIG_SPMI) += spmi.o 6 6 7 + obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o 7 8 obj-$(CONFIG_SPMI_MSM_PMIC_ARB) += spmi-pmic-arb.o
-11
drivers/staging/hikey9xx/Kconfig
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 3 - # to be placed at drivers/spmi 4 - config SPMI_HISI3670 5 - tristate "Hisilicon 3670 SPMI Controller" 6 - select IRQ_DOMAIN_HIERARCHY 7 - depends on HAS_IOMEM 8 - depends on SPMI 9 - help 10 - If you say yes to this option, support will be included for the 11 - built-in SPMI PMIC Arbiter interface on Hisilicon 3670 12 - processors. 13 - 14 3 # to be placed at drivers/mfd 15 4 config MFD_HI6421_SPMI 16 5 tristate "HiSilicon Hi6421v600 SPMI PMU/Codec IC"
-1
drivers/staging/hikey9xx/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 3 - obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o 4 3 obj-$(CONFIG_MFD_HI6421_SPMI) += hi6421-spmi-pmic.o
drivers/staging/hikey9xx/hisi-spmi-controller.c drivers/spmi/hisi-spmi-controller.c
+1 -1
drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml
··· 17 17 node. 18 18 19 19 The SPMI controller part is provided by 20 - drivers/staging/hikey9xx/hisilicon,hisi-spmi-controller.yaml. 20 + Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml 21 21 22 22 properties: 23 23 $nodename:
drivers/staging/hikey9xx/hisilicon,hisi-spmi-controller.yaml Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml