diff options
| author | Mark Brown <broonie@kernel.org> | 2021-07-12 11:30:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-07-12 11:30:34 +0100 |
| commit | 2c8dad1ea815f1a2003f501d9f71b9d9961f2f3a (patch) | |
| tree | 33cc3669b1f7043eb03bb0571f9e511ec38ced06 /drivers/regulator | |
| parent | fedbfea13cc0e513956abfa5c22158f0523d5687 (diff) | |
| parent | e8608f8956ff4015a206f75631a266d93e84bb2d (diff) | |
| download | linux-2c8dad1ea815f1a2003f501d9f71b9d9961f2f3a.tar.bz2 | |
Merge series "Move Hisilicon 6421v600 SPMI and USB drivers out of staging" from Mauro Carvalho Chehab <mchehab+huawei@kernel.org>:
Hi Greg,
As promised, that's the version 11, meant to be applied after -rc1.
It depends on a regression fix patch merged via the regulator's tree:
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git/commit/?h=for-5.14&id=5db5dd5be70eaf808d9fd90174b957fc5c2912cb
(the dependence is just because of a trivial merge conflict)
This series contain the final bits needed for the USB3 bus to work
without staging drivers on Hikey 970.
Mauro Carvalho Chehab (8):
staging: hi6421-spmi-pmic: add a missing dot at copyright
regulator: hi6421v600-regulator: add a missing dot at copyright
staging: hikey9xx: split hi6421v600 irq into a separate driver
staging: hi6421-spmi-pmic: cleanup drvdata
staging: hi6421-spmi-pmic: rename spmi_device struct
mfd: hi6421-spmi-pmic: move driver from staging
dts: hisilicon: add support for the PMIC found on Hikey 970
dts: hisilicon: add support for USB3 on Hikey 970
.../mfd/hisilicon,hi6421-spmi-pmic.yaml | 134 ++++++++
MAINTAINERS | 7 +
.../boot/dts/hisilicon/hi3670-hikey970.dts | 129 ++++++--
arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 56 ++++
.../boot/dts/hisilicon/hikey970-pmic.dtsi | 87 +++++
drivers/mfd/Kconfig | 16 +
drivers/mfd/Makefile | 1 +
drivers/mfd/hi6421-spmi-pmic.c | 66 ++++
drivers/misc/Kconfig | 10 +
drivers/misc/Makefile | 1 +
drivers/misc/hi6421v600-irq.c | 313 ++++++++++++++++++
drivers/regulator/hi6421v600-regulator.c | 12 +-
drivers/staging/Kconfig | 2 -
drivers/staging/Makefile | 1 -
drivers/staging/hikey9xx/Kconfig | 19 --
drivers/staging/hikey9xx/Makefile | 3 -
drivers/staging/hikey9xx/TODO | 5 -
drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 311 -----------------
.../hikey9xx/hisilicon,hi6421-spmi-pmic.yaml | 134 --------
include/linux/mfd/hi6421-spmi-pmic.h | 30 --
20 files changed, 807 insertions(+), 530 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml
create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi
create mode 100644 drivers/mfd/hi6421-spmi-pmic.c
create mode 100644 drivers/misc/hi6421v600-irq.c
delete mode 100644 drivers/staging/hikey9xx/Kconfig
delete mode 100644 drivers/staging/hikey9xx/Makefile
delete mode 100644 drivers/staging/hikey9xx/TODO
delete mode 100644 drivers/staging/hikey9xx/hi6421-spmi-pmic.c
delete mode 100644 drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml
delete mode 100644 include/linux/mfd/hi6421-spmi-pmic.h
--
2.31.1
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/hi6421v600-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/hi6421v600-regulator.c b/drivers/regulator/hi6421v600-regulator.c index 845bc3b4026d..916d4e1f9061 100644 --- a/drivers/regulator/hi6421v600-regulator.c +++ b/drivers/regulator/hi6421v600-regulator.c @@ -4,7 +4,7 @@ // // Copyright (c) 2013 Linaro Ltd. // Copyright (c) 2011 HiSilicon Ltd. -// Copyright (c) 2020-2021 Huawei Technologies Co., Ltd +// Copyright (c) 2020-2021 Huawei Technologies Co., Ltd. // // Guodong Xu <guodong.xu@linaro.org> |