From patchwork Thu Apr 17 20:14:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Finkelstein X-Patchwork-Id: 14056174 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D33C0C369C9 for ; Thu, 17 Apr 2025 20:16:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=vqfxeWiL5mg3eLlMpj6Ixu2GTI5vaS9FIG9KJTJ9PHM=; b=PZWzY+vWlmim1uplTBwmm24HP2 dxQU2zFBp/XH9YKnGM58tV7c1Y/ny8FbDrsU1Me/Tinm17EjrC6RPBGdz9JpkodnSCU+qdQRJ5/vD 6QYIl7lNm8DvImKwVuA+eLqPBB1sSvpzpTrRoyh+mM7zbc3YWkhspAupTQsyhNEqLg9g5z4z77Ols tMM882fYfD4lSjGbyOtBiMiYlUohbzlyPJdcz0b3eqaEAqtQ4vyHuJRl5RPZ01z+0LVH+T+q1MogQ Lp4AShuzsSxfTqGJt1q/9X3QaWsIDctuWELtn/KAZWrTFYZrLDSZdrUsBipnL5+X9lvcjfltIdj7e oNXomRiQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5VfG-0000000EG4y-1edS; Thu, 17 Apr 2025 20:16:50 +0000 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5VdO-0000000EFoO-3udy for linux-arm-kernel@lists.infradead.org; Thu, 17 Apr 2025 20:14:55 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id BC0EC68472; Thu, 17 Apr 2025 20:14:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 9D49EC4CEEA; Thu, 17 Apr 2025 20:14:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744920893; bh=aMdEh0YzLhR0ClRxPLS5MigjInPEcB5sd9INEKNsS88=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=EIx9DsuhfuFuwmHju7KgUg3LgdojFfQ6201BXFB78CUJ3NVL1Mw0QxfQMq3tMPgUC aJXjFcGZhU5GQI71AcIVlJaEvCjX8Y87c/OkjrOfnvcy3DJ+EwlWuf/mSKeYPFuNzI q0jVrTPWG0K+GHHNKoiCqpSD0jMbK+uh3nVCFbmgDo14JzpIqM66U3nkFWpxxjYlGx tQcsDZs+8DTQo0d29sg41oterajbSFdplWu4KDStMoIn6XmR0Xg8HM80Q9PC+Qf8VG W4zj8MSlQgBQmhGdpCR2z4Gp3fBo0OcTTOElM8Q3LlI64Kg8Ypzw8LVf5bYnnAYVJ2 7DcT2DdwNqL9Q== 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 83CFCC369CA; Thu, 17 Apr 2025 20:14:53 +0000 (UTC) Date: Thu, 17 Apr 2025 22:14:49 +0200 Subject: [PATCH v2 1/3] dt-bindings: spmi: Add generic SPMI NVMEM MIME-Version: 1.0 Message-Id: <20250417-spmi-nvmem-v2-1-b88851e34afb@gmail.com> References: <20250417-spmi-nvmem-v2-0-b88851e34afb@gmail.com> In-Reply-To: <20250417-spmi-nvmem-v2-0-b88851e34afb@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=1744920892; l=2493; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=qFT9kwFfU2f7bD/dtTWCsGgokdHWxW+ICVtDXhupydE=; b=7IzgqtLCTQW165We2ILZabYySsAbC1WMcO6dkhnI7toHak+Agj/KAjWbRRLLMVuRpw6guwkRE oiqh8S7uXCKAe+ZjaHXP/rZjUDEKFY1nnujyaguKlLQa72zBDU45qgE 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 X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: fnkl.kernel@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Sasha Finkelstein From: Sasha Finkelstein Add bindings for exposing SPMI registers as NVMEM cells Signed-off-by: Sasha Finkelstein Reviewed-by: Alyssa Rosenzweig --- .../devicetree/bindings/nvmem/spmi-nvmem.yaml | 54 ++++++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 55 insertions(+) diff --git a/Documentation/devicetree/bindings/nvmem/spmi-nvmem.yaml b/Documentation/devicetree/bindings/nvmem/spmi-nvmem.yaml new file mode 100644 index 0000000000000000000000000000000000000000..d16b27128f97b5d38fb6ddb5109c70cda5e2ee15 --- /dev/null +++ b/Documentation/devicetree/bindings/nvmem/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/spmi-nvmem.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Generic 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: spmi-nvmem + + reg: + maxItems: 1 + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include + + pmic@f { + compatible = "apple,maverick-pmic", "spmi-nvmem"; + reg = <0xf SPMI_USID>; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + boot_stage: boot-stage@6001 { + reg = <0x6001 0x1>; + }; + }; + }; + +... diff --git a/MAINTAINERS b/MAINTAINERS index 96b82704950184bd71623ff41fc4df31e4c7fe87..e7b2d0df81b387ba5398957131971588dc7b89dc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2277,6 +2277,7 @@ F: Documentation/devicetree/bindings/mailbox/apple,mailbox.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/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* From patchwork Thu Apr 17 20:14:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Finkelstein X-Patchwork-Id: 14056182 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0C89FC369C9 for ; Thu, 17 Apr 2025 20:22:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=2MpjCQqmWuGrL3nuUX6ZkIlVCts3T0/uKrGH2FUXuQg=; b=Hs6ocX1TCvUkwqG/gooM9VgCDs H+A40OW9Rwyousg9mWQykyD9zzlrg9a4ctsi+kbsovpsWJ8osLLWGPsgdIE0ecTMiwQbOboZJUPXq Zyc4ritrDL+M6iwpNclHFFNk75CpT2OF6tYH76WzMF3PVnhwEgwiAh3dSUeAHSGHxae7+L7lSX7XH 9UobUWbwJA25IHn1itNxRCDNMrqcmSEedX/6ctK/P5W2knvN4rsemZIXL/cJZOOEi/h9+4MphiYDo gsEgsolxwMLv9I9lc8t/gsGqSristtiUZk/3pw79tD2ly9FToM9D5ZJ4a68Ou3tSF5bnsdiNDCVjc 9ZXn4Bfw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5Vkk-0000000EGjA-39a8; Thu, 17 Apr 2025 20:22:30 +0000 Received: from nyc.source.kernel.org ([147.75.193.91]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5VdP-0000000EFoR-0tQv for linux-arm-kernel@lists.infradead.org; Thu, 17 Apr 2025 20:14:57 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id C94F7A4A5DE; Thu, 17 Apr 2025 20:09:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id B4627C4CEE7; Thu, 17 Apr 2025 20:14:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744920893; bh=VtNJxmhsI2s39FgW3VY4pSVvAt5jJYa2aFza7f+ewM0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=u61sfBLnkFbVfo//3Npl2efxEIChuX9BNhuGj/kF8i3KeN9nkqNbaP8ngKuY/YXZv Ckzgm1M7k9GkEd33UtGT+bZ440U4YSnLzVBEn+nsxe0JV/vZg+lSN8g/cofZq0jJ1p C8yRrXE06iKfBuSXLTkFZNnhfIm6NlvsWbChdCOk+nrq3TvFSYVDSw+2aDbQ/RWovm gGZtlml5+yIVhE4y291bz1Gv8FgxEUaRrCGqDuaS2xc4d6Np0WRMmMRyDedCcvBCjQ Nv2Rt6zm6nXW3JZT20sPUBDdcB7+Tzid8xDBahurXJHoR5/zw7nh6GHPuv/5RlD4vI OwE8SdK5KZEeA== 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 9DBCDC369D0; Thu, 17 Apr 2025 20:14:53 +0000 (UTC) Date: Thu, 17 Apr 2025 22:14:50 +0200 Subject: [PATCH v2 2/3] nvmem: Add spmi-nvmem driver MIME-Version: 1.0 Message-Id: <20250417-spmi-nvmem-v2-2-b88851e34afb@gmail.com> References: <20250417-spmi-nvmem-v2-0-b88851e34afb@gmail.com> In-Reply-To: <20250417-spmi-nvmem-v2-0-b88851e34afb@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=1744920892; l=4485; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=QxvKeCxMx0fhrb/mzZRj0aBarxG7UUKFK3NomXpfiRA=; b=T/XlRbf/iR6QeRjUc4OpBst1lMVqTc3/dcAAYKyRb3CFRagS9Kjvzn0fA67TcIbYgQTpI171o sxVCLUf2f/ODsbmtkXPcojhHWWqfgud+omcttBWrXAx3spi9TM3Oqhr 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250417_131455_394063_FDFEEE29 X-CRM114-Status: GOOD ( 19.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: fnkl.kernel@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Sasha Finkelstein From: Hector Martin This driver exposes a SPMI device as an NVMEM device. It is intended to be used with e.g. PMUs/PMICs that are used to hold power management configuration, such as used on Apple Silicon Macs. Reviewed-by: Neal Gompa Signed-off-by: Hector Martin Co-developed-by: Sasha Finkelstein Signed-off-by: Sasha Finkelstein Reviewed-by: Alyssa Rosenzweig --- MAINTAINERS | 1 + drivers/nvmem/Kconfig | 13 ++++++++++ drivers/nvmem/Makefile | 2 ++ drivers/nvmem/spmi-nvmem.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index e7b2d0df81b387ba5398957131971588dc7b89dc..63c12f901aed1f3e6de8227d6db34af1bd046fe6 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/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..c25c599fc79648e890ccc4e003224c9a218f393f 100644 --- a/drivers/nvmem/Kconfig +++ b/drivers/nvmem/Kconfig @@ -310,6 +310,19 @@ config NVMEM_SNVS_LPGPR This driver can also be built as a module. If so, the module will be called nvmem-snvs-lpgpr. +config NVMEM_SPMI + tristate "Generic SPMI NVMEM" + depends on SPMI + select REGMAP_SPMI + help + Say y here to build a generic driver to expose a SPMI device + as a NVMEM provider. This can be used for PMIC/PMU devices which + are used to store power and RTC-related settings on certain + platforms, such as Apple Silicon Macs. + + This driver can also be built as a module. If so, the module + will be called nvmem-spmi. + config NVMEM_SPMI_SDAM tristate "SPMI SDAM Support" depends on SPMI diff --git a/drivers/nvmem/Makefile b/drivers/nvmem/Makefile index 5b77bbb6488bf89bfb305750a1cbf4a6731a0a58..b639f4284184db026bb27b11e04d54b8f7ff166f 100644 --- a/drivers/nvmem/Makefile +++ b/drivers/nvmem/Makefile @@ -64,6 +64,8 @@ obj-$(CONFIG_NVMEM_SC27XX_EFUSE) += nvmem-sc27xx-efuse.o nvmem-sc27xx-efuse-y := sc27xx-efuse.o obj-$(CONFIG_NVMEM_SNVS_LPGPR) += nvmem_snvs_lpgpr.o nvmem_snvs_lpgpr-y := snvs_lpgpr.o +obj-$(CONFIG_NVMEM_SPMI) += nvmem_spmi.o +nvmem_spmi-y := spmi-nvmem.o obj-$(CONFIG_NVMEM_SPMI_SDAM) += nvmem_qcom-spmi-sdam.o nvmem_qcom-spmi-sdam-y += qcom-spmi-sdam.o obj-$(CONFIG_NVMEM_SPRD_EFUSE) += nvmem_sprd_efuse.o diff --git a/drivers/nvmem/spmi-nvmem.c b/drivers/nvmem/spmi-nvmem.c new file mode 100644 index 0000000000000000000000000000000000000000..fff6162cb22dd7ab45883f004f5b63ebae014698 --- /dev/null +++ b/drivers/nvmem/spmi-nvmem.c @@ -0,0 +1,62 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MIT +/* + * Generic SPMI NVMEM driver + * + * Copyright The Asahi Linux Contributors + */ + +#include +#include +#include +#include +#include +#include + +static const struct regmap_config spmi_regmap_config = { + .reg_bits = 16, + .val_bits = 8, + .max_register = 0xffff, +}; + +static int spmi_nvmem_probe(struct spmi_device *sdev) +{ + struct regmap *regmap; + struct nvmem_config nvmem_cfg = { + .dev = &sdev->dev, + .name = "spmi_nvmem", + .id = NVMEM_DEVID_AUTO, + .word_size = 1, + .stride = 1, + .size = 0xffff, + .reg_read = (void *)regmap_bulk_read, + .reg_write = (void *)regmap_bulk_write, + }; + + regmap = devm_regmap_init_spmi_ext(sdev, &spmi_regmap_config); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + nvmem_cfg.priv = regmap; + + return PTR_ERR_OR_ZERO(devm_nvmem_register(&sdev->dev, &nvmem_cfg)); +} + +static const struct of_device_id spmi_nvmem_id_table[] = { + { .compatible = "spmi-nvmem" }, + { }, +}; +MODULE_DEVICE_TABLE(of, spmi_nvmem_id_table); + +static struct spmi_driver spmi_nvmem_driver = { + .probe = spmi_nvmem_probe, + .driver = { + .name = "spmi-nvmem", + .of_match_table = spmi_nvmem_id_table, + }, +}; + +module_spmi_driver(spmi_nvmem_driver); + +MODULE_LICENSE("Dual MIT/GPL"); +MODULE_AUTHOR("Hector Martin "); +MODULE_DESCRIPTION("SPMI NVMEM driver"); From patchwork Thu Apr 17 20:14:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Finkelstein X-Patchwork-Id: 14056180 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 55F4CC369CA for ; Thu, 17 Apr 2025 20:18:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=wut3vFO3mMUbsVpsJj+Uk+mcbypGXnlAOsPBjvWlexY=; b=uejTHChc/r9kscpyyzMbA8sig0 aB/6ItzOZLSm3GkZJ5r67gP77cLy8QdXyE/4Ua13zjKTqiUbHOixYMLQGyXdbR/t1Z4scZQDgUiqp AcKW8DyAGh7Cwl6JiVsu+a3PDVFC11Vf+2kFbGRwygF0R/WMM54Xs/lhd2Aag9YyGir8SWnJoC52d N1saJ/IKJfN2FuAJTPBWJoTJrel5xVz6NYt2tNW0BASmEBxYdw7W/+NVErpiOROhZasv+1/gYZdUT wPWq4lQ+WUbCxK8raDZBBucgHhaZtQ8+UABc4ehIyYqVdI1XArEH/TMSA3thwQ883ULfMEvjf6D18 f7HjD5QQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5Vh6-0000000EGGw-1U4p; Thu, 17 Apr 2025 20:18:44 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5VdP-0000000EFoQ-0Z5X for linux-arm-kernel@lists.infradead.org; Thu, 17 Apr 2025 20:14:56 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id EF1B74A4D4; Thu, 17 Apr 2025 20:14:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id BEFB1C4CEF1; Thu, 17 Apr 2025 20:14:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744920893; bh=cL0NbqoPrjxln+M7eg5VJqlhg4NHXso2/3QwkVlw3u4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=RbUWdE1Kk3F0m64YGHn2DU3QVcsO45kku6DKPv3KNNBWvL2GqNjiSbK4P4rV8PXig 700l5bF+9c+eu46lnGf7ZuZzD1KIqdBJqP1VpKKxF6cKYg544WS89IalcyknI89/Ci d7tylv6wAuKVnWZwL4jLPb+1eT9H/9ZB6Lz6udKvW3CbXuEmfoPjaohlR90kG9NaqX PFwC8wVzHrskfpP/PBgyJpj+93UUR66xb0puI4fHR3VmU7eX19Y2PTZg/eJegwlO8h m9KL+fxqo0j0JNWZ8tU3dck9rgeGpR59t9D7iZ6WZ2hIN6AD3U/1RmpAzS2FJUad36 9xy0/L46wyOWQ== 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 B3397C369CB; Thu, 17 Apr 2025 20:14:53 +0000 (UTC) Date: Thu, 17 Apr 2025 22:14:51 +0200 Subject: [PATCH v2 3/3] arm64: dts: apple: Add PMU NVMEM MIME-Version: 1.0 Message-Id: <20250417-spmi-nvmem-v2-3-b88851e34afb@gmail.com> References: <20250417-spmi-nvmem-v2-0-b88851e34afb@gmail.com> In-Reply-To: <20250417-spmi-nvmem-v2-0-b88851e34afb@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=1744920892; l=6119; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=r3FXIrQkL2BPaLQ9NPi9PQxQaHbfYnGD3KEb4Aoaexs=; b=In7D/S1SqE8ML03r0v4/Q27rhkgpXJh+W6qeLcyT2U4yunqQzRLkOktYLajotf0lvnibKIzPk mKpCH074UH4CAC0Rei2siOEs7n/dfIWsdyMQ6BG12Egf9EmuL80KQ6g 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250417_131455_223937_6FFE6848 X-CRM114-Status: UNSURE ( 9.49 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: fnkl.kernel@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Sasha Finkelstein From: Hector Martin Add device tree entries for NVMEM cells present on the PMU Signed-off-by: Hector Martin Co-developed-by: Sasha Finkelstein Signed-off-by: Sasha Finkelstein Reviewed-by: Alyssa Rosenzweig Reviewed-by: Nick Chan --- 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/apple/t6001.dtsi index 620b17e4031f069874aaabadbf06b7b29ec4031e..d2cf81926f284ccf7627701cc82edff31d4d72d6 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 #include "multi-die-cpp.h" diff --git a/arch/arm64/boot/dts/apple/t6002.dtsi b/arch/arm64/boot/dts/apple/t6002.dtsi index a963a5011799a0480f88688fb4372a31f0bbf806..e36f422d257d8fe3a62bfa6e0f0e0dc6c34608a4 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 #include "multi-die-cpp.h" diff --git a/arch/arm64/boot/dts/apple/t600x-die0.dtsi b/arch/arm64/boot/dts/apple/t600x-die0.dtsi index 4c224e686ffe5602329f7f394d3354559c4130ab..fba01727ee8bd67990cb001a5727d5dd2d01e2ee 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 = <0x2 0x920a1300 0x0 0x100>; #address-cells = <2>; #size-cells = <0>; + + pmic1: pmic@f { + compatible = "apple,maverick-pmic", "spmi-nvmem"; + reg = <0xf SPMI_USID>; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + pm_setting: pm-setting@1405 { + reg = <0x1405 0x1>; + }; + + rtc_offset: rtc-offset@1411 { + reg = <0x1411 0x6>; + }; + + boot_stage: boot-stage@6001 { + reg = <0x6001 0x1>; + }; + + boot_error_count: boot-error-count@6002 { + reg = <0x6002 0x1>; + bits = <0 4>; + }; + + panic_count: panic-count@6002 { + reg = <0x6002 0x1>; + bits = <4 4>; + }; + + boot_error_stage: boot-error-stage@6003 { + reg = <0x6003 0x1>; + }; + + shutdown_flag: shutdown-flag@600f { + reg = <0x600f 0x1>; + bits = <3 1>; + }; + + fault_shadow: fault-shadow@867b { + reg = <0x867b 0x10>; + }; + + socd: socd@8b00 { + reg = <0x8b00 0x400>; + }; + }; + }; }; wdt: watchdog@2922b0000 { diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi index bdb1cb9e406a441e458b1c735359b0148146e91b..3892fbe6a955513cad2ae836acc3e83009ab7cc5 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 = <0x2 0x3d0d9300 0x0 0x100>; #address-cells = <2>; #size-cells = <0>; + + pmic1: pmic@f { + compatible = "apple,sera-pmic", "spmi-nvmem"; + reg = <0xf SPMI_USID>; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + boot_stage: boot-stage@9f01 { + reg = <0x9f01 0x1>; + }; + + boot_error_count: boot-error-count@9f02 { + reg = <0x9f02 0x1>; + bits = <0 4>; + }; + + panic_count: panic-count@9f02 { + reg = <0x9f02 0x1>; + bits = <4 4>; + }; + + boot_error_stage: boot-error-stage@9f03 { + reg = <0x9f03 0x1>; + }; + + shutdown_flag: shutdown-flag@9f0f { + reg = <0x9f0f 0x1>; + bits = <3 1>; + }; + + fault_shadow: fault-shadow@a67b { + reg = <0xa67b 0x10>; + }; + + socd: socd@ab00 { + reg = <0xab00 0x400>; + }; + + pm_setting: pm-setting@d001 { + reg = <0xd001 0x1>; + }; + + rtc_offset: rtc-offset@d100 { + reg = <0xd100 0x6>; + }; + }; + }; }; pinctrl_nub: pinctrl@23d1f0000 { diff --git a/arch/arm64/boot/dts/apple/t8112.dtsi b/arch/arm64/boot/dts/apple/t8112.dtsi index 950d1f906ba3023c1d118179207a2099345aae94..325e2ac22b3c88d863b2270c39a0a05d625e3f10 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 = <0x2 0x3d714000 0x0 0x100>; #address-cells = <2>; #size-cells = <0>; + + pmic1: pmic@e { + compatible = "apple,stowe-pmic", "spmi-nvmem"; + reg = <0xe SPMI_USID>; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + fault_shadow: fault-shadow@867b { + reg = <0x867b 0x10>; + }; + + socd: socd@8b00 { + reg = <0x8b00 0x400>; + }; + + boot_stage: boot-stage@f701 { + reg = <0xf701 0x1>; + }; + + boot_error_count: boot-error-count@f702 { + reg = <0xf702 0x1>; + bits = <0 4>; + }; + + panic_count: panic-count@f702 { + reg = <0xf702 0x1>; + bits = <4 4>; + }; + + boot_error_stage: boot-error-stage@f703 { + reg = <0xf703 0x1>; + }; + + shutdown_flag: shutdown-flag@f70f { + reg = <0xf70f 0x1>; + bits = <3 1>; + }; + + pm_setting: pm-setting@f801 { + reg = <0xf801 0x1>; + }; + + rtc_offset: rtc-offset@f900 { + reg = <0xf900 0x6>; + }; + }; + }; }; pinctrl_smc: pinctrl@23e820000 {