From nobody Sun Feb 8 18:30:13 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72AE82367DF; Wed, 23 Apr 2025 17:55:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745430930; cv=none; b=YSR0n9uAV8dZ4dj6ECOaRzNTo12IstKfgZbnZ+IHh89EfHF7lTsQdWpScXakLBOVGoyKOBCPpswdySYto00dk2g71yh4uPJNnb0kCmRF/TFjFI3+JWPqoK7Y3mTIFKrV5ISLho7YpekAMkaEJGiVoNigbxagi76Ytr65Wtut2uA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745430930; c=relaxed/simple; bh=95GyYaMMhOUhLEkY0YUOEMAKjMNDpx5JgOUzdw6llJ4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ds539KAWVkge6sQazSZMKlUZV9rrjnD3/OGG7Y8iFh2Ois+05PXwTTXwzhEObY1NcyTX1sHUvd3j/wKfy++jqBvtd4ngatrLYIai1vsD0nlZpm0e2Cw3iJJSXDbBf95P7lVMvv9xuIsdxAYOmyoMFeS5CSBwwCGOwDE/KaEZvpM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GHs4nsQ6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GHs4nsQ6" Received: by smtp.kernel.org (Postfix) with ESMTPS id 0414DC4CEEA; Wed, 23 Apr 2025 17:55:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745430930; bh=95GyYaMMhOUhLEkY0YUOEMAKjMNDpx5JgOUzdw6llJ4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=GHs4nsQ61Ly2uCyMngdELu/v3V+ZlxOZuLakNPwJ4IUVrM1XS8/9quJsNO/EBOWHh TJfcvU0ZiC3kxwl0bE53hme9tifz0iDmwVfLMwvfVDGloFBhdh1PDL826ZoYvmwjbZ DgGWgDrSpPJjrKZEs4RgaYp9QZqcnzsJ2CDZIGadrE2liY76XOG9HxEeqI/5LqaSA4 /Un9L7sUZN1/bYJ5okw9fmz3EHye73XUzmUqNanuwMF3YufPMGwbFjcHYhdW8AEHXX MwTcIZmSqMf8s7w9fYMZNPhPvtNNqaTdO+V5xeEmVjraj5ujvedwa7t3J2QioPuVTu aTTNYPiUiBwhA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6F82C369D3; Wed, 23 Apr 2025 17:55:29 +0000 (UTC) From: Sasha Finkelstein via B4 Relay Date: Wed, 23 Apr 2025 19:55:13 +0200 Subject: [PATCH v3 1/3] dt-bindings: spmi: Add Apple SPMI NVMEM Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250423-spmi-nvmem-v3-1-2985aa722ddc@gmail.com> References: <20250423-spmi-nvmem-v3-0-2985aa722ddc@gmail.com> In-Reply-To: <20250423-spmi-nvmem-v3-0-2985aa722ddc@gmail.com> To: Sven Peter , Janne Grunau , Alyssa Rosenzweig , Neal Gompa , Srinivas Kandagatla , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Finkelstein X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745430928; l=2603; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=EOBP3/6Xq4lPlQdYDYaxZLEyni+8kaQhO4JuDxWVIpA=; b=mj4HNQR5aytv5l7hHefmxiR1avN1zBOqmCF3exgY6qJZC54rZ+d7n2l8vHNqLIAXmfKNZb3Zk FTdkXhhhwR6C9eY2SlMb3QfsIxwsum+0J3MaW2JRjXP9gzimxmp+PRS X-Developer-Key: i=fnkl.kernel@gmail.com; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= X-Endpoint-Received: by B4 Relay for fnkl.kernel@gmail.com/20241124 with auth_id=283 X-Original-From: Sasha Finkelstein Reply-To: fnkl.kernel@gmail.com From: Sasha Finkelstein Add bindings for exposing SPMI registers of Apple PMICs as NVMEM cells Reviewed-by: Alyssa Rosenzweig Signed-off-by: Sasha Finkelstein Reviewed-by: Neal Gompa Reviewed-by: Rob Herring (Arm) --- .../bindings/nvmem/apple,spmi-nvmem.yaml | 54 ++++++++++++++++++= ++++ MAINTAINERS | 1 + 2 files changed, 55 insertions(+) diff --git a/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml = b/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml new file mode 100644 index 0000000000000000000000000000000000000000..80b5a6cdcec91c8eed8b66f745e= 91ee07ba9683d --- /dev/null +++ b/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml @@ -0,0 +1,54 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/nvmem/apple,spmi-nvmem.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple SPMI NVMEM + +description: Exports a series of SPMI registers as NVMEM cells + +maintainers: + - Sasha Finkelstein + +allOf: + - $ref: nvmem.yaml# + +properties: + compatible: + items: + - enum: + - apple,maverick-pmic + - apple,sera-pmic + - apple,stowe-pmic + - const: apple,spmi-nvmem + + reg: + maxItems: 1 + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include + + pmic@f { + compatible =3D "apple,maverick-pmic", "apple,spmi-nvmem"; + reg =3D <0xf SPMI_USID>; + + nvmem-layout { + compatible =3D "fixed-layout"; + #address-cells =3D <1>; + #size-cells =3D <1>; + + boot_stage: boot-stage@6001 { + reg =3D <0x6001 0x1>; + }; + }; + }; + +... diff --git a/MAINTAINERS b/MAINTAINERS index 96b82704950184bd71623ff41fc4df31e4c7fe87..f462545c54c55d4bdc22651e07a= 4c8e155e83016 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2277,6 +2277,7 @@ F: Documentation/devicetree/bindings/mailbox/apple,ma= ilbox.yaml F: Documentation/devicetree/bindings/net/bluetooth/brcm,bcm4377-bluetooth.= yaml F: Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml F: Documentation/devicetree/bindings/nvmem/apple,efuses.yaml +F: Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml F: Documentation/devicetree/bindings/pci/apple,pcie.yaml F: Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml F: Documentation/devicetree/bindings/power/apple* --=20 2.49.0 From nobody Sun Feb 8 18:30:13 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72BF027990F; Wed, 23 Apr 2025 17:55:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745430930; cv=none; b=iQroFg6LGsoxSmu9tgFRT3KXeTjt7Q3xhkv5gXokIoKrMYAB4q0Ih1noxU4aMBGJ+Nmi1gIM2tg0SZaPejCzIwgQICFbIz53mjRMN7BzqM2pX7tTK/8M3tfpi7E8eBCP0UWhfeeGiNhUUGzr21pAeLwzOkBe7hvBoolVWf+sQwE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745430930; c=relaxed/simple; bh=4LP5yesRqA8jPtdTSc+y65wvh0vzBZCYBvOX2bu7xdI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ay0fCkaiUzSl2mRtLiVgay6lqoDPzzreNJJe04AAxgHv+fghXyqUcFt83FCxDBl6tG+THM7GQGOn/wIvp+E8cEbVDw/ooBbM+Bdjcz/oHBg03wClRlizn5bUnSIA5fIS3+fxb3Pkd7jDsHdmcjbyAfTlMv8rlZMuW72Cf0IJd0w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=db/ZJCXj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="db/ZJCXj" Received: by smtp.kernel.org (Postfix) with ESMTPS id 11690C4CEEB; Wed, 23 Apr 2025 17:55:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745430930; bh=4LP5yesRqA8jPtdTSc+y65wvh0vzBZCYBvOX2bu7xdI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=db/ZJCXjIqigEGUk28BcxxlpY7Y2Ur0DXLeJk8K6mHx8p4E4XSgUU6pa5WqaDMt0k qhmiZUxDt+ULWFgs0fbwuulEuWzR7ZZlhJ37EcDJpjX48TYHqqoZgsr1TkoKnrOw6O bal/VI9tgUE2ZBbLShzKcFqolYfroEsrYgO9Rap3DTt7upVALbGddcZMJD3XY31BRL hI/wAqHl5XRhIKcxCtr8nTik6WD9sdnfoww4fKNqgx3QcSswBhEqy0d7Un21AGhcVM fo1aXWobxxEH2uXhq4qPh9uGI0lBa0Z3luk6tUz6v7lhqiSh1ouKfXb5Z01CBKn5J9 YGym26MIwrGXA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00DB6C369D8; Wed, 23 Apr 2025 17:55:30 +0000 (UTC) From: Sasha Finkelstein via B4 Relay Date: Wed, 23 Apr 2025 19:55:14 +0200 Subject: [PATCH v3 2/3] nvmem: Add apple-spmi-nvmem driver Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250423-spmi-nvmem-v3-2-2985aa722ddc@gmail.com> References: <20250423-spmi-nvmem-v3-0-2985aa722ddc@gmail.com> In-Reply-To: <20250423-spmi-nvmem-v3-0-2985aa722ddc@gmail.com> To: Sven Peter , Janne Grunau , Alyssa Rosenzweig , Neal Gompa , Srinivas Kandagatla , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Finkelstein , Hector Martin X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745430928; l=4524; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=E0YgVY1kIyVeZiBL29ovgAQLgKsalQU9HAAOahuulyE=; b=Tw30Fla+GgRpLdqYeL9wnOiZbN1TCxK6IbF+3fR4dTb6FPo9nn33vTQQplSMNy7iXthYDT0TZ 1GidhyhO98QDClW2fzV4wid0Y6gG9uVUPvR4soMhNW0KLz1EhJgTTwA X-Developer-Key: i=fnkl.kernel@gmail.com; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= X-Endpoint-Received: by B4 Relay for fnkl.kernel@gmail.com/20241124 with auth_id=283 X-Original-From: Sasha Finkelstein Reply-To: fnkl.kernel@gmail.com From: Hector Martin Add a driver for a series of SPMI-attached PMICs present on Apple devices Reviewed-by: Neal Gompa Reviewed-by: Alyssa Rosenzweig Signed-off-by: Hector Martin Co-developed-by: Sasha Finkelstein Signed-off-by: Sasha Finkelstein --- MAINTAINERS | 1 + drivers/nvmem/Kconfig | 13 +++++++++ drivers/nvmem/Makefile | 2 ++ drivers/nvmem/apple-spmi-nvmem.c | 62 ++++++++++++++++++++++++++++++++++++= ++++ 4 files changed, 78 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index f462545c54c55d4bdc22651e07a4c8e155e83016..c9f5ac1eb2458a0206ffe0767cc= 6ed129172e78f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2298,6 +2298,7 @@ F: drivers/iommu/io-pgtable-dart.c F: drivers/irqchip/irq-apple-aic.c F: drivers/nvme/host/apple.c F: drivers/nvmem/apple-efuses.c +F: drivers/nvmem/apple-spmi-nvmem.c F: drivers/pinctrl/pinctrl-apple-gpio.c F: drivers/pwm/pwm-apple.c F: drivers/soc/apple/* diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig index 8671b7c974b933e147154bb40b5d41b5730518d2..ae4afbd8293c64ea0a3a632c717= 2f5496545b12c 100644 --- a/drivers/nvmem/Kconfig +++ b/drivers/nvmem/Kconfig @@ -40,6 +40,19 @@ config NVMEM_APPLE_EFUSES This driver can also be built as a module. If so, the module will be called nvmem-apple-efuses. =20 +config NVMEM_APPLE_SPMI + tristate "Apple SPMI NVMEM" + depends on ARCH_APPLE || COMPILE_TEST + depends on SPMI + select REGMAP_SPMI + help + Say y here to build a driver to expose NVMEM cells for a set of power + and RTC-related settings on a SPMI-attached PMIC present on Apple + devices, such as Apple Silicon Macs. + + This driver can also be built as a module. If so, the module + will be called apple-nvmem-spmi. + config NVMEM_BCM_OCOTP tristate "Broadcom On-Chip OTP Controller support" depends on ARCH_BCM_IPROC || COMPILE_TEST diff --git a/drivers/nvmem/Makefile b/drivers/nvmem/Makefile index 5b77bbb6488bf89bfb305750a1cbf4a6731a0a58..89a3c252c2c8dad9ed7bc6ac984= 1f63ff85c00d5 100644 --- a/drivers/nvmem/Makefile +++ b/drivers/nvmem/Makefile @@ -12,6 +12,8 @@ obj-y +=3D layouts/ # Devices obj-$(CONFIG_NVMEM_APPLE_EFUSES) +=3D nvmem-apple-efuses.o nvmem-apple-efuses-y :=3D apple-efuses.o +obj-$(CONFIG_NVMEM_APPLE_SPMI) +=3D apple_nvmem_spmi.o +apple_nvmem_spmi-y :=3D apple-spmi-nvmem.o obj-$(CONFIG_NVMEM_BCM_OCOTP) +=3D nvmem-bcm-ocotp.o nvmem-bcm-ocotp-y :=3D bcm-ocotp.o obj-$(CONFIG_NVMEM_BRCM_NVRAM) +=3D nvmem_brcm_nvram.o diff --git a/drivers/nvmem/apple-spmi-nvmem.c b/drivers/nvmem/apple-spmi-nv= mem.c new file mode 100644 index 0000000000000000000000000000000000000000..88614005d5ce1dc2d1cafcb89ac= 66d8376ffcc96 --- /dev/null +++ b/drivers/nvmem/apple-spmi-nvmem.c @@ -0,0 +1,62 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MIT +/* + * Apple SPMI NVMEM driver + * + * Copyright The Asahi Linux Contributors + */ + +#include +#include +#include +#include +#include +#include + +static const struct regmap_config apple_spmi_regmap_config =3D { + .reg_bits =3D 16, + .val_bits =3D 8, + .max_register =3D 0xffff, +}; + +static int apple_spmi_nvmem_probe(struct spmi_device *sdev) +{ + struct regmap *regmap; + struct nvmem_config nvmem_cfg =3D { + .dev =3D &sdev->dev, + .name =3D "spmi_nvmem", + .id =3D NVMEM_DEVID_AUTO, + .word_size =3D 1, + .stride =3D 1, + .size =3D 0xffff, + .reg_read =3D (void *)regmap_bulk_read, + .reg_write =3D (void *)regmap_bulk_write, + }; + + regmap =3D devm_regmap_init_spmi_ext(sdev, &apple_spmi_regmap_config); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + nvmem_cfg.priv =3D regmap; + + return PTR_ERR_OR_ZERO(devm_nvmem_register(&sdev->dev, &nvmem_cfg)); +} + +static const struct of_device_id apple_spmi_nvmem_id_table[] =3D { + { .compatible =3D "apple,spmi-nvmem" }, + { }, +}; +MODULE_DEVICE_TABLE(of, apple_spmi_nvmem_id_table); + +static struct spmi_driver apple_spmi_nvmem_driver =3D { + .probe =3D apple_spmi_nvmem_probe, + .driver =3D { + .name =3D "apple-spmi-nvmem", + .of_match_table =3D apple_spmi_nvmem_id_table, + }, +}; + +module_spmi_driver(apple_spmi_nvmem_driver); + +MODULE_LICENSE("Dual MIT/GPL"); +MODULE_AUTHOR("Hector Martin "); +MODULE_DESCRIPTION("Apple SPMI NVMEM driver"); --=20 2.49.0 From nobody Sun Feb 8 18:30:13 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8600B281363; Wed, 23 Apr 2025 17:55:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745430930; cv=none; b=k42STR9It0q/S5QvfjCsFnWJoEygf4ANvjsKb6oBheXW3h8HvKkV5cG/rNay6WrJbr+6OGru9/CRRX+YR0O8Rsft4S86fr+F2yqAwxXMWi2IefcJT4uFEO7W42xSEY23jpJ25SGNwHSoEMjdNOdtnbrqcktEwZk22nf9nITXhaY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745430930; c=relaxed/simple; bh=LqTlMOTyKG90SxBm+2LsZ2iBreijTKs5MFtLinl8fsU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XHNaJKUCWHj0rbeYUH4xNwpFe9GawF5lrvw72AJMUuTW/CkRUmQJ953MN+PKzsTRtdvLH84cWT8Nl3vkjD3niHgzi/JiRrKD2mfZ+UeGYSBlXzlEBYl/Jj/dn7teAgRjwxuamKDKIfQjri9gwfK/VwY2OL8lC2oYuFAtcBjBkXQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kNvGBCsb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kNvGBCsb" Received: by smtp.kernel.org (Postfix) with ESMTPS id 1BB20C4CEEF; Wed, 23 Apr 2025 17:55:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745430930; bh=LqTlMOTyKG90SxBm+2LsZ2iBreijTKs5MFtLinl8fsU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=kNvGBCsbdqjOAF544rxoGi05ba6IN4WQJTp17lFw5UzH/NVUwtiJWNrOS9czjB+VP vAEM3sfCx9tTVWYT6vj75enijhdyVy15wXh5DCRHv9h12isKyLtO7b/ajoc0zOwZ7B 1o8dn+hkR+BeW23r2+64LK58eH3Lpz1EijX4M5kHhxhqbMPngS1w5kiN6f1S8OUOM8 v5Lop9Xzu2CZOI2hZmP5zkpO+CK0p1KzhIHsp4edaiWEfj05JWUsK4Z/1VQTpNYoh5 gGCUa+YgikIiVQUu8B8KWOZ9lbhQLihpmPOGsHGnvrhUHuusdGv3ZtvC5e2om6St3u unrVOURvPh0ww== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F709C369D9; Wed, 23 Apr 2025 17:55:30 +0000 (UTC) From: Sasha Finkelstein via B4 Relay Date: Wed, 23 Apr 2025 19:55:15 +0200 Subject: [PATCH v3 3/3] arm64: dts: apple: Add PMIC NVMEM Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250423-spmi-nvmem-v3-3-2985aa722ddc@gmail.com> References: <20250423-spmi-nvmem-v3-0-2985aa722ddc@gmail.com> In-Reply-To: <20250423-spmi-nvmem-v3-0-2985aa722ddc@gmail.com> To: Sven Peter , Janne Grunau , Alyssa Rosenzweig , Neal Gompa , Srinivas Kandagatla , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Finkelstein , Hector Martin , Nick Chan X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745430928; l=6241; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=DeM6S5yU1Q9D23iuqXSnII2ozGmlxUQVX++5KZ42rPY=; b=Ai7Nln+DzzV3GQSsmZ+tI5PCZmUQAQ4amLuRHrvvziuYtd41qu5TH5212WbhtJhuxcbbTd2w+ F+Y+V3vr6+BBScoWU/r6wjWSvU8GpOYw3oktJIod+SQhSLjTZXgSDsV X-Developer-Key: i=fnkl.kernel@gmail.com; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= X-Endpoint-Received: by B4 Relay for fnkl.kernel@gmail.com/20241124 with auth_id=283 X-Original-From: Sasha Finkelstein Reply-To: fnkl.kernel@gmail.com From: Hector Martin Add device tree entries for NVMEM cells present on the PMIC Signed-off-by: Hector Martin Reviewed-by: Nick Chan Reviewed-by: Alyssa Rosenzweig Co-developed-by: Sasha Finkelstein Signed-off-by: Sasha Finkelstein Reviewed-by: Neal Gompa --- arch/arm64/boot/dts/apple/t6001.dtsi | 1 + arch/arm64/boot/dts/apple/t6002.dtsi | 1 + arch/arm64/boot/dts/apple/t600x-die0.dtsi | 50 +++++++++++++++++++++++++++= ++++ arch/arm64/boot/dts/apple/t8103.dtsi | 50 +++++++++++++++++++++++++++= ++++ arch/arm64/boot/dts/apple/t8112.dtsi | 50 +++++++++++++++++++++++++++= ++++ 5 files changed, 152 insertions(+) diff --git a/arch/arm64/boot/dts/apple/t6001.dtsi b/arch/arm64/boot/dts/app= le/t6001.dtsi index 620b17e4031f069874aaabadbf06b7b29ec4031e..d2cf81926f284ccf7627701cc82= edff31d4d72d6 100644 --- a/arch/arm64/boot/dts/apple/t6001.dtsi +++ b/arch/arm64/boot/dts/apple/t6001.dtsi @@ -11,6 +11,7 @@ #include #include #include +#include =20 #include "multi-die-cpp.h" =20 diff --git a/arch/arm64/boot/dts/apple/t6002.dtsi b/arch/arm64/boot/dts/app= le/t6002.dtsi index a963a5011799a0480f88688fb4372a31f0bbf806..e36f422d257d8fe3a62bfa6e0f0= e0dc6c34608a4 100644 --- a/arch/arm64/boot/dts/apple/t6002.dtsi +++ b/arch/arm64/boot/dts/apple/t6002.dtsi @@ -11,6 +11,7 @@ #include #include #include +#include =20 #include "multi-die-cpp.h" =20 diff --git a/arch/arm64/boot/dts/apple/t600x-die0.dtsi b/arch/arm64/boot/dt= s/apple/t600x-die0.dtsi index 4c224e686ffe5602329f7f394d3354559c4130ab..110bc6719512e334e04b496fb15= 7cb4368679957 100644 --- a/arch/arm64/boot/dts/apple/t600x-die0.dtsi +++ b/arch/arm64/boot/dts/apple/t600x-die0.dtsi @@ -50,6 +50,56 @@ nub_spmi0: spmi@2920a1300 { reg =3D <0x2 0x920a1300 0x0 0x100>; #address-cells =3D <2>; #size-cells =3D <0>; + + pmic1: pmic@f { + compatible =3D "apple,maverick-pmic", "apple,spmi-nvmem"; + reg =3D <0xf SPMI_USID>; + + nvmem-layout { + compatible =3D "fixed-layout"; + #address-cells =3D <1>; + #size-cells =3D <1>; + + pm_setting: pm-setting@1405 { + reg =3D <0x1405 0x1>; + }; + + rtc_offset: rtc-offset@1411 { + reg =3D <0x1411 0x6>; + }; + + boot_stage: boot-stage@6001 { + reg =3D <0x6001 0x1>; + }; + + boot_error_count: boot-error-count@6002 { + reg =3D <0x6002 0x1>; + bits =3D <0 4>; + }; + + panic_count: panic-count@6002 { + reg =3D <0x6002 0x1>; + bits =3D <4 4>; + }; + + boot_error_stage: boot-error-stage@6003 { + reg =3D <0x6003 0x1>; + }; + + shutdown_flag: shutdown-flag@600f { + reg =3D <0x600f 0x1>; + bits =3D <3 1>; + }; + + fault_shadow: fault-shadow@867b { + reg =3D <0x867b 0x10>; + }; + + socd: socd@8b00 { + reg =3D <0x8b00 0x400>; + }; + }; + }; }; =20 wdt: watchdog@2922b0000 { diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/app= le/t8103.dtsi index bdb1cb9e406a441e458b1c735359b0148146e91b..20faf0c0d80927b2e18dd966a61= b5507b322c72f 100644 --- a/arch/arm64/boot/dts/apple/t8103.dtsi +++ b/arch/arm64/boot/dts/apple/t8103.dtsi @@ -747,6 +747,56 @@ nub_spmi: spmi@23d0d9300 { reg =3D <0x2 0x3d0d9300 0x0 0x100>; #address-cells =3D <2>; #size-cells =3D <0>; + + pmic1: pmic@f { + compatible =3D "apple,sera-pmic", "apple,spmi-nvmem"; + reg =3D <0xf SPMI_USID>; + + nvmem-layout { + compatible =3D "fixed-layout"; + #address-cells =3D <1>; + #size-cells =3D <1>; + + boot_stage: boot-stage@9f01 { + reg =3D <0x9f01 0x1>; + }; + + boot_error_count: boot-error-count@9f02 { + reg =3D <0x9f02 0x1>; + bits =3D <0 4>; + }; + + panic_count: panic-count@9f02 { + reg =3D <0x9f02 0x1>; + bits =3D <4 4>; + }; + + boot_error_stage: boot-error-stage@9f03 { + reg =3D <0x9f03 0x1>; + }; + + shutdown_flag: shutdown-flag@9f0f { + reg =3D <0x9f0f 0x1>; + bits =3D <3 1>; + }; + + fault_shadow: fault-shadow@a67b { + reg =3D <0xa67b 0x10>; + }; + + socd: socd@ab00 { + reg =3D <0xab00 0x400>; + }; + + pm_setting: pm-setting@d001 { + reg =3D <0xd001 0x1>; + }; + + rtc_offset: rtc-offset@d100 { + reg =3D <0xd100 0x6>; + }; + }; + }; }; =20 pinctrl_nub: pinctrl@23d1f0000 { diff --git a/arch/arm64/boot/dts/apple/t8112.dtsi b/arch/arm64/boot/dts/app= le/t8112.dtsi index 950d1f906ba3023c1d118179207a2099345aae94..e95711d8337f6cea898e88a3d56= 4caf2c4f94404 100644 --- a/arch/arm64/boot/dts/apple/t8112.dtsi +++ b/arch/arm64/boot/dts/apple/t8112.dtsi @@ -787,6 +787,56 @@ nub_spmi: spmi@23d714000 { reg =3D <0x2 0x3d714000 0x0 0x100>; #address-cells =3D <2>; #size-cells =3D <0>; + + pmic1: pmic@e { + compatible =3D "apple,stowe-pmic", "apple,spmi-nvmem"; + reg =3D <0xe SPMI_USID>; + + nvmem-layout { + compatible =3D "fixed-layout"; + #address-cells =3D <1>; + #size-cells =3D <1>; + + fault_shadow: fault-shadow@867b { + reg =3D <0x867b 0x10>; + }; + + socd: socd@8b00 { + reg =3D <0x8b00 0x400>; + }; + + boot_stage: boot-stage@f701 { + reg =3D <0xf701 0x1>; + }; + + boot_error_count: boot-error-count@f702 { + reg =3D <0xf702 0x1>; + bits =3D <0 4>; + }; + + panic_count: panic-count@f702 { + reg =3D <0xf702 0x1>; + bits =3D <4 4>; + }; + + boot_error_stage: boot-error-stage@f703 { + reg =3D <0xf703 0x1>; + }; + + shutdown_flag: shutdown-flag@f70f { + reg =3D <0xf70f 0x1>; + bits =3D <3 1>; + }; + + pm_setting: pm-setting@f801 { + reg =3D <0xf801 0x1>; + }; + + rtc_offset: rtc-offset@f900 { + reg =3D <0xf900 0x6>; + }; + }; + }; }; =20 pinctrl_smc: pinctrl@23e820000 { --=20 2.49.0