Driver for the Apple SPMI controller
Subsystems (3)
v2 cover Driver for the Apple SPMI controller
Hi.
This patch series adds support for the SPMI controller persent in most Apple SoCs. The drivers for the attached PMU and subdevices will be in further patch series.
---
Changes in v2:
- Removed redundant error prints
- Various style fixes
- Better explanation of why the driver is needed
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Jean-Francois Bortolotti (1):
spmi: add a spmi driver for Apple SoC
Sasha Finkelstein (2):
dt-bindings: spmi: Add Apple SPMI controller
arm64: dts: apple: Add SPMI controller nodes
.../devicetree/bindings/spmi/apple,spmi.yaml | 49 ++++++ MAINTAINERS | 2 + arch/arm64/boot/dts/apple/t600x-die0.dtsi | 7 + arch/arm64/boot/dts/apple/t8103.dtsi | 8 + arch/arm64/boot/dts/apple/t8112.dtsi | 7 + drivers/spmi/Kconfig | 8 + drivers/spmi/Makefile | 1 + drivers/spmi/spmi-apple-controller.c | 178 +++++++++++++++++++++ 8 files changed, 260 insertions(+)
---
base-commit: 48a5eed9ad584315c30ed35204510536235ce402
change-id: 20250304-spmi-6d3c24b9027a
PATCH v2 1/3 dt-bindings: spmi: Add Apple SPMI controller
From: Sasha Finkelstein <[email protected]>
Add bindings for the SPMI controller present on most Apple SoCs
--- .../devicetree/bindings/spmi/apple,spmi.yaml | 49 ++++++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 50 insertions(+)
Documentation/devicetree/bindings/spmi/apple,spmi.yaml new file +49 -0
@@ -0,0 +1,49 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/spmi/apple,spmi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple SPMI controller + +maintainers: + - Sasha Finkelstein <[email protected]> + +description: A SPMI controller present on most Apple SoCs + +allOf: + - $ref: spmi.yaml# + +properties: + compatible: + items: + - enum: + - apple,t8103-spmi + - apple,t6000-spmi + - apple,t8112-spmi + - const: apple,spmi + + reg: + maxItems: 1 + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/spmi/spmi.h> + + spmi@920a1300 { + compatible = "apple,t6000-spmi", "apple,spmi"; + reg = <0x920a1300 0x100>; + #address-cells = <2>; + #size-cells = <0>; + + pmic@f { + reg = <0xf SPMI_USID>; + /* PMIC-specific properties */ + }; + };
MAINTAINERS +1 -0
@@ -2236,6 +2236,7 @@ F: Documentation/devicetree/bindings/pci/apple,pcie.yaml F: Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml F: Documentation/devicetree/bindings/power/apple* F: Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml +F: Documentation/devicetree/bindings/spmi/apple,spmi.yaml F: Documentation/devicetree/bindings/watchdog/apple,wdt.yaml F: arch/arm64/boot/dts/apple/ F: drivers/bluetooth/hci_bcm4377.c
Signature · 1 line
2.48.1
Re: [PATCH v2 1/3] dt-bindings: spmi: Add Apple SPMI controller
Quoted 7 lines · On Fri, Mar 7, 2025, at 21:08, Sasha Finkelstein via B4 Relay wrote:
From: Sasha Finkelstein <[email protected]>
Add bindings for the SPMI controller present on most Apple SoCs
Reviewed-by Rob Herring (Arm) <[email protected]>Signed-off-by Sasha Finkelstein <[email protected]>---
Thanks,
Sven
PATCH v2 2/3 spmi: add a spmi driver for Apple SoC
In reply to Sasha FinkelsteinFrom: Jean-Francois Bortolotti <[email protected]>
The connected PMU contains several useful nvmem cells such as RTC offset, boot failure counters, reboot/shutdown selector, and a few others. In addition M3+ machines have their USB-PD controller connected via SPMI.
--- MAINTAINERS | 1 + drivers/spmi/Kconfig | 8 ++ drivers/spmi/Makefile | 1 + drivers/spmi/spmi-apple-controller.c | 178 +++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+)
MAINTAINERS +1 -0
@@ -2254,6 +2254,7 @@ F: drivers/nvmem/apple-efuses.c F: drivers/pinctrl/pinctrl-apple-gpio.c F: drivers/pwm/pwm-apple.c F: drivers/soc/apple/* +F: drivers/spmi/spmi-apple-controller.c F: drivers/watchdog/apple_wdt.c F: include/dt-bindings/interrupt-controller/apple-aic.h F: include/dt-bindings/pinctrl/apple.h
drivers/spmi/Kconfig +8 -0
@@ -11,6 +11,14 @@ menuconfig SPMI if SPMI +config SPMI_APPLE + tristate "Apple SoC SPMI Controller platform driver" + depends on ARCH_APPLE || COMPILE_TEST + help + If you say yes to this option, support will be included for the + SPMI controller present on many Apple SoCs, including the + t8103 (M1) and t600x (M1 Pro/Max). + config SPMI_HISI3670 tristate "Hisilicon 3670 SPMI Controller" select IRQ_DOMAIN_HIERARCHY
drivers/spmi/Makefile +1 -0
@@ -4,6 +4,7 @@ # obj-$(CONFIG_SPMI) += spmi.o spmi-devres.o +obj-$(CONFIG_SPMI_APPLE) += spmi-apple-controller.o obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o obj-$(CONFIG_SPMI_MSM_PMIC_ARB) += spmi-pmic-arb.o obj-$(CONFIG_SPMI_MTK_PMIF) += spmi-mtk-pmif.o
drivers/spmi/spmi-apple-controller.c new file +178 -0
178 lines not on this page · raw message
Signature · 1 line
2.48.1
Re: [PATCH v2 2/3] spmi: add a spmi driver for Apple SoC
drivers/spmi/spmi-apple-controller.c line 47
Quoted 9 lines
drivers/spmi/spmi-apple-controller.c new file +9
-0+static inline u32 read_reg (struct apple_spmi *spmi,int offset) +{ +return readl (spmi->regs + offset); +} + +static inline void write_reg (u32 value,struct apple_spmi *spmi,int offset) +{ +writel (value, spmi->regs + offset); +}
At this point I don't think these are gaining us anything. Can we inline them?
Re: [PATCH v2 2/3] spmi: add a spmi driver for Apple SoC
In reply to Sasha FinkelsteinHi,
Quoted 93 lines · On Fri, Mar 7, 2025, at 21:09, Sasha Finkelstein via B4 Relay wrote:
From: Jean-Francois Bortolotti <[email protected]>
The connected PMU contains several useful nvmem cells such as RTC offset, boot failure counters, reboot/shutdown selector, and a few others. In addition M3+ machines have their USB-PD controller connected via SPMI.
Signed-off-by Jean-Francois Bortolotti <[email protected]>Co-developed-by Sasha Finkelstein <[email protected]>Signed-off-by Sasha Finkelstein <[email protected]>--- MAINTAINERS | 1 + drivers/spmi/Kconfig | 8 ++ drivers/spmi/Makefile | 1 + drivers/spmi/spmi-apple-controller.c | 178 +++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+)MAINTAINERS +0
-0
271ff8110df83c2d4fe7fbbfffc0a72259460bc5..9006695261d29fbc1e15659c2b43d7afeee0b656100644MAINTAINERS +1
-0@@ -2254,6 +2254,7 @@ F: drivers/nvmem/apple-efuses.c F: drivers/pinctrl/pinctrl-apple-gpio.c F: drivers/pwm/pwm-apple.c F: drivers/soc/apple/* +F: drivers/spmi/spmi-apple-controller.c F: drivers/watchdog/apple_wdt.c F: include/dt-bindings/interrupt-controller/apple-aic.h F: include/dt-bindings/pinctrl/apple.hdrivers/spmi/Kconfig +0
-0
73780204631463631cabcbad5bf83e8dbbee94ce..9005fa91d9f4e541403ccc7bf84e0592402ac41e100644drivers/spmi/Kconfig +8
-0@@ -11,6 +11,14 @@ menuconfig SPMI if SPMI +config SPMI_APPLE + tristate "Apple SoC SPMI Controller platform driver" + depends on ARCH_APPLE || COMPILE_TEST + help + If you say yes to this option, support will be included for the + SPMI controller present on many Apple SoCs, including the + t8103 (M1) and t600x (M1 Pro/Max). + config SPMI_HISI3670 tristate "Hisilicon 3670 SPMI Controller" select IRQ_DOMAIN_HIERARCHYdrivers/spmi/Makefile +0
-0
7f152167bb05b2c24a0f9669f60278152898eebb..38ac635645ba65aa46cb5e8a50072ed9771e229b100644drivers/spmi/Makefile +1
-0@@ -4,6 +4,7 @@ # obj-$(CONFIG_SPMI) += spmi.o spmi-devres.o +obj-$(CONFIG_SPMI_APPLE) += spmi-apple-controller.o obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o obj-$(CONFIG_SPMI_MSM_PMIC_ARB) += spmi-pmic-arb.o obj-$(CONFIG_SPMI_MTK_PMIF) += spmi-mtk-pmif.odrivers/spmi/spmi-apple-controller.c new file +0
-00000000000000000000000000000000000000000..2d4a677aaff6b10fce80f7eacc330605674ea495
drivers/spmi/spmi-apple-controller.c new file +8
-0@@ -0,0 +1,178 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Apple SoC SPMI device driver +* +* Copyright The Asahi Linux Contributors +* +* Inspired by: +* OpenBSD support Copyright (c) 2021 Mark Kettenis <[email protected]>
+ * Correllium support Copyright (C) 2021 Corellium LLC
+ *hisi-spmi-controller.c
+ *spmi-pmic-arb.cCopyright (c) 2021, The Linux Foundation.
+ */drivers/spmi/spmi-apple-controller.c new file +7
-0+ +#include <linux/io.h> +#include <linux/iopoll.h> +#include <linux/module.h> +#include <linux/mod_devicetable.h> +#include <linux/platform_device.h> +#include <linux/spmi.h>
drivers/spmi/spmi-apple-controller.c line 29
Quoted 10 lines
drivers/spmi/spmi-apple-controller.c new file +10
-0+ +/* SPMI Controller Registers */ +#define SPMI_STATUS_REG 0 +#define SPMI_CMD_REG 0x4 +#define SPMI_RSP_REG 0x8 + +#define SPMI_RX_FIFO_EMPTY BIT(24) + +#define REG_POLL_INTERVAL 10000 +#define REG_POLL_TIMEOUT (REG_POLL_INTERVAL * 5)
I'd either add a comment that these are in us or add a _US suffix
Quoted 35 lines
drivers/spmi/spmi-apple-controller.c new file +15
-0+ +struct apple_spmi { +void __iomem *regs; +}; + +#define poll_reg (spmi, reg, val, cond) \ + readl_poll_timeout((spmi)->regs + (reg), (val), (cond), \ + REG_POLL_INTERVAL, REG_POLL_TIMEOUT) + +static inline u32 read_reg (struct apple_spmi *spmi,int offset) +{ +return readl (spmi->regs + offset); +} + +static inline void write_reg(u32 value, struct apple_spmi *spmi, intoffset)
drivers/spmi/spmi-apple-controller.c new file +5
-0+{ +writel (value, spmi->regs + offset); +} + +static inline u32 apple_spmi_pack_cmd(u8 opc, u8 sid, u16 saddr,
size_tlen)drivers/spmi/spmi-apple-controller.c new file +12
-0+{ +return opc | sid <<8 | saddr <<16 | (len -1 ) | (1 <<15 ); +} + +/* Wait for Rx FIFO to have something */ +static int apple_spmi_wait_rx_not_empty (struct spmi_controller *ctrl) +{ +struct apple_spmi *spmi =spmi_controller_get_drvdata (ctrl); +int ret; +u32 status; + + ret = poll_reg(spmi, SPMI_STATUS_REG, status, !(status &
SPMI_RX_FIFO_EMPTY));
drivers/spmi/spmi-apple-controller.c line 64
Quoted 3 lines
drivers/spmi/spmi-apple-controller.c new file +3
-0+if (ret) { +dev_err (&ctrl->dev, +"%s: Failed to wait for RX FIFO not empty\n" , __func__);
__func__ is always the same here now. I'd just drop that prefix.
With that and Alyssa's remark addressed:
Quoted 117 lines
drivers/spmi/spmi-apple-controller.c new file +114
-0+return ret; + } + +return 0 ; +} + +static int spmi_read_cmd (struct spmi_controller *ctrl,u8 opc,u8 sid, +u16 saddr,u8 *buf,size_t len) +{ +struct apple_spmi *spmi =spmi_controller_get_drvdata (ctrl); +u32 spmi_cmd =apple_spmi_pack_cmd (opc, sid, saddr, len); +u32 rsp; +size_t len_read =0 ; +u8 i; +int ret; + +write_reg (spmi_cmd, spmi,SPMI_CMD_REG ); + + ret =apple_spmi_wait_rx_not_empty (ctrl); +if (ret) +return ret; + +/* Discard SPMI reply status */ +read_reg (spmi,SPMI_RSP_REG ); + +/* Read SPMI data reply */ +while (len_read < len) { + rsp =read_reg (spmi,SPMI_RSP_REG ); + i =0 ; +while ((len_read < len) && (i <4 )) { + buf[len_read++] = ((0xff << (8 * i)) & rsp) >> (8 * i); + i +=1 ; + } + } + +return 0 ; +} + +static int spmi_write_cmd (struct spmi_controller *ctrl,u8 opc,u8 sid, +u16 saddr,const u8 *buf,size_t len) +{ +struct apple_spmi *spmi =spmi_controller_get_drvdata (ctrl); +u32 spmi_cmd =apple_spmi_pack_cmd (opc, sid, saddr, len); +size_t i =0 , j; +int ret; + +write_reg (spmi_cmd, spmi,SPMI_CMD_REG ); + +while (i < len) { + j =0 ; + spmi_cmd =0 ; +while ((j <4 ) & (i < len)) + spmi_cmd |= buf[i++] << (j++ *8 ); + +write_reg (spmi_cmd, spmi,SPMI_CMD_REG ); + } + + ret =apple_spmi_wait_rx_not_empty (ctrl); +if (ret) +return ret; + +/* Discard */ +read_reg (spmi,SPMI_RSP_REG ); + +return 0 ; +} + +static int apple_spmi_probe (struct platform_device *pdev) +{ +struct apple_spmi *spmi; +struct spmi_controller *ctrl; +int ret; + + ctrl =devm_spmi_controller_alloc (&pdev->dev,sizeof (*spmi)); +if (IS_ERR (ctrl)) +return -ENOMEM ; + + spmi =spmi_controller_get_drvdata (ctrl); + + spmi->regs =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (spmi->regs)) +return PTR_ERR (spmi->regs); + + ctrl->dev.of_node = pdev->dev.of_node; + + ctrl->read_cmd = spmi_read_cmd; + ctrl->write_cmd = spmi_write_cmd; + + ret =devm_spmi_controller_add (&pdev->dev, ctrl); +if (ret) +return dev_err_probe (&pdev->dev, ret, +"spmi_controller_add failed\n" ); + +return 0 ; +} + +static const struct of_device_id apple_spmi_match_table[] = { + { .compatible ="apple,spmi" , }, + {} +}; +MODULE_DEVICE_TABLE (of, apple_spmi_match_table); + +static struct platform_driver apple_spmi_driver = { + .probe = apple_spmi_probe, + .driver = { + .name ="apple-spmi" , + .of_match_table = apple_spmi_match_table, + }, +}; +module_platform_driver (apple_spmi_driver); + +MODULE_AUTHOR ("Jean-Francois Bortolotti <[email protected]>" ); +MODULE_DESCRIPTION ("Apple SoC SPMI driver" ); +MODULE_LICENSE ("GPL" );Signature · 2 lines
-- 2.48.1
Sven
PATCH v2 3/3 arm64: dts: apple: Add SPMI controller nodes
In reply to Sasha FinkelsteinFrom: Sasha Finkelstein <[email protected]>
Add device tree entries for the SPMI controller
--- arch/arm64/boot/dts/apple/t600x-die0.dtsi | 7 +++++++ arch/arm64/boot/dts/apple/t8103.dtsi | 8 ++++++++ arch/arm64/boot/dts/apple/t8112.dtsi | 7 +++++++ 3 files changed, 22 insertions(+)
arch/arm64/boot/dts/apple/t600x-die0.dtsi +7 -0
@@ -53,6 +53,13 @@ wdt: watchdog@2922b0000 { interrupts = <AIC_IRQ 0 631 IRQ_TYPE_LEVEL_HIGH>; }; + nub_spmi0: spmi@2920a1300 { + compatible = "apple,t6000-spmi", "apple,spmi"; + reg = <0x2 0x920a1300 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + }; + sio_dart_0: iommu@39b004000 { compatible = "apple,t6000-dart"; reg = <0x3 0x9b004000 0x0 0x4000>;
arch/arm64/boot/dts/apple/t8103.dtsi +8 -0
@@ -11,6 +11,7 @@ #include <dt-bindings/interrupt-controller/apple-aic.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/pinctrl/apple.h> +#include <dt-bindings/spmi/spmi.h> / { compatible = "apple,t8103", "apple,arm-platform";
@@ -604,6 +605,13 @@ pcie_pins: pcie-pins { }; }; + nub_spmi: spmi@23d0d9300 { + compatible = "apple,t8103-spmi", "apple,spmi"; + reg = <0x2 0x3d0d9300 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + }; + pinctrl_nub: pinctrl@23d1f0000 { compatible = "apple,t8103-pinctrl", "apple,pinctrl"; reg = <0x2 0x3d1f0000 0x0 0x4000>;
arch/arm64/boot/dts/apple/t8112.dtsi +7 -0
@@ -641,6 +641,13 @@ pcie_pins: pcie-pins { }; }; + nub_spmi: spmi@23d714000 { + compatible = "apple,t8112-spmi", "apple,spmi"; + reg = <0x2 0x3d714000 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + }; + pinctrl_nub: pinctrl@23d1f0000 { compatible = "apple,t8112-pinctrl", "apple,pinctrl"; reg = <0x2 0x3d1f0000 0x0 0x4000>;
Signature · 1 line
2.48.1
Re: [PATCH v2 3/3] arm64: dts: apple: Add SPMI controller nodes
Hi,
Quoted 20 lines · On Fri, Mar 7, 2025, at 21:09, Sasha Finkelstein via B4 Relay wrote:
From: Sasha Finkelstein <[email protected]>
Add device tree entries for the SPMI controller
Reviewed-by Nick Chan <[email protected]>Signed-off-by Sasha Finkelstein <[email protected]>--- arch/arm64/boot/dts/apple/t600x-die0.dtsi | 7 +++++++ arch/arm64/boot/dts/apple/t8103.dtsi | 8 ++++++++ arch/arm64/boot/dts/apple/t8112.dtsi | 7 +++++++ 3 files changed, 22 insertions(+)arch/arm64/boot/dts/apple/t600x-die0.dtsi +0
-0
b1c875e692c8fb9c0af46a23568a7b0cd720141b..d544a35c8af414c583d38b040e1aa753902f1c93100644
arch/arm64/boot/dts/apple/t600x-die0.dtsi wdt: watchdog@2922b0000 { · line 62
Quoted 10 lines
arch/arm64/boot/dts/apple/t600x-die0.dtsi +7
-0@@ -53,6 +53,13 @@ wdt: watchdog@2922b0000 { interrupts = <AIC_IRQ 0 631 IRQ_TYPE_LEVEL_HIGH>; }; + nub_spmi0: spmi@2920a1300 { + compatible = "apple,t6000-spmi", "apple,spmi"; + reg = <0x2 0x920a1300 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + }; +
Please keep the nodes ordered by their MMIO address. The watchdog node above is at 2922b0000 and should come after spmi@2920a1300. Please also check the other nodes you're adding here.
Quoted 56 lines
arch/arm64/boot/dts/apple/t600x-die0.dtsi +0
-0sio_dart_0: iommu@39b004000 { compatible = "apple,t6000-dart"; reg = <0x3 0x9b004000 0x0 0x4000>;arch/arm64/boot/dts/apple/t8103.dtsi +0
-0
9b0dad6b618444ac6b1c9735c50cccfc3965f947..0f03dc808cf7c6b7d71afc79dd29d368f957f979100644arch/arm64/boot/dts/apple/t8103.dtsi +8
-0@@ -11,6 +11,7 @@ #include <dt-bindings/interrupt-controller/apple-aic.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/pinctrl/apple.h> +#include <dt-bindings/spmi/spmi.h> / { compatible = "apple,t8103", "apple,arm-platform";@@ -604,6 +605,13 @@ pcie_pins: pcie-pins { }; }; + nub_spmi: spmi@23d0d9300 { + compatible = "apple,t8103-spmi", "apple,spmi"; + reg = <0x2 0x3d0d9300 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + }; + pinctrl_nub: pinctrl@23d1f0000 { compatible = "apple,t8103-pinctrl", "apple,pinctrl"; reg = <0x2 0x3d1f0000 0x0 0x4000>;arch/arm64/boot/dts/apple/t8112.dtsi +0
-0
1666e6ab250bc0be9b8318e3c8fc903ccd3f3760..fecf70eba255c668757e2edfe25a4e9e7c0d0bad100644arch/arm64/boot/dts/apple/t8112.dtsi +7
-0@@ -641,6 +641,13 @@ pcie_pins: pcie-pins { }; }; + nub_spmi: spmi@23d714000 { + compatible = "apple,t8112-spmi", "apple,spmi"; + reg = <0x2 0x3d714000 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + }; + pinctrl_nub: pinctrl@23d1f0000 { compatible = "apple,t8112-pinctrl", "apple,pinctrl"; reg = <0x2 0x3d1f0000 0x0 0x4000>;Signature · 2 lines
-- 2.48.1
thanks,
Sven