kevin/linux
1
Fork 0
Code

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

Browse Source 
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>
This commit is contained in:
Mauro Carvalho Chehab 2021-06-25 09:45:54 +02:00 committed by Greg Kroah-Hartman
parent 8de6b7edd4
commit e562cf3aea
8 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
drivers/staging/hikey9xx/hisilicon,hisi-spmi-controller.yaml → Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml
View File

7
MAINTAINERS
View File

@ -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

9
drivers/spmi/Kconfig
View File

@ -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

1
drivers/spmi/Makefile
View File

@ -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

0
drivers/staging/hikey9xx/hisi-spmi-controller.c → drivers/spmi/hisi-spmi-controller.c
View File

11
drivers/staging/hikey9xx/Kconfig
View File

@ -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"

1
drivers/staging/hikey9xx/Makefile
View File

@ -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

2
drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml
View File

@ -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: