Skip to contentSkip to conversation

Move Hisilicon 6421v600 SPMI and USB drivers out of staging

PATCH Superseded Mauro Carvalho Chehab 2 participants 4 messages Jan 29, 2021 – Feb 4, 2021 3 messages not in the archive

Subsystems (2)
Device tree bindings Arm/HiSilicon SoC support

v7 of 15 Superseded Latest is v15 →

lore
Share & tools
lore
author
#1 lore raw

PATCH v7 14/14 dts: hisilicon: add support for the PMIC found on Hikey 970

In reply to Mauro Carvalho Chehab

Add a device tree for the HiSilicon 6421v600 SPMI PMIC, used on HiKey970 board.

As we now have support for it, change the fixed regulators used by the SD I/O to use the proper LDO supplies.

Signed-off-by Mauro Carvalho Chehab <[email protected]>
---
 .../boot/dts/hisilicon/hi3670-hikey970.dts    | 22 +----
 .../boot/dts/hisilicon/hikey970-pmic.dtsi     | 87 +++++++++++++++++++
 2 files changed, 90 insertions(+), 19 deletions(-)
 create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi
arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts +3 -19
index 7f9f9886c349..5e6d7b329771 100644
@@ -12,6 +12,7 @@
 
 #include "hi3670.dtsi"
 #include "hikey970-pinctrl.dtsi"
