mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
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>
This commit is contained in:
parent
8de6b7edd4
commit
e562cf3aea
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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,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
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue