spacemit: introduce P1 PMIC support
Subsystems (6)
v8 cover spacemit: introduce P1 PMIC support
The SpacemiT P1 is an I2C-controlled PMIC that implements 6 buck converters and 12 LDOs. It contains a load switch, ADC channels, GPIOs, a real-time clock, and a watchdog timer.
This series introduces a multifunction driver for the P1 PMIC as well as drivers for its regulators and RTC.
Version 7 provided the ability in "simple-mfd-i2c.c" to specify the max_register value for the regmap configuration as an alternative to providing a "full" regmap structure. The max_register value is ignored if a regmap_config is also supplied in simple_mfd_data.
Lee Jones felt the logic in v7 was more complex than it needed to be, and suggested removing the const qualifier from the global regmap_config structure used by default.
This version does what Lee suggested, and the logic is indeed simpler. However in order to avoid compile warnings the const qualifier was removed from other places as well. (Checkpatch even complains about this.)
Frankly I think my original solution--which simply used the existing ability to provide a regmap_config structure--was the best (version 5 of the series is done this way). I don't think adding simple_mfd_data->max_register provides real benefit.
https://lore.kernel.org/lkml/[email protected]/
-Alex
This series is available here:
https://github.com/riscstar/linux/tree/outgoing/pmic-v8
Between version 7 and version 8:
- Change the global regmap_config to not be const in patch 2.
Here is version 7 of this series:
https://lore.kernel.org/lkml/[email protected]/
Between version 6 and version 7:
- Revise patch 2 to preserve the option to provide a full regmap config
Here is version 6 of this series:
https://lore.kernel.org/lkml/[email protected]/
Between version 5 and version 6:
- Added Rob Herring's reviewed-by to patch 1
- Add the simple MFD functionality suggested by Lee Jones
- Update patch 3 (previously 2) accordingly
Here is version 5 of this series:
https://lore.kernel.org/lkml/[email protected]/
Between version 4 and version 5:
- Only check the seconds register for change when looping on read
- Return without re-enabling the RTC if writing registers fails
- If the RTC is disabled when reading, return an error
Here is version 4 of this series:
https://lore.kernel.org/lkml/[email protected]/
More complete history is available at that link.
Alex Elder (8):
dt-bindings: mfd: add support the SpacemiT P1 PMIC
mfd: simple-mfd-i2c: specify max_register
mfd: simple-mfd-i2c: add SpacemiT P1 support
regulator: spacemit: support SpacemiT P1 regulators
rtc: spacemit: support the SpacemiT P1 RTC
riscv: dts: spacemit: enable the i2c8 adapter
riscv: dts: spacemit: define fixed regulators
riscv: dts: spacemit: define regulator constraints
.../devicetree/bindings/mfd/spacemit,p1.yaml | 86 +++++++++ .../boot/dts/spacemit/k1-bananapi-f3.dts | 138 +++++++++++++++ arch/riscv/boot/dts/spacemit/k1-pinctrl.dtsi | 7 + arch/riscv/boot/dts/spacemit/k1.dtsi | 11 ++ drivers/mfd/Kconfig | 11 ++ drivers/mfd/simple-mfd-i2c.c | 20 ++- drivers/mfd/simple-mfd-i2c.h | 3 +- drivers/regulator/Kconfig | 12 ++ drivers/regulator/Makefile | 1 + drivers/regulator/spacemit-p1.c | 157 ++++++++++++++++ drivers/rtc/Kconfig | 10 ++ drivers/rtc/Makefile | 1 + drivers/rtc/rtc-spacemit-p1.c | 167 ++++++++++++++++++ 13 files changed, 621 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/spacemit,p1.yaml create mode 100644 drivers/regulator/spacemit-p1.c create mode 100644 drivers/rtc/rtc-spacemit-p1.c
base-commit: b551c4e2a98a177a06148cf16505643cd2108386
Signature · 1 line
2.45.2
PATCH v8 1/8 dt-bindings: mfd: add support the SpacemiT P1 PMIC
Enable the SpacemiT P1, which is an I2C-controlled PMIC. Initially only the RTC and regulators will be supported.
--- .../devicetree/bindings/mfd/spacemit,p1.yaml | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/spacemit,p1.yaml
Documentation/devicetree/bindings/mfd/spacemit,p1.yaml new file +86 -0
@@ -0,0 +1,86 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mfd/spacemit,p1.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: SpacemiT P1 Power Management Integrated Circuit + +maintainers: + - Troy Mitchell <[email protected]> + +description: + P1 is an I2C-controlled PMIC produced by SpacemiT. It implements six + constant-on-time buck converters and twelve low-dropout regulators. + It also contains a load switch, watchdog timer, real-time clock, eight + 12-bit ADC channels, and six GPIOs. Additional details are available + in the "Power Stone/P1" section at the following link. + https://developer.spacemit.com/documentation + +properties: + compatible: + const: spacemit,p1 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + vin-supply: + description: Input supply phandle. + + regulators: + type: object + + patternProperties: + "^(buck[1-6]|aldo[1-4]|dldo[1-7])$": + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false + + unevaluatedProperties: false + +required: + - compatible + - reg + - interrupts + +unevaluatedProperties: false + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + + pmic@41 { + compatible = "spacemit,p1"; + reg = <0x41>; + interrupts = <64>; + + regulators { + buck1 { + regulator-name = "buck1"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3450000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + }; + + aldo1 { + regulator-name = "aldo1"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + regulator-boot-on; + }; + + dldo1 { + regulator-name = "dldo1"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + regulator-boot-on; + }; + }; + }; + };
Signature · 1 line
2.45.2
PATCH v8 2/8 mfd: simple-mfd-i2c: specify max_register
In reply to Alex ElderAll devices supported by simple MFD use the same 8-bit register 8-bit value regmap configuration. There is an option available for a device to specify a custom configuration, but no existing device uses it.
Rather than specify a "full" regmap configuration to change only the max_register value, Lee Jones suggested allowing max_register to be specified in the simple_mfd_data structure. If regmap_config and max_register are both supplied, the max_register field is ignored.
---
v8: - Use regmap_config_8r_8v, modifying it if max_register supplied
drivers/mfd/simple-mfd-i2c.c | 8 ++++++-- drivers/mfd/simple-mfd-i2c.h | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-)
drivers/mfd/simple-mfd-i2c.c +6 -2
@@ -24,15 +24,16 @@#include "simple-mfd-i2c.h" -static const struct regmap_config regmap_config_8r_8v = { +static struct regmap_config regmap_config_8r_8v = { .reg_bits =8 , .val_bits =8 , +/* .max_register can be specified in simple_mfd_data */ };static int simple_mfd_i2c_probe (struct i2c_client *i2c) {const struct simple_mfd_data *simple_mfd_data; -const struct regmap_config *regmap_config; +struct regmap_config *regmap_config;struct regmap *regmap;int ret;
@@ -43,8 +44,11 @@ static int simple_mfd_i2c_probe(struct i2c_client *i2c) regmap_config = ®map_config_8r_8v; else regmap_config = simple_mfd_data->regmap_config; +if (simple_mfd_data && !simple_mfd_data->regmap_config) + regmap_config->max_register = simple_mfd_data->max_register; regmap =devm_regmap_init_i2c (i2c, regmap_config); + regmap_config->max_register =0 ;if (IS_ERR (regmap))return PTR_ERR (regmap);
drivers/mfd/simple-mfd-i2c.h +2 -1
@@ -24,7 +24,8 @@#include <linux/regmap.h> struct simple_mfd_data { -const struct regmap_config *regmap_config; +struct regmap_config *regmap_config; +unsigned int max_register;/* Ignored if regmap_config supplied */ const struct mfd_cell *mfd_cell;size_t mfd_cell_size; };
Signature · 1 line
2.45.2
Lee Jones
maintainerRe: [PATCH v8 2/8] mfd: simple-mfd-i2c: specify max_register
Quoted 23 lines · Alex Elder
All devices supported by simple MFD use the same 8-bit register 8-bit value regmap configuration. There is an option available for a device to specify a custom configuration, but no existing device uses it.
Rather than specify a "full" regmap configuration to change only the
max_registervalue, Lee Jones suggested allowingmax_registerto be specified in thesimple_mfd_datastructure. Ifregmap_configandmax_registerare both supplied, themax_registerfield is ignored.Signed-off-by Alex Elder <[email protected]>Suggested-by Lee Jones <[email protected]>---
v8: - Useregmap_config_8r_8v, modifying it ifmax_registersupplieddrivers/mfd/simple-mfd-i2c.c | 8 ++++++-- drivers/mfd/simple-mfd-i2c.h | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-)drivers/mfd/simple-mfd-i2c.c +0
-0
drivers/mfd/simple-mfd-i2c.c line 30
Quoted 8 lines
drivers/mfd/simple-mfd-i2c.c +2
-1@@ -24,15 +24,16 @@#include "simple-mfd-i2c.h" -static const struct regmap_config regmap_config_8r_8v = { +static struct regmap_config regmap_config_8r_8v = { .reg_bits =8 , .val_bits =8 , +/* .max_register can be specified in simple_mfd_data */
Drop this comment please.
Quoted 11 lines
drivers/mfd/simple-mfd-i2c.c +1
-1};static int simple_mfd_i2c_probe (struct i2c_client *i2c) {const struct simple_mfd_data *simple_mfd_data; -const struct regmap_config *regmap_config; +struct regmap_config *regmap_config;struct regmap *regmap;int ret;
drivers/mfd/simple-mfd-i2c.c static int simple_mfd_i2c_probe(struct i2c_client *i2c) · line 48
Quoted 5 lines
drivers/mfd/simple-mfd-i2c.c +2
-0@@ -43,8 +44,11 @@ static int simple_mfd_i2c_probe(struct i2c_client *i2c) regmap_config = ®map_config_8r_8v; else regmap_config = simple_mfd_data->regmap_config; +if (simple_mfd_data && !simple_mfd_data->regmap_config) + regmap_config->max_register = simple_mfd_data->max_register;
If max_register is set in simple_mfd_data, it should take precedence.
if (simple_mfd_data && simple_mfd_data->max_register)
regmap_config->max_register = simple_mfd_data->max_register;
drivers/mfd/simple-mfd-i2c.c static int simple_mfd_i2c_probe(struct i2c_client *i2c) · line 51
Quoted 2 lines
drivers/mfd/simple-mfd-i2c.c +1
-0regmap =devm_regmap_init_i2c (i2c, regmap_config); + regmap_config->max_register =0 ;
Does max_register definitely have persistence over subsequent calls?
Quoted 20 lines
drivers/mfd/simple-mfd-i2c.c +0
-0if (IS_ERR (regmap))return PTR_ERR (regmap);drivers/mfd/simple-mfd-i2c.h +2
-1@@ -24,7 +24,8 @@#include <linux/regmap.h> struct simple_mfd_data { -const struct regmap_config *regmap_config; +struct regmap_config *regmap_config; +unsigned int max_register;/* Ignored if regmap_config supplied */ const struct mfd_cell *mfd_cell;size_t mfd_cell_size; };Signature · 1 line
2.45.2
Signature · 1 line
Lee Jones [李琼斯]
Re: [PATCH v8 2/8] mfd: simple-mfd-i2c: specify max_register
Quoted 46 lines · Lee Jones
Quoted 23 lines · Alex Elder
All devices supported by simple MFD use the same 8-bit register 8-bit value regmap configuration. There is an option available for a device to specify a custom configuration, but no existing device uses it.
Rather than specify a "full" regmap configuration to change only the
max_registervalue, Lee Jones suggested allowingmax_registerto be specified in thesimple_mfd_datastructure. Ifregmap_configandmax_registerare both supplied, themax_registerfield is ignored.Signed-off-by Alex Elder <[email protected]>Suggested-by Lee Jones <[email protected]>---
v8: - Useregmap_config_8r_8v, modifying it ifmax_registersupplieddrivers/mfd/simple-mfd-i2c.c | 8 ++++++-- drivers/mfd/simple-mfd-i2c.h | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-)drivers/mfd/simple-mfd-i2c.c +0
-0drivers/mfd/simple-mfd-i2c.c line 30
Quoted 8 lines
drivers/mfd/simple-mfd-i2c.c +2
-1@@ -24,15 +24,16 @@#include "simple-mfd-i2c.h" -static const struct regmap_config regmap_config_8r_8v = { +static struct regmap_config regmap_config_8r_8v = { .reg_bits =8 , .val_bits =8 , +/* .max_register can be specified in simple_mfd_data */ Drop this comment please.
Quoted 10 lines
drivers/mfd/simple-mfd-i2c.c +1
-1};static int simple_mfd_i2c_probe (struct i2c_client *i2c) {const struct simple_mfd_data *simple_mfd_data; -const struct regmap_config *regmap_config; +struct regmap_config *regmap_config;struct regmap *regmap;int ret;
Quoted 8 lines
drivers/mfd/simple-mfd-i2c.c static int simple_mfd_i2c_probe(struct i2c_client *i2c) · line 48
Quoted 6 lines
drivers/mfd/simple-mfd-i2c.c +2
-0@@ -43,8 +44,11 @@ static int simple_mfd_i2c_probe(struct i2c_client *i2c) regmap_config = ®map_config_8r_8v; else regmap_config = simple_mfd_data->regmap_config; +if (simple_mfd_data && !simple_mfd_data->regmap_config) + regmap_config->max_register = simple_mfd_data->max_register;If
max_registeris set insimple_mfd_data, it should take precedence.
I don't really agree with that. If simple_mfd_data->regmap_config is provided, why not use the max_register field already available there?
This is why I said above that I think this feature doesn't add much value. It provides a second way to specify something, but in the end it complicates the code more than it's worth.
The only time this new simple_mfd_data->max_register field seems to make sense is if it were the only thing provided (without simple_mfd_data->regmap_config being supplied). In that case, I see the benefit--a null simple_mfd_data->regmap_config means use regmap_config_8r_8v, and overlay it with the max_register value. The new max_register field avoids defining another huge but mostly empty regmap_config structure.
Anyway, back to your original point: I said in v7 "If both are specified, the max_register value is ignored" and I think that's the simplest. Specify one or the other--if you want to define things in regmap_config, then that's where you add your max_register. If you like regmap_config_8r_8v but want to define a max_register value, just provide max_register.
If you insist, I'll do what you say but before I sent another version I wanted to explain my reasoning.
Quoted 7 lines
if (
simple_mfd_data&&simple_mfd_data->max_register)regmap_config->max_register = simple_mfd_data->max_register;drivers/mfd/simple-mfd-i2c.c static int simple_mfd_i2c_probe(struct i2c_client *i2c) · line 51
Quoted 2 lines
drivers/mfd/simple-mfd-i2c.c +1
-0regmap =devm_regmap_init_i2c (i2c, regmap_config); + regmap_config->max_register =0 ;Does
max_registerdefinitely have persistence over subsequent calls?
It is a global variable. Isn't that how they work? When it was read-only there was no concern about that, nor about any possible concurrent access (though I don't think multiple probes can be using this code at once).
We could allocate a new one each time instead.
I think what I offered in v5 was acceptable. If you're willing to accept that I will be happy to keep discussing (and implementing) the max_register feature.
-Alex
Quoted 22 lines
Quoted 21 lines
drivers/mfd/simple-mfd-i2c.c +0
-0if (IS_ERR (regmap))return PTR_ERR (regmap);drivers/mfd/simple-mfd-i2c.h +2
-1@@ -24,7 +24,8 @@#include <linux/regmap.h> struct simple_mfd_data { -const struct regmap_config *regmap_config; +struct regmap_config *regmap_config; +unsigned int max_register;/* Ignored if regmap_config supplied */ const struct mfd_cell *mfd_cell;size_t mfd_cell_size; };Signature · 1 line
2.45.2
Lee Jones
maintainerRe: [PATCH v8 2/8] mfd: simple-mfd-i2c: specify max_register
Quoted 52 lines · Alex Elder
Quoted 34 lines · Lee Jones
Quoted 23 lines · Alex Elder
All devices supported by simple MFD use the same 8-bit register 8-bit value regmap configuration. There is an option available for a device to specify a custom configuration, but no existing device uses it.
Rather than specify a "full" regmap configuration to change only the
max_registervalue, Lee Jones suggested allowingmax_registerto be specified in thesimple_mfd_datastructure. Ifregmap_configandmax_registerare both supplied, themax_registerfield is ignored.Signed-off-by Alex Elder <[email protected]>Suggested-by Lee Jones <[email protected]>---
v8: - Useregmap_config_8r_8v, modifying it ifmax_registersupplieddrivers/mfd/simple-mfd-i2c.c | 8 ++++++-- drivers/mfd/simple-mfd-i2c.h | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-)drivers/mfd/simple-mfd-i2c.c +0
-0drivers/mfd/simple-mfd-i2c.c line 28
Quoted 6 lines
drivers/mfd/simple-mfd-i2c.c +2
-1@@ -24,15 +24,16 @@#include "simple-mfd-i2c.h" -static const struct regmap_config regmap_config_8r_8v = { +static struct regmap_config regmap_config_8r_8v = { .reg_bits =8 , .val_bits =8 , +/* .max_register can be specified in simple_mfd_data */ Drop this comment please.
Quoted 16 lines
Quoted 9 lines
drivers/mfd/simple-mfd-i2c.c +1
-1};static int simple_mfd_i2c_probe (struct i2c_client *i2c) {const struct simple_mfd_data *simple_mfd_data; -const struct regmap_config *regmap_config; +struct regmap_config *regmap_config;struct regmap *regmap;int ret;drivers/mfd/simple-mfd-i2c.c static int simple_mfd_i2c_probe(struct i2c_client *i2c) · line 48
Quoted 5 lines
drivers/mfd/simple-mfd-i2c.c +2
-0@@ -43,8 +44,11 @@ static int simple_mfd_i2c_probe(struct i2c_client *i2c) regmap_config = ®map_config_8r_8v; else regmap_config = simple_mfd_data->regmap_config; +if (simple_mfd_data && !simple_mfd_data->regmap_config) + regmap_config->max_register = simple_mfd_data->max_register;If
max_registeris set insimple_mfd_data, it should take precedence.
Quoted 3 lines
I don't really agree with that. If
simple_mfd_data->regmap_configis provided, why not use themax_registerfield already available there?
Why would a user add a max_register override to simple_mfd_data if they didn't want to use it?
Quoted 11 lines
This is why I said above that I think this feature doesn't add much value. It provides a second way to specify something, but in the end it complicates the code more than it's worth.
The only time this new
simple_mfd_data->max_registerfield seems to make sense is if it were the only thing provided (withoutsimple_mfd_data->regmap_configbeing supplied). In that case, I see the benefit--a nullsimple_mfd_data->regmap_configmeans useregmap_config_8r_8v, and overlay it with themax_registervalue. The newmax_registerfield avoids defining another huge but mostly emptyregmap_configstructure.
This is your use-case, right?
Quoted 9 lines
Anyway, back to your original point: I said in v7 "If both are specified, the
max_registervalue is ignored" and I think that's the simplest. Specify one or the other--if you want to define things inregmap_config, then that's where you add yourmax_register. If you likeregmap_config_8r_8vbut want to define amax_registervalue, just providemax_register.If you insist, I'll do what you say but before I sent another version I wanted to explain my reasoning.
I hear you and I get what you're saying.
I see no use-case where a user would provide both regmap_config AND max_register either. However, I see max_register in simple_mfd_data as an override, so I would like it to take precedence please.
Quoted 13 lines
Quoted 7 lines
if (
simple_mfd_data&&simple_mfd_data->max_register)regmap_config->max_register = simple_mfd_data->max_register;drivers/mfd/simple-mfd-i2c.c static int simple_mfd_i2c_probe(struct i2c_client *i2c) · line 51
Quoted 2 lines
drivers/mfd/simple-mfd-i2c.c +1
-0regmap =devm_regmap_init_i2c (i2c, regmap_config); + regmap_config->max_register =0 ;Does
max_registerdefinitely have persistence over subsequent calls?It is a global variable. Isn't that how they work? When it was read-only there was no concern about that, nor about any possible concurrent access (though I don't think multiple probes can be using this code at once).
Quoted 5 lines
We could allocate a new one each time instead.
I think what I offered in v5 was acceptable. If you're willing to accept that I will be happy to keep discussing (and implementing) the
max_registerfeature.
Yes, I'm inclined to agree.
Make the call and I will respect your decision.
Signature · 1 line
Lee Jones [李琼斯]
PATCH v8 3/8 mfd: simple-mfd-i2c: add SpacemiT P1 support
In reply to Alex ElderEnable support for the RTC and regulators found in the SpacemiT P1 PMIC. Support is implemented by the simple I2C MFD driver.
The P1 PMIC is normally implemented with the SpacemiT K1 SoC. This PMIC provides 6 buck converters and 12 LDO regulators. It also implements a switch, watchdog timer, real-time clock, and more. Initially its RTC and regulators are supported.
--- drivers/mfd/Kconfig | 11 +++++++++++ drivers/mfd/simple-mfd-i2c.c | 12 ++++++++++++ 2 files changed, 23 insertions(+)
drivers/mfd/Kconfig +11 -0
@@ -1182,6 +1182,17 @@ config MFD_QCOM_RPM Say M here if you want to include support for the Qualcomm RPM as a module. This will build a module called "qcom_rpm". +config MFD_SPACEMIT_P1 + tristate "SpacemiT P1 PMIC" + depends on I2C + select MFD_SIMPLE_MFD_I2C + help + This option supports the I2C-based SpacemiT P1 PMIC, which + contains regulators, a power switch, GPIOs, an RTC, and more. + This option is selected when any of the supported sub-devices + is configured. The basic functionality is implemented by the + simple MFD I2C driver. + config MFD_SPMI_PMIC tristate "Qualcomm SPMI PMICs" depends on ARCH_QCOM || COMPILE_TEST
drivers/mfd/simple-mfd-i2c.c +12 -0
@@ -97,12 +97,24 @@ static const struct simple_mfd_data maxim_mon_max77705 = { .mfd_cell_size = ARRAY_SIZE(max77705_sensor_cells), }; +static const struct mfd_cell spacemit_p1_cells[] = { + { .name ="spacemit-p1-regulator" , }, + { .name ="spacemit-p1-rtc" , }, +}; + +static const struct simple_mfd_data spacemit_p1 = { + .mfd_cell = spacemit_p1_cells, + .mfd_cell_size =ARRAY_SIZE (spacemit_p1_cells), + .max_register =0xaa , +}; +static const struct of_device_id simple_mfd_i2c_of_match[] = { { .compatible ="kontron,sl28cpld" }, { .compatible ="silergy,sy7636a" , .data = &silergy_sy7636a}, { .compatible ="maxim,max5970" , .data = &maxim_max5970}, { .compatible ="maxim,max5978" , .data = &maxim_max5970}, { .compatible ="maxim,max77705-battery" , .data = &maxim_mon_max77705}, + { .compatible ="spacemit,p1" , .data = &spacemit_p1, }, {} };MODULE_DEVICE_TABLE (of, simple_mfd_i2c_of_match);
Signature · 1 line
2.45.2
PATCH v8 4/8 regulator: spacemit: support SpacemiT P1 regulators
In reply to Alex ElderAdd support for the regulators found in the SpacemiT P1 PMIC. This PMIC provides 6 buck converters and 12 LDO regulators.
The PMIC is implemented as a multi-function device. These regulators are probed based on this driver being named in a MFD cell in the simple MFD I2C driver.
--- drivers/regulator/Kconfig | 12 +++ drivers/regulator/Makefile | 1 + drivers/regulator/spacemit-p1.c | 157 ++++++++++++++++++++++++++++++++ 3 files changed, 170 insertions(+) create mode 100644 drivers/regulator/spacemit-p1.c
drivers/regulator/Kconfig +12 -0
@@ -1395,6 +1395,18 @@ config REGULATOR_SLG51000 The SLG51000 is seven compact and customizable low dropout regulators. +config REGULATOR_SPACEMIT_P1 + tristate "SpacemiT P1 regulators" + depends on ARCH_SPACEMIT || COMPILE_TEST + select MFD_SPACEMIT_P1 + default ARCH_SPACEMIT + help + Enable support for regulators implemented by the SpacemiT P1 + power controller. The P1 implements 6 high-efficiency buck + converters and 12 programmable LDO regulators. To compile this + driver as a module, choose M here. The module will be called + "spacemit-pmic". + config REGULATOR_STM32_BOOSTER tristate "STMicroelectronics STM32 BOOSTER" depends on ARCH_STM32 || COMPILE_TEST
drivers/regulator/Makefile +1 -0
@@ -162,6 +162,7 @@ obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o obj-$(CONFIG_REGULATOR_SC2731) += sc2731-regulator.o obj-$(CONFIG_REGULATOR_SKY81452) += sky81452-regulator.o obj-$(CONFIG_REGULATOR_SLG51000) += slg51000-regulator.o +obj-$(CONFIG_REGULATOR_SPACEMIT_P1) += spacemit-p1.o obj-$(CONFIG_REGULATOR_STM32_BOOSTER) += stm32-booster.o obj-$(CONFIG_REGULATOR_STM32_VREFBUF) += stm32-vrefbuf.o obj-$(CONFIG_REGULATOR_STM32_PWR) += stm32-pwr.o
drivers/regulator/spacemit-p1.c new file +157 -0
157 lines not on this page · raw message
Signature · 1 line
2.45.2
PATCH v8 5/8 rtc: spacemit: support the SpacemiT P1 RTC
In reply to Alex ElderAdd support for the RTC found in the SpacemiT P1 PMIC. Initially only setting and reading the time are supported.
The PMIC is implemented as a multi-function device. This RTC is probed based on this driver being named in a MFD cell in the simple MFD I2C driver.
--- drivers/rtc/Kconfig | 10 ++ drivers/rtc/Makefile | 1 + drivers/rtc/rtc-spacemit-p1.c | 167 ++++++++++++++++++++++++++++++++++ 3 files changed, 178 insertions(+) create mode 100644 drivers/rtc/rtc-spacemit-p1.c
drivers/rtc/Kconfig +10 -0
@@ -406,6 +406,16 @@ config RTC_DRV_MAX77686 This driver can also be built as a module. If so, the module will be called rtc-max77686. +config RTC_DRV_SPACEMIT_P1 + tristate "SpacemiT P1 RTC" + depends on ARCH_SPACEMIT || COMPILE_TEST + select MFD_SPACEMIT_P1 + default ARCH_SPACEMIT + help + Enable support for the RTC function in the SpacemiT P1 PMIC. + This driver can also be built as a module, which will be called + "spacemit-p1-rtc". + config RTC_DRV_NCT3018Y tristate "Nuvoton NCT3018Y" depends on OF
drivers/rtc/Makefile +1 -0
@@ -171,6 +171,7 @@ obj-$(CONFIG_RTC_DRV_SD2405AL) += rtc-sd2405al.o obj-$(CONFIG_RTC_DRV_SD3078) += rtc-sd3078.o obj-$(CONFIG_RTC_DRV_SH) += rtc-sh.o obj-$(CONFIG_RTC_DRV_SNVS) += rtc-snvs.o +obj-$(CONFIG_RTC_DRV_SPACEMIT_P1) += rtc-spacemit-p1.o obj-$(CONFIG_RTC_DRV_SPEAR) += rtc-spear.o obj-$(CONFIG_RTC_DRV_STARFIRE) += rtc-starfire.o obj-$(CONFIG_RTC_DRV_STK17TA8) += rtc-stk17ta8.o
drivers/rtc/rtc-spacemit-p1.c new file +167 -0
167 lines not on this page · raw message
Signature · 1 line
2.45.2
Re: [PATCH v8 5/8] rtc: spacemit: support the SpacemiT P1 RTC
drivers/rtc/rtc-spacemit-p1.c line 61
Quoted 11 lines · Alex Elder
drivers/rtc/rtc-spacemit-p1.c new file +11
-0+static int p1_rtc_read_time (struct device *dev,struct rtc_time *t) +{ +struct p1_rtc *p1 =dev_get_drvdata (dev); +struct regmap *regmap = p1->regmap; +u32 count =RTC_READ_TRIES ; +u8 seconds; +u8 time[6 ]; +int ret; + +if (!regmap_test_bits (regmap,RTC_CTRL ,RTC_EN )) +return -ENODEV ;/* RTC is disabled */
That should be -EINVAL, as all the other drivers have standardized this.
With this fixed,
Quoted 109 lines
drivers/rtc/rtc-spacemit-p1.c new file +106
-0+ + ret =regmap_bulk_read (regmap,RTC_TIME , time,sizeof (time)); +if (ret) +return ret; + +do { + seconds = time[0 ]; + ret =regmap_bulk_read (regmap,RTC_TIME , time,sizeof (time)); +if (ret) +return ret; + }while (time[0 ] != seconds && --count); + +if (!count) +return -EIO ;/* Unable to get a consistent result */ + + t->tm_sec = time[0 ] &GENMASK (5 ,0 ); + t->tm_min = time[1 ] &GENMASK (5 ,0 ); + t->tm_hour = time[2 ] &GENMASK (4 ,0 ); + t->tm_mday = (time[3 ] &GENMASK (4 ,0 )) +1 ; + t->tm_mon = time[4 ] &GENMASK (3 ,0 ); + t->tm_year = (time[5 ] &GENMASK (5 ,0 )) +100 ; + +return 0 ; +} + +/* +* The P1 hardware documentation states that values in the registers are +* latched so when written they represent a consistent time snapshot. +* Nevertheless, this is not guaranteed by the implementation, so we must +* disable the RTC while updating it. +*/ +static int p1_rtc_set_time (struct device *dev,struct rtc_time *t) +{ +struct p1_rtc *p1 =dev_get_drvdata (dev); +struct regmap *regmap = p1->regmap; +u8 time[6 ]; +int ret; + + time[0 ] = t->tm_sec; + time[1 ] = t->tm_min; + time[2 ] = t->tm_hour; + time[3 ] = t->tm_mday -1 ; + time[4 ] = t->tm_mon; + time[5 ] = t->tm_year -100 ; + +/* Disable the RTC to update; re-enable again when done */ + ret =regmap_clear_bits (regmap,RTC_CTRL ,RTC_EN ); +if (ret) +return ret; + +/* If something goes wrong, leave the RTC disabled */ + ret =regmap_bulk_write (regmap,RTC_TIME , time,sizeof (time)); +if (ret) +return ret; + +return regmap_set_bits (regmap,RTC_CTRL ,RTC_EN ); +} + +static const struct rtc_class_ops p1_rtc_class_ops = { + .read_time = p1_rtc_read_time, + .set_time = p1_rtc_set_time, +}; + +static int p1_rtc_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct rtc_device *rtc; +struct p1_rtc *p1; + + p1 =devm_kzalloc (dev,sizeof (*p1),GFP_KERNEL ); +if (!p1) +return -ENOMEM ; +dev_set_drvdata (dev, p1); + + p1->regmap =dev_get_regmap (dev->parent,NULL ); +if (!p1->regmap) +return dev_err_probe (dev, -ENODEV ,"failed to get regmap\n" ); + + rtc =devm_rtc_allocate_device (dev); +if (IS_ERR (rtc)) +return dev_err_probe (dev,PTR_ERR (rtc), +"error allocating device\n" ); + p1->rtc = rtc; + + rtc->ops = &p1_rtc_class_ops; + rtc->range_min =RTC_TIMESTAMP_BEGIN_2000 ; + rtc->range_max =RTC_TIMESTAMP_END_2063 ; + +clear_bit (RTC_FEATURE_ALARM , rtc->features); +clear_bit (RTC_FEATURE_UPDATE_INTERRUPT , rtc->features); + +return devm_rtc_register_device (rtc); +} + +static struct platform_driver p1_rtc_driver = { + .probe = p1_rtc_probe, + .driver = { + .name =MOD_NAME , + }, +}; + +module_platform_driver (p1_rtc_driver); + +MODULE_DESCRIPTION ("SpacemiT P1 RTC driver" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:" MOD_NAME );Signature · 1 line
2.45.2
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [PATCH v8 5/8] rtc: spacemit: support the SpacemiT P1 RTC
Quoted 15 lines · Alexandre Belloni
drivers/rtc/rtc-spacemit-p1.c line 61
Quoted 11 lines · Alex Elder
drivers/rtc/rtc-spacemit-p1.c new file +11
-0+static int p1_rtc_read_time (struct device *dev,struct rtc_time *t) +{ +struct p1_rtc *p1 =dev_get_drvdata (dev); +struct regmap *regmap = p1->regmap; +u32 count =RTC_READ_TRIES ; +u8 seconds; +u8 time[6 ]; +int ret; + +if (!regmap_test_bits (regmap,RTC_CTRL ,RTC_EN )) +return -ENODEV ;/* RTC is disabled */ That should be
-EINVAL, as all the other drivers have standardized this.
Quoted 2 lines
With this fixed,
OK thank you. I'll plan to send v9 with this change included.
-Alex
Quoted 112 lines
Quoted 111 lines
drivers/rtc/rtc-spacemit-p1.c new file +106
-0+ + ret =regmap_bulk_read (regmap,RTC_TIME , time,sizeof (time)); +if (ret) +return ret; + +do { + seconds = time[0 ]; + ret =regmap_bulk_read (regmap,RTC_TIME , time,sizeof (time)); +if (ret) +return ret; + }while (time[0 ] != seconds && --count); + +if (!count) +return -EIO ;/* Unable to get a consistent result */ + + t->tm_sec = time[0 ] &GENMASK (5 ,0 ); + t->tm_min = time[1 ] &GENMASK (5 ,0 ); + t->tm_hour = time[2 ] &GENMASK (4 ,0 ); + t->tm_mday = (time[3 ] &GENMASK (4 ,0 )) +1 ; + t->tm_mon = time[4 ] &GENMASK (3 ,0 ); + t->tm_year = (time[5 ] &GENMASK (5 ,0 )) +100 ; + +return 0 ; +} + +/* +* The P1 hardware documentation states that values in the registers are +* latched so when written they represent a consistent time snapshot. +* Nevertheless, this is not guaranteed by the implementation, so we must +* disable the RTC while updating it. +*/ +static int p1_rtc_set_time (struct device *dev,struct rtc_time *t) +{ +struct p1_rtc *p1 =dev_get_drvdata (dev); +struct regmap *regmap = p1->regmap; +u8 time[6 ]; +int ret; + + time[0 ] = t->tm_sec; + time[1 ] = t->tm_min; + time[2 ] = t->tm_hour; + time[3 ] = t->tm_mday -1 ; + time[4 ] = t->tm_mon; + time[5 ] = t->tm_year -100 ; + +/* Disable the RTC to update; re-enable again when done */ + ret =regmap_clear_bits (regmap,RTC_CTRL ,RTC_EN ); +if (ret) +return ret; + +/* If something goes wrong, leave the RTC disabled */ + ret =regmap_bulk_write (regmap,RTC_TIME , time,sizeof (time)); +if (ret) +return ret; + +return regmap_set_bits (regmap,RTC_CTRL ,RTC_EN ); +} + +static const struct rtc_class_ops p1_rtc_class_ops = { + .read_time = p1_rtc_read_time, + .set_time = p1_rtc_set_time, +}; + +static int p1_rtc_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct rtc_device *rtc; +struct p1_rtc *p1; + + p1 =devm_kzalloc (dev,sizeof (*p1),GFP_KERNEL ); +if (!p1) +return -ENOMEM ; +dev_set_drvdata (dev, p1); + + p1->regmap =dev_get_regmap (dev->parent,NULL ); +if (!p1->regmap) +return dev_err_probe (dev, -ENODEV ,"failed to get regmap\n" ); + + rtc =devm_rtc_allocate_device (dev); +if (IS_ERR (rtc)) +return dev_err_probe (dev,PTR_ERR (rtc), +"error allocating device\n" ); + p1->rtc = rtc; + + rtc->ops = &p1_rtc_class_ops; + rtc->range_min =RTC_TIMESTAMP_BEGIN_2000 ; + rtc->range_max =RTC_TIMESTAMP_END_2063 ; + +clear_bit (RTC_FEATURE_ALARM , rtc->features); +clear_bit (RTC_FEATURE_UPDATE_INTERRUPT , rtc->features); + +return devm_rtc_register_device (rtc); +} + +static struct platform_driver p1_rtc_driver = { + .probe = p1_rtc_probe, + .driver = { + .name =MOD_NAME , + }, +}; + +module_platform_driver (p1_rtc_driver); + +MODULE_DESCRIPTION ("SpacemiT P1 RTC driver" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:" MOD_NAME );Signature · 1 line
2.45.2
PATCH v8 6/8 riscv: dts: spacemit: enable the i2c8 adapter
In reply to Alex ElderDefine properties for the I2C adapter that provides access to the SpacemiT P1 PMIC. Enable this adapter on the Banana Pi BPI-F3.
--- arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts | 15 +++++++++++++++ arch/riscv/boot/dts/spacemit/k1-pinctrl.dtsi | 7 +++++++ arch/riscv/boot/dts/spacemit/k1.dtsi | 11 +++++++++++ 3 files changed, 33 insertions(+)
arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts +15 -0
@@ -40,6 +40,21 @@ &emmc { status = "okay"; }; +&i2c8 { + pinctrl-0 = <&i2c8_cfg>; + pinctrl-names = "default"; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + pmic@41 { + compatible = "spacemit,p1"; + reg = <0x41>; + interrupts = <64>; + status = "okay"; + }; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_2_cfg>;
arch/riscv/boot/dts/spacemit/k1-pinctrl.dtsi +7 -0
@@ -11,6 +11,13 @@ #define K1_GPIO(x) (x / 32) (x % 32) &pinctrl { + i2c8_cfg: i2c8-cfg { + i2c8-0-pins { + pinmux = <K1_PADCONF(93, 0)>, /* PWR_SCL */ + <K1_PADCONF(94, 0)>; /* PWR_SDA */ + }; + }; + uart0_2_cfg: uart0-2-cfg { uart0-2-pins { pinmux = <K1_PADCONF(68, 2)>,
arch/riscv/boot/dts/spacemit/k1.dtsi +11 -0
@@ -459,6 +459,17 @@ pwm7: pwm@d401bc00 { status = "disabled"; }; + i2c8: i2c@d401d800 { + compatible = "spacemit,k1-i2c"; + reg = <0x0 0xd401d800 0x0 0x38>; + interrupts = <19>; + clocks = <&syscon_apbc CLK_TWSI8>, + <&syscon_apbc CLK_TWSI8_BUS>; + clock-names = "func", "bus"; + clock-frequency = <400000>; + status = "disabled"; + }; + pinctrl: pinctrl@d401e000 { compatible = "spacemit,k1-pinctrl"; reg = <0x0 0xd401e000 0x0 0x400>;
Signature · 1 line
2.45.2
PATCH v8 7/8 riscv: dts: spacemit: define fixed regulators
In reply to Alex ElderDefine the DC power input and the 4v power as fixed supplies in the Banana Pi BPI-F3.
--- .../boot/dts/spacemit/k1-bananapi-f3.dts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts +19 -0
@@ -28,6 +28,25 @@ led1 { default-state = "on"; }; }; + + reg_dc_in: dc-in-12v { + compatible = "regulator-fixed"; + regulator-name = "dc_in_12v"; + regulator-min-microvolt = <12000000>; + regulator-max-microvolt = <12000000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_vcc_4v: vcc-4v { + compatible = "regulator-fixed"; + regulator-name = "vcc_4v"; + regulator-min-microvolt = <4000000>; + regulator-max-microvolt = <4000000>; + regulator-boot-on; + regulator-always-on; + vin-supply = <®_dc_in>; + }; }; &emmc {
Signature · 1 line
2.45.2
PATCH v8 8/8 riscv: dts: spacemit: define regulator constraints
In reply to Alex ElderDefine basic constraints for the regulators in the SpacemiT P1 PMIC, as implemented in the Banana Pi BPI-F3.
--- .../boot/dts/spacemit/k1-bananapi-f3.dts | 104 ++++++++++++++++++ 1 file changed, 104 insertions(+)
arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts +104 -0
@@ -70,7 +70,111 @@ pmic@41 { compatible = "spacemit,p1"; reg = <0x41>; interrupts = <64>; + vin-supply = <®_vcc_4v>; status = "okay"; + + regulators { + buck1 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3450000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + }; + + buck2 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3450000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + }; + + buck3 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1800000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + }; + + buck4 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3300000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + }; + + buck5 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3450000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + }; + + buck6 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3450000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + }; + + aldo1 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + regulator-boot-on; + }; + + aldo2 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + aldo3 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + aldo4 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + dldo1 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + regulator-boot-on; + }; + + dldo2 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + dldo3 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + dldo4 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + regulator-always-on; + }; + + dldo5 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + dldo6 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + regulator-always-on; + }; + + dldo7 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + }; }; };
Signature · 1 line
2.45.2