+#include "hikey970-pmic.dtsi"
 
 / {
 	model = "HiKey970";

@@ -39,23 +40,6 @@ memory@0 {
 		reg = <0x0 0x0 0x0 0x0>;
 	};
 
-	sd_1v8: regulator-1v8 {
-		compatible = "regulator-fixed";
-		regulator-name = "fixed-1.8V";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-		regulator-always-on;
-	};
-
-	sd_3v3: regulator-3v3 {
-		compatible = "regulator-fixed";
-		regulator-name = "fixed-3.3V";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		regulator-boot-on;
-		regulator-always-on;
-	};
-
 	wlan_en: wlan-en-1-8v {
 		compatible = "regulator-fixed";
 		regulator-name = "wlan-en-regulator";

@@ -402,8 +386,8 @@ &dwmmc1 {
 	pinctrl-0 = <&sd_pmx_func
 		     &sd_clk_cfg_func
 		     &sd_cfg_func>;
-	vmmc-supply = <&sd_3v3>;
-	vqmmc-supply = <&sd_1v8>;
+	vmmc-supply = <&ldo16>;
+	vqmmc-supply = <&ldo9>;
 	status = "okay";
 };
arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi new file +87 -0

87 lines not on this page · raw message

Signature · 7 lines
2.29.2


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Mauro Carvalho Chehab

author
#0 lore raw

v7 cover Move Hisilicon 6421v600 SPMI and USB drivers out of staging

Hi Greg/Mark/Lee/Vinod,

Another rebase , also the top of staging-testing,

This series contain the remaining patches for USB to start working, except for a final DTS patch.

Patches 1 and 2 convert the SPMI and regulator drivers to use regmap and simplifies the logic by using regmap helpers.

Patches 3 to 9 address some issues pointed by Lee at the MFD driver.

I guess the best would be if Greg could apply both patches also via the staging tree.

Patches 10 to 13 move the drivers and their corresponding DT documentation bindings out of staging.

Patch 14 contains the DT which describes the regulator, SPMI controller and MFD.

I'll submit the final patch with USB bindings after having everything set (e.g. after 5.12-rc1).

Mauro Carvalho Chehab (14):
staging: hikey9xx: spmi driver: convert to regmap
staging: hikey9xx: hi6421v600-regulator: use some regmap helpers
staging: hikey9xx: hi6421-spmi-pmic: rename some vars
staging: hikey9xx: hi6421-spmi-pmic: cleanup probe code
staging: hikey9xx: hi6421-spmi-pmic: cleanup header file
staging: hikey9xx: hi6421-spmi-pmic: fix IRQ handler code
staging: hikey9xx: hi6421-spmi-pmic: cleanup IRQ handling code
staging: hikey9xx: hi6421-spmi-pmic: document registers
staging: hikey9xx: hi6421-spmi-pmic: update copyright notes
phy: phy-hi3670-usb3: move driver from staging into phy
spmi: hisi-spmi-controller: move driver from staging
mfd: hi6421-spmi-pmic: move driver from staging
regulator: hi6421v600-regulator: move it from staging
dts: hisilicon: add support for the PMIC found on Hikey 970

 .../mfd/hisilicon,hi6421-spmi-pmic.yaml       | 135 ++++
 .../bindings/phy/hisilicon,hi3670-usb3.yaml   |  73 ++
 .../spmi/hisilicon,hisi-spmi-controller.yaml  |  75 ++
 MAINTAINERS                                   |  24 +-
 .../boot/dts/hisilicon/hi3670-hikey970.dts    |  22 +-
 .../boot/dts/hisilicon/hikey970-pmic.dtsi     |  87 +++
 drivers/mfd/Kconfig                           |  15 +
 drivers/mfd/Makefile                          |   1 +
 drivers/mfd/hi6421-spmi-pmic.c                | 296 ++++++++
 drivers/phy/hisilicon/Kconfig                 |  10 +
 drivers/phy/hisilicon/Makefile                |   1 +
 drivers/phy/hisilicon/phy-hi3670-usb3.c       | 668 ++++++++++++++++++
 drivers/regulator/Kconfig                     |   8 +
 drivers/regulator/Makefile                    |   1 +
 drivers/regulator/hi6421v600-regulator.c      | 299 ++++++++
 drivers/spmi/Kconfig                          |   9 +
 drivers/spmi/Makefile                         |   1 +
 drivers/spmi/hisi-spmi-controller.c           | 367 ++++++++++
 drivers/staging/Kconfig                       |   2 -
 drivers/staging/Makefile                      |   1 -
 drivers/staging/hikey9xx/Kconfig              |  50 --
 drivers/staging/hikey9xx/Makefile             |   7 -
 drivers/staging/hikey9xx/TODO                 |   5 -
 drivers/staging/hikey9xx/hi6421-spmi-pmic.c   | 326 ---------
 .../staging/hikey9xx/hi6421v600-regulator.c   | 336 ---------
 .../staging/hikey9xx/hisi-spmi-controller.c   | 367 ----------
 .../hikey9xx/hisilicon,hi6421-spmi-pmic.yaml  | 135 ----
 .../hisilicon,hisi-spmi-controller.yaml       |  75 --
 drivers/staging/hikey9xx/phy-hi3670-usb3.c    | 668 ------------------
 drivers/staging/hikey9xx/phy-hi3670-usb3.yaml |  73 --
 include/linux/mfd/hi6421-spmi-pmic.h          |  28 +-
 31 files changed, 2072 insertions(+), 2093 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml
 create mode 100644 Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml
 create mode 100644 Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.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/phy/hisilicon/phy-hi3670-usb3.c
 create mode 100644 drivers/regulator/hi6421v600-regulator.c
 create mode 100644 drivers/spmi/hisi-spmi-controller.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/hi6421v600-regulator.c
 delete mode 100644 drivers/staging/hikey9xx/hisi-spmi-controller.c
 delete mode 100644 drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml
 delete mode 100644 drivers/staging/hikey9xx/hisilicon,hisi-spmi-controller.yaml
 delete mode 100644 drivers/staging/hikey9xx/phy-hi3670-usb3.c
 delete mode 100644 drivers/staging/hikey9xx/phy-hi3670-usb3.yaml
Signature · 8 lines
2.29.2



_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author
#4 lore raw

Re: [PATCH v7 01/14] staging: hikey9xx: spmi driver: convert to regmap

In reply to a message not in the archive

Em Fri, 29 Jan 2021 16:45:11 +0100
Greg Kroah-Hartman <[email protected]> escreveu:

Quoted 11 lines · Mauro Carvalho Chehab
Quoted 9 lines

Instead of doing its own SPMI I/O implementation, use the already-existing regmap one.

Signed-off-by Mauro Carvalho Chehab <[email protected]>
---
 drivers/staging/hikey9xx/hi6421-spmi-pmic.c   | 115 ++++++------------
 .../staging/hikey9xx/hi6421v600-regulator.c   |  26 ++--
 include/linux/mfd/hi6421-spmi-pmic.h          |   7 +-
 3 files changed, 52 insertions(+), 96 deletions(-)
Quoted 5 lines

After applying this, I get a build failure:

ERROR: modpost: "__devm_regmap_init_spmi_ext" [drivers/staging/hikey9xx/hi6421-spmi-pmic.ko] undefined!

So you need some sort of build dependancy here :(

It seems that it is missing REGMAP_SPMI.

Quoted 3 lines

Also, when I apply the first 9 patches and stop, I get a build error that you should see as well, so I can't take any of these right now, sorry.

Gah, there was a rename patch which a hunk that went into the following patch. Sorry.

Added the missing select REGMAP_SPMI / REGMAP, fixed it and tested, patch-per-patch.

I'll run a new test at the hardware to double-check if everything is OK at the hardware and should be re-submitting the series soon enough.

Thanks,
Mauro