spacemit: introduce P1 PMIC support
Subsystems (6)
v3 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.
This series is available here:
https://github.com/riscstar/linux/tree/outgoing/pmic-v3
-Alex
Between version 2 and version 3:
- Removed "spacemit-pmic.c" and updated "simple-mfd-i2c.c" instead
- Added an RTC driver, so that the MFD has more than one sub-device
- Other suggestions were directed at "spacemit-pmic.c"
Here is version 2 of this series:
https://lore.kernel.org/lkml/[email protected]/
Between version 1 and version 2:
- Added Reviewed-by tag from Mark Brown to patch 3
- Implemented suggestions from Vivian Wang:
- Fixed a typo in the subject line in patch 1
- Now use module_i2c_driver() for the PMIC driver in patch 2
- Added MODULE_ALIAS() for both drivers (patches 2 and 3)
- Defined and used DRV_NAME in both drivers
- Added additional Kconfig module help text for both drivers
Here is version 1 of this series:
https://lore.kernel.org/lkml/[email protected]/
Alex Elder (7):
dt-bindings: mfd: add support the SpacemiT P1 PMIC
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 | 10 ++ drivers/mfd/simple-mfd-i2c.c | 18 ++ 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-p1.c | 137 +++++++++++++++ 12 files changed, 588 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/spacemit,p1.yaml create mode 100644 drivers/regulator/spacemit-p1.c create mode 100644 drivers/rtc/rtc-p1.c
base-commit: 5d4809e25903ab8e74034c1f23c787fd26d52934
Signature · 1 line
2.45.2
PATCH v3 1/7 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 v3 2/7 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.
---
v3: - Support is now implemented in "simple-mfd-i2c.c" by defining a
"spacemit,p1" match entry with match data defining the PMIC.
drivers/mfd/Kconfig | 10 ++++++++++ drivers/mfd/simple-mfd-i2c.c | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+)
drivers/mfd/Kconfig +10 -0
@@ -1182,6 +1182,16 @@ 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" + 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 +18 -0
@@ -93,12 +93,30 @@ static const struct simple_mfd_data maxim_mon_max77705 = { .mfd_cell_size = ARRAY_SIZE(max77705_sensor_cells), }; +static const struct regmap_config spacemit_p1_regmap_config = { + .reg_bits =8 , + .val_bits =8 , + .max_register =0xaa , +}; + +static const struct mfd_cell spacemit_p1_cells[] = { + { .name ="spacemit-p1-regulator" , }, + { .name ="spacemit-p1-rtc" , }, +}; + +static const struct simple_mfd_data spacemit_p1 = { + .regmap_config = &spacemit_p1_regmap_config, + .mfd_cell = spacemit_p1_cells, + .mfd_cell_size =ARRAY_SIZE (spacemit_p1_cells), +}; +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
kernel test robot
build botRe: [PATCH v3 2/7] mfd: simple-mfd-i2c: add SpacemiT P1 support
kernel test robot noticed the following build errors:
Hi Alex,
kernel test robot noticed the following build errors:
[auto build test ERROR on 5d4809e25903ab8e74034c1f23c787fd26d52934]
url: https://github.com/intel-lab-lkp/linux/commits/Alex-Elder/dt-bindings-mfd-add-support-the-SpacemiT-P1-PMIC/20250622-113200 base: 5d4809e25903ab8e74034c1f23c787fd26d52934 patch link: https://lore.kernel.org/r/20250622032941.3768912-3-elder%40riscstar.com patch subject: [PATCH v3 2/7] mfd: simple-mfd-i2c: add SpacemiT P1 support config: i386-randconfig-017-20250623 (https://download.01.org/0day-ci/archive/20250623/[email protected]/config) compiler: clang version 20.1.2 (https://github.com/llvm/llvm-project 58df0ef89dd64126512e4ee27b4ac3fd8ddf6247) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250623/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> ld.lld: error: undefined symbol: __devm_regmap_init_i2c >>> referenced by simple-mfd-i2c.c:47 (drivers/mfd/simple-mfd-i2c.c:47) >>> drivers/mfd/simple-mfd-i2c.o:(simple_mfd_i2c_probe) in archive vmlinux.a >>> referenced by simple-mfd-i2c.c:47 (drivers/mfd/simple-mfd-i2c.c:47) >>> drivers/mfd/simple-mfd-i2c.o:(simple_mfd_i2c_probe) in archive vmlinux.a
Kconfig warnings: (for reference only)
WARNING: unmet direct dependencies detected for MFD_SIMPLE_MFD_I2C
Depends on [m]: HAS_IOMEM [=y] && I2C [=m]
Selected by [y]:
- MFD_SPACEMIT_P1 [=y] && HAS_IOMEM [=y]
Selected by [m]:
- JOYSTICK_SENSEHAT [=m] && INPUT_JOYSTICK [=y] && INPUT [=y] && I2C [=m] && HAS_IOMEM [=y]
- MFD_MAX77705 [=m] && HAS_IOMEM [=y] && I2C [=m]
- MFD_SY7636A [=m] && HAS_IOMEM [=y] && I2C [=m]
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botRe: [PATCH v3 2/7] mfd: simple-mfd-i2c: add SpacemiT P1 support
In reply to Alex Elderkernel test robot noticed the following build warnings:
Hi Alex,
kernel test robot noticed the following build warnings:
[auto build test WARNING on 5d4809e25903ab8e74034c1f23c787fd26d52934]
url: https://github.com/intel-lab-lkp/linux/commits/Alex-Elder/dt-bindings-mfd-add-support-the-SpacemiT-P1-PMIC/20250622-113200 base: 5d4809e25903ab8e74034c1f23c787fd26d52934 patch link: https://lore.kernel.org/r/20250622032941.3768912-3-elder%40riscstar.com patch subject: [PATCH v3 2/7] mfd: simple-mfd-i2c: add SpacemiT P1 support config: i386-kismet-CONFIG_MFD_SIMPLE_MFD_I2C-CONFIG_MFD_SPACEMIT_P1-0-0 (https://download.01.org/0day-ci/archive/20250623/[email protected]/config) reproduce: (https://download.01.org/0day-ci/archive/20250623/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
kismet warnings: (new ones prefixed by >>)
>> kismet: WARNING: unmet direct dependencies detected for MFD_SIMPLE_MFD_I2C when selected by MFD_SPACEMIT_P1
WARNING: unmet direct dependencies detected for MFD_SIMPLE_MFD_I2C
Depends on [n]: HAS_IOMEM [=y] && I2C [=n]
Selected by [y]:
- MFD_SPACEMIT_P1 [=y] && HAS_IOMEM [=y]
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
PATCH v3 3/7 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 v3 4/7 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.
---
v3: - Added this driver to the series, in response to Lee Jones saying
more than one MFD sub-device was required to be acceptable
drivers/rtc/Kconfig | 10 ++++ drivers/rtc/Makefile | 1 + drivers/rtc/rtc-p1.c | 137 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+) create mode 100644 drivers/rtc/rtc-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_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_P1) += rtc-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-p1.c new file +137 -0
137 lines not on this page · raw message
Signature · 1 line
2.45.2
Re: [PATCH v3 4/7] rtc: spacemit: support the SpacemiT P1 RTC
W dniu 22.06.2025 o 05:29, Alex Elder pisze:
Quoted 11 lines
Add 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.
Signed-off-by Alex Elder <[email protected]>---
v3: - Added this driver to the series, in response to Lee Jones saying
more than one MFD sub-device was required to be acceptable
[snip]
drivers/rtc/rtc-p1.c line 47
Quoted 9 lines
drivers/rtc/rtc-p1.c new file +9
-0+static int p1_rtc_read_time (struct device *dev,struct rtc_time *t) +{ +struct p1_rtc *p1 =dev_get_drvdata (dev); +u8 time[tu_count]; +int ret; + + ret =regmap_bulk_read (p1->regmap,RTC_COUNT_BASE , &time,sizeof (time)); +if (ret) +return ret;
Hello,
Are you sure that you read the time parts consistently here? I mean:
is there a risk that the clock is updating below you - so that for example during the transition
12:59:59 -> 13:00:00
you are going to read 12:00:00 or 12:59:00?
If so, you could for example read the time in a loop until you get two same readouts.
drivers/rtc/rtc-p1.c line 54
Quoted 7 lines
drivers/rtc/rtc-p1.c new file +7
-0+ + t->tm_sec = time[tu_second] &GENMASK (5 ,0 ); + t->tm_min = time[tu_minute] &GENMASK (5 ,0 ); + t->tm_hour = time[tu_hour] &GENMASK (4 ,0 ); + t->tm_mday = (time[tu_day] &GENMASK (4 ,0 )) +1 ; + t->tm_mon = time[tu_month] &GENMASK (3 ,0 ); + t->tm_year = (time[tu_year] &GENMASK (5 ,0 )) +100 ;
Is it necessary to use the bitmasks here? Are the higher bits undefined in hardware? If so, is it necessary to mask them while writing the time in p1_rtc_set_time()?
Quoted 16 lines
drivers/rtc/rtc-p1.c new file +16
-0+/* tm_wday, tm_yday, and tm_isdst aren't used */ + +return 0 ; +} + +static int p1_rtc_set_time (struct device *dev,struct rtc_time *t) +{ +struct p1_rtc *p1 =dev_get_drvdata (dev); +u8 time[tu_count]; +int ret; + + time[tu_second] = t->tm_sec; + time[tu_minute] = t->tm_min; + time[tu_hour] = t->tm_hour; + time[tu_day] = t->tm_mday -1 ; + time[tu_month] = t->tm_mon;
drivers/rtc/rtc-p1.c line 80
Quoted 10 lines
drivers/rtc/rtc-p1.c new file +10
-0+ time[tu_year] = t->tm_year -100 ; + +/* Disable the RTC to update; re-enable again when done */ + ret =regmap_update_bits (p1->regmap,RTC_CTRL ,RTC_EN ,0 ); +if (ret) +return ret; + + ret =regmap_bulk_write (p1->regmap,RTC_COUNT_BASE , time,sizeof (time)); + + (void )regmap_update_bits (p1->regmap,RTC_CTRL ,RTC_EN ,RTC_EN );
Perhaps you shouldn't ignore any errors here - failing to restart the clock should make p1_rtc_set_time() return an error code.
drivers/rtc/rtc-p1.c line 59
Quoted 4 lines
drivers/rtc/rtc-p1.c new file +4
-0+ +return ret; +} +
Greetings,
Mateusz
Re: [PATCH v3 4/7] rtc: spacemit: support the SpacemiT P1 RTC
Quoted 26 lines · Mateusz Jończyk
W dniu 22.06.2025 o 05:29, Alex Elder pisze:
Quoted 11 lines
Add 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.
Signed-off-by Alex Elder <[email protected]>---
v3: - Added this driver to the series, in response to Lee Jones saying more than one MFD sub-device was required to be acceptable[snip]
Quoted 10 lines
drivers/rtc/rtc-p1.c new file +7
-0+static int p1_rtc_read_time (struct device *dev,struct rtc_time *t) +{ + struct p1_rtc *p1 = dev_get_drvdata(dev); + u8 time[tu_count]; + int ret; + + ret = regmap_bulk_read(p1->regmap, RTC_COUNT_BASE, &time,sizeof(time));
+ if (ret)
+ return ret;Hello,
Quoted 3 lines
Are you sure that you read the time parts consistently here? I mean:
is there a risk that the clock is updating below you - so that for example during the transition
The documentation says this:
If need to read the calendar value currently recorded inside the PMIC, need to read RTC_COUNT_S first. At the same time, this operation will latch all current calendar values to the registers RTC_COUNT_S ~ RTC_COUNT_Y.
The RTC_COUNT_S register is the first one read in the I2C bulk request. So I concluded that the request would record a consistent timestamp in all 6 registers.
That said, the downstream code did a loop as you describe. I will ask the vendor about this.
Related: I disabled the RTC while updating (which is what the downstream code did). But based on what the documentation says I shouldn't need to do that either.
If need to reset the current calendar value, need to configure each calendar value (RTC_COUNT_S ~ RTC_COUNT_Y) in order. After finally writing the register RTC_COUNT_Y, PMIC will update the calendar value configured by the current user to the internal timer of the RTC module, and so on.
Here too, the last register written in the bulk request is RTC_COUNT_Y, so again I think a consistent value stored in the 6 registers will be updated at once.
Either way, I'll make an inquiry about both of these. I'll explain what I learned in the next version of this series, and will update the code accordingly.
Quoted 15 lines
12:59:59 -> 13:00:00
you are going to read 12:00:00 or 12:59:00?
If so, you could for example read the time in a loop until you get two same readouts.
Quoted 7 lines
+
+t->tm_sec= time[tu_second] &GENMASK(5, 0); +t->tm_min= time[tu_minute] &GENMASK(5, 0); +t->tm_hour= time[tu_hour] &GENMASK(4, 0); +t->tm_mday= (time[tu_day] &GENMASK(4, 0)) + 1; +t->tm_mon= time[tu_month] &GENMASK(3, 0); +t->tm_year= (time[tu_year] &GENMASK(5, 0)) + 100;
Quoted 3 lines
Is it necessary to use the bitmasks here? Are the higher bits undefined in hardware? If so, is it necessary to mask them while writing the time in
p1_rtc_set_time()?
It is probably not necessary to do the bitmask. But the upper bits are marked "reserved" and so I the correct thing to do is to explicitly ignore them (by masking them off). Is there a reason you'd rather they not be masked?
There should be no need to mask them in the set_time() function. The core code verifies all values are in range before it calls rtc_class_ops->set_time(). So the upper bits should all be zero by the time p1_rtc_set_time() is called.
Quoted 22 lines
Quoted 22 lines
+ /*
tm_wday,tm_yday, andtm_isdstaren't used */drivers/rtc/rtc-p1.c new file +21
-0+ + return 0; +} + +static int p1_rtc_set_time (struct device *dev,struct rtc_time *t) +{ + struct p1_rtc *p1 = dev_get_drvdata(dev); + u8 time[tu_count]; + int ret; + + time[tu_second] = t->tm_sec; + time[tu_minute] = t->tm_min; + time[tu_hour] = t->tm_hour; + time[tu_day] = t->tm_mday - 1; + time[tu_month] = t->tm_mon; + time[tu_year] = t->tm_year - 100; + + /* Disable the RTC to update; re-enable again when done */ + ret = regmap_update_bits(p1->regmap, RTC_CTRL, RTC_EN, 0); + if (ret) + return ret;
Quoted 8 lines
Quoted 5 lines
+
+ ret =regmap_bulk_write(p1->regmap, RTC_COUNT_BASE, time, sizeof(time));
+
+ (void)regmap_update_bits(p1->regmap,RTC_CTRL,RTC_EN,RTC_EN);Perhaps you shouldn't ignore any errors here - failing to restart the clock should make
p1_rtc_set_time()return an error code.
I intentionally return any error from the bulk write call.
But you're right: if that doesn't have an error and re-enabling the RTC does, that error should be returned.
I'm hoping there's no need to disable the clock after all, and that will simplify things here. But either way, I'll take your suggestion (but still return the first error if more than one occurs).
Thanks a lot for the review.
-Alex
Quoted 9 lines
drivers/rtc/rtc-p1.c line 59
Quoted 4 lines
drivers/rtc/rtc-p1.c new file +4
-0+ + return ret; +} +Greetings,
Mateusz
Alexandre Belloni
maintainerRe: [PATCH v3 4/7] rtc: spacemit: support the SpacemiT P1 RTC
In reply to Alex ElderHello,
Quoted 7 lines · Alex Elder
Add 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.
Quoted 8 lines
Signed-off-by Alex Elder <[email protected]>---
v3: - Added this driver to the series, in response to Lee Jones saying
more than one MFD sub-device was required to be acceptabledrivers/rtc/Kconfig | 10 ++++ drivers/rtc/Makefile | 1 + drivers/rtc/rtc-p1.c | 137 +++++++++++++++++++++++++++++++++++++++++++
We need something more descriptive than p1 here
drivers/rtc/Kconfig config RTC_DRV_MAX77686 · line 409
Quoted 12 lines
3 files changed, 148 insertions(+) create mode 100644 drivers/rtc/rtc-p1.cdrivers/rtc/Kconfig +1
-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_P1
Ditto
Quoted 46 lines
drivers/rtc/Kconfig +9
-0+ 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 OFdrivers/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_P1) += rtc-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.odrivers/rtc/rtc-p1.c new file +16
-0@@ -0,0 +1,137 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for the RTC found in the SpacemiT P1 PMIC +* +* Copyright (C) 2025 by RISCstar Solutions Corporation. All rights reserved. +*/ + +#include <linux/bits.h> +#include <linux/device.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/rtc.h> + +#define MOD_NAME "spacemit-p1-rtc" +
drivers/rtc/rtc-p1.c line 26
Quoted 10 lines
drivers/rtc/rtc-p1.c new file +10
-0+/* Offset to byte containing the given time unit */ +enum time_unit { + tu_second =0 ,/* 0-59 */ + tu_minute,/* 0-59 */ + tu_hour,/* 0-59 */ + tu_day,/* 0-30 (struct tm uses 1-31) */ + tu_month,/* 0-11 */ + tu_year,/* Years since 2000 (struct tm uses 1900) */ + tu_count,/* Last; not a time unit */ +};
I'm not sure this enum actually brings anything
Quoted 44 lines
drivers/rtc/rtc-p1.c new file +44
-0+ +/* Consecutive bytes contain seconds, minutes, etc. */ +#define RTC_COUNT_BASE 0x0d + +#define RTC_CTRL 0x1d +#define RTC_EN BIT(2) + +struct p1_rtc { +struct regmap *regmap; +struct rtc_device *rtc; +}; + +static int p1_rtc_read_time (struct device *dev,struct rtc_time *t) +{ +struct p1_rtc *p1 =dev_get_drvdata (dev); +u8 time[tu_count]; +int ret; + + ret =regmap_bulk_read (p1->regmap,RTC_COUNT_BASE , &time,sizeof (time)); +if (ret) +return ret; + + t->tm_sec = time[tu_second] &GENMASK (5 ,0 ); + t->tm_min = time[tu_minute] &GENMASK (5 ,0 ); + t->tm_hour = time[tu_hour] &GENMASK (4 ,0 ); + t->tm_mday = (time[tu_day] &GENMASK (4 ,0 )) +1 ; + t->tm_mon = time[tu_month] &GENMASK (3 ,0 ); + t->tm_year = (time[tu_year] &GENMASK (5 ,0 )) +100 ; +/* tm_wday, tm_yday, and tm_isdst aren't used */ + +return 0 ; +} + +static int p1_rtc_set_time (struct device *dev,struct rtc_time *t) +{ +struct p1_rtc *p1 =dev_get_drvdata (dev); +u8 time[tu_count]; +int ret; + + time[tu_second] = t->tm_sec; + time[tu_minute] = t->tm_min; + time[tu_hour] = t->tm_hour; + time[tu_day] = t->tm_mday -1 ; + time[tu_month] = t->tm_mon;
drivers/rtc/rtc-p1.c line 80
Quoted 10 lines
drivers/rtc/rtc-p1.c new file +10
-0+ time[tu_year] = t->tm_year -100 ; + +/* Disable the RTC to update; re-enable again when done */ + ret =regmap_update_bits (p1->regmap,RTC_CTRL ,RTC_EN ,0 ); +if (ret) +return ret; + + ret =regmap_bulk_write (p1->regmap,RTC_COUNT_BASE , time,sizeof (time)); + + (void )regmap_update_bits (p1->regmap,RTC_CTRL ,RTC_EN ,RTC_EN );
Don't you care whether the RTC has been reenabled?
Quoted 31 lines
drivers/rtc/rtc-p1.c new file +31
-0+ +return ret; +} + +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; +int ret; + + 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; +
drivers/rtc/rtc-p1.c line 121
Quoted 10 lines
drivers/rtc/rtc-p1.c new file +10
-0+ 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); + + ret =devm_rtc_register_device (rtc); +if (ret) +return dev_err_probe (dev, ret,"error registering RTC\n" );
This message is unnecessary, there are no silent error path in devm_rtc_register_device
Quoted 16 lines
drivers/rtc/rtc-p1.c new file +16
-0+ +return 0 ; +} + +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 · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [PATCH v3 4/7] rtc: spacemit: support the SpacemiT P1 RTC
Quoted 15 lines · Alexandre Belloni
Hello,
Quoted 12 lines · Alex Elder
Add 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.
Signed-off-by Alex Elder <[email protected]>---
v3: - Added this driver to the series, in response to Lee Jones saying
more than one MFD sub-device was required to be acceptable
Quoted 5 lines
Quoted 3 lines
drivers/rtc/Kconfig | 10 ++++ drivers/rtc/Makefile | 1 + drivers/rtc/rtc-p1.c | 137 +++++++++++++++++++++++++++++++++++++++++++We need something more descriptive than p1 here
Are you referring to the chip itself, or do you want a longer
file name? Do you prefer "rtc-spacemit-p1.c" or something?
Quoted 65 lines
drivers/rtc/Kconfig config RTC_DRV_MAX77686 · line 409
Quoted 12 lines
3 files changed, 148 insertions(+)create mode 100644
drivers/rtc/rtc-p1.cdrivers/rtc/Kconfig +1
-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_P1Ditto
Quoted 50 lines
drivers/rtc/Kconfig +9
-0+ 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 OFdrivers/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_P1) += rtc-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.odrivers/rtc/rtc-p1.c new file +20
-0@@ -0,0 +1,137 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for the RTC found in the SpacemiT P1 PMIC +* +* Copyright (C) 2025 by RISCstar Solutions Corporation. All rights reserved. +*/ + +#include <linux/bits.h> +#include <linux/device.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/rtc.h> + +#define MOD_NAME "spacemit-p1-rtc" + +/* Offset to byte containing the given time unit */ +enum time_unit { + tu_second =0 ,/* 0-59 */ + tu_minute,/* 0-59 */
Quoted 8 lines
drivers/rtc/rtc-p1.c line 26
Quoted 6 lines
drivers/rtc/rtc-p1.c new file +6
-0+ tu_hour,/* 0-59 */ + tu_day,/* 0-30 (struct tm uses 1-31) */ + tu_month,/* 0-11 */ + tu_year,/* Years since 2000 (struct tm uses 1900) */ + tu_count, /* Last; not a time unit */ +};I'm not sure this enum actually brings anything
It's just defining the sequence of register values symbolically. Do you prefer #defines?
It doesn't matter much to me, I just want to know what you'd prefer.
Quoted 49 lines
Quoted 49 lines
drivers/rtc/rtc-p1.c new file +48
-0+ +/* Consecutive bytes contain seconds, minutes, etc. */ +#define RTC_COUNT_BASE 0x0d + +#define RTC_CTRL 0x1d +#define RTC_EN BIT(2) + +struct p1_rtc { +struct regmap *regmap; +struct rtc_device *rtc; +}; + +static int p1_rtc_read_time (struct device *dev,struct rtc_time *t) +{ +struct p1_rtc *p1 =dev_get_drvdata (dev); +u8 time[tu_count]; +int ret; + + ret =regmap_bulk_read (p1->regmap,RTC_COUNT_BASE , &time,sizeof (time)); +if (ret) +return ret; + + t->tm_sec = time[tu_second] &GENMASK (5 ,0 ); + t->tm_min = time[tu_minute] &GENMASK (5 ,0 ); + t->tm_hour = time[tu_hour] &GENMASK (4 ,0 ); + t->tm_mday = (time[tu_day] &GENMASK (4 ,0 )) +1 ; + t->tm_mon = time[tu_month] &GENMASK (3 ,0 ); + t->tm_year = (time[tu_year] &GENMASK (5 ,0 )) +100 ; +/* tm_wday, tm_yday, and tm_isdst aren't used */ + +return 0 ; +} + +static int p1_rtc_set_time (struct device *dev,struct rtc_time *t) +{ +struct p1_rtc *p1 =dev_get_drvdata (dev); +u8 time[tu_count]; +int ret; + + time[tu_second] = t->tm_sec; + time[tu_minute] = t->tm_min; + time[tu_hour] = t->tm_hour; + time[tu_day] = t->tm_mday -1 ; + time[tu_month] = t->tm_mon; + time[tu_year] = t->tm_year -100 ; + +/* Disable the RTC to update; re-enable again when done */ + ret =regmap_update_bits (p1->regmap,RTC_CTRL ,RTC_EN ,0 );
Quoted 8 lines
drivers/rtc/rtc-p1.c line 80
Quoted 6 lines
drivers/rtc/rtc-p1.c new file +6
-0+if (ret) +return ret; + + ret =regmap_bulk_write (p1->regmap,RTC_COUNT_BASE , time,sizeof (time)); + + (void )regmap_update_bits (p1->regmap,RTC_CTRL ,RTC_EN ,RTC_EN );Don't you care whether the RTC has been reenabled?
Yes, Mateusz pointed this out. I'll fix this.
I hope that disabling and re-enabling isn't require, which makes the error possibilities a lot simpler.
Otherwise it's not clear how best to recover from an error re-enabling the RTC (but yes, if no error occurs in the bulk write, an error when re-enabling will be returned).
Quoted 36 lines
Quoted 36 lines
drivers/rtc/rtc-p1.c new file +36
-0+ +return ret; +} + +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; +int ret; + + 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);
Quoted 8 lines
drivers/rtc/rtc-p1.c line 121
Quoted 5 lines
drivers/rtc/rtc-p1.c new file +5
-0+clear_bit (RTC_FEATURE_UPDATE_INTERRUPT , rtc->features); + + ret =devm_rtc_register_device (rtc); +if (ret) +return dev_err_probe (dev, ret,"error registering RTC\n" );This message is unnecessary, there are no silent error path in
devm_rtc_register_device
Awesome. I'll just return what devm_rtc_regsister_device() returns.
Thanks a lot.
-Alex
Quoted 18 lines
Quoted 17 lines
drivers/rtc/rtc-p1.c new file +16
-0+ +return 0 ; +} + +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 );
Alexandre Belloni
maintainerRe: [PATCH v3 4/7] rtc: spacemit: support the SpacemiT P1 RTC
Quoted 16 lines · Alex Elder
Quoted 15 lines · Alexandre Belloni
Hello,
Quoted 12 lines · Alex Elder
Add 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.
Signed-off-by Alex Elder <[email protected]>---
v3: - Added this driver to the series, in response to Lee Jones saying
more than one MFD sub-device was required to be acceptable
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
drivers/rtc/Kconfig | 10 ++++ drivers/rtc/Makefile | 1 + drivers/rtc/rtc-p1.c | 137 +++++++++++++++++++++++++++++++++++++++++++We need something more descriptive than p1 here
Are you referring to the chip itself, or do you want a longer
file name? Do you prefer "rtc-spacemit-p1.c" or something?
Yes, this would be better, I feel like p1 is too short and is going to conflict later on.
Quoted 74 lines
Quoted 65 lines
drivers/rtc/Kconfig config RTC_DRV_MAX77686 · line 408
Quoted 12 lines
3 files changed, 148 insertions(+)create mode 100644
drivers/rtc/rtc-p1.cdrivers/rtc/Kconfig +1
-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_P1Ditto
Quoted 50 lines
drivers/rtc/Kconfig +9
-0+ 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 OFdrivers/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_P1) += rtc-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.odrivers/rtc/rtc-p1.c new file +20
-0@@ -0,0 +1,137 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for the RTC found in the SpacemiT P1 PMIC +* +* Copyright (C) 2025 by RISCstar Solutions Corporation. All rights reserved. +*/ + +#include <linux/bits.h> +#include <linux/device.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/rtc.h> + +#define MOD_NAME "spacemit-p1-rtc" + +/* Offset to byte containing the given time unit */ +enum time_unit { + tu_second =0 ,/* 0-59 */ + tu_minute,/* 0-59 */ Quoted 8 lines
drivers/rtc/rtc-p1.c line 26
Quoted 6 lines
drivers/rtc/rtc-p1.c new file +6
-0+ tu_hour,/* 0-59 */ + tu_day,/* 0-30 (struct tm uses 1-31) */ + tu_month,/* 0-11 */ + tu_year,/* Years since 2000 (struct tm uses 1900) */ + tu_count, /* Last; not a time unit */ +};I'm not sure this enum actually brings anything
Quoted 5 lines
It's just defining the sequence of register values symbolically. Do you prefer #defines?
It doesn't matter much to me, I just want to know what you'd prefer.
Most of the drivers simply use the index number directly as the tm_* members are descriptive enough.
Quoted 140 lines
Quoted 50 lines
Quoted 50 lines
drivers/rtc/rtc-p1.c new file +48
-0+ +/* Consecutive bytes contain seconds, minutes, etc. */ +#define RTC_COUNT_BASE 0x0d + +#define RTC_CTRL 0x1d +#define RTC_EN BIT(2) + +struct p1_rtc { +struct regmap *regmap; +struct rtc_device *rtc; +}; + +static int p1_rtc_read_time (struct device *dev,struct rtc_time *t) +{ +struct p1_rtc *p1 =dev_get_drvdata (dev); +u8 time[tu_count]; +int ret; + + ret =regmap_bulk_read (p1->regmap,RTC_COUNT_BASE , &time,sizeof (time)); +if (ret) +return ret; + + t->tm_sec = time[tu_second] &GENMASK (5 ,0 ); + t->tm_min = time[tu_minute] &GENMASK (5 ,0 ); + t->tm_hour = time[tu_hour] &GENMASK (4 ,0 ); + t->tm_mday = (time[tu_day] &GENMASK (4 ,0 )) +1 ; + t->tm_mon = time[tu_month] &GENMASK (3 ,0 ); + t->tm_year = (time[tu_year] &GENMASK (5 ,0 )) +100 ; +/* tm_wday, tm_yday, and tm_isdst aren't used */ + +return 0 ; +} + +static int p1_rtc_set_time (struct device *dev,struct rtc_time *t) +{ +struct p1_rtc *p1 =dev_get_drvdata (dev); +u8 time[tu_count]; +int ret; + + time[tu_second] = t->tm_sec; + time[tu_minute] = t->tm_min; + time[tu_hour] = t->tm_hour; + time[tu_day] = t->tm_mday -1 ; + time[tu_month] = t->tm_mon; + time[tu_year] = t->tm_year -100 ; + +/* Disable the RTC to update; re-enable again when done */ + ret =regmap_update_bits (p1->regmap,RTC_CTRL ,RTC_EN ,0 );Quoted 8 lines
drivers/rtc/rtc-p1.c line 80
Quoted 6 lines
drivers/rtc/rtc-p1.c new file +6
-0+if (ret) +return ret; + + ret =regmap_bulk_write (p1->regmap,RTC_COUNT_BASE , time,sizeof (time)); + + (void )regmap_update_bits (p1->regmap,RTC_CTRL ,RTC_EN ,RTC_EN );Don't you care whether the RTC has been reenabled?
Yes, Mateusz pointed this out. I'll fix this.
I hope that disabling and re-enabling isn't require, which makes the error possibilities a lot simpler.
Otherwise it's not clear how best to recover from an error re-enabling the RTC (but yes, if no error occurs in the bulk write, an error when re-enabling will be returned).
Quoted 36 lines
Quoted 36 lines
drivers/rtc/rtc-p1.c new file +36
-0+ +return ret; +} + +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; +int ret; + + 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);Quoted 8 lines
drivers/rtc/rtc-p1.c line 121
Quoted 5 lines
drivers/rtc/rtc-p1.c new file +5
-0+clear_bit (RTC_FEATURE_UPDATE_INTERRUPT , rtc->features); + + ret =devm_rtc_register_device (rtc); +if (ret) +return dev_err_probe (dev, ret,"error registering RTC\n" );This message is unnecessary, there are no silent error path in
devm_rtc_register_deviceAwesome. I'll just return what
devm_rtc_regsister_device()returns.Thanks a lot.
-Alex
Quoted 18 lines
Quoted 17 lines
drivers/rtc/rtc-p1.c new file +16
-0+ +return 0 ; +} + +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 · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v3 5/7 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
@@ -483,6 +483,17 @@ gpio: gpio@d4019000 { <&pinctrl 3 0 96 32>; }; + 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 v3 6/7 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 v3 7/7 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