From patchwork Tue Apr 15 21:52:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Finkelstein X-Patchwork-Id: 14052838 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 51EE7C369AB for ; Tue, 15 Apr 2025 21:57:12 +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=8pxXUO13OmywnjWbndSNjsRcRezVKvS4TSdwRLkNCB0=; b=S3WWvjE+T6gw0pxUShfJvYUfqv RUW8jUOYixGWdlXnaVsoHrlGXr76EML/JuFI3MIdr1WJmFi8Oqq0qbKqL8osiwXZROawy7JhPujmV ArmPLf9LBdSKKldENgais4rMYuFhgIVZdubQ0krEkqQRc2pYGt+a0WS6mxXX7RlZqTTg82qFRz5Dh oTeGzWimwFdpClXgDaMUijT81vV3cbJslymhuxbwyN4v2ZzOpH7g5p33J81E3TZ4FQVLkQ5/3EqqV nLEutBwsF8nAcS/KxbCunm+/7W4hDOFjoO+cjuOdt+jX6FidwfExnrM5msaC7PZJHvnJ6WU1mLR7Z zDl9NM8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4oH9-00000007G8K-0FUL; Tue, 15 Apr 2025 21:57:03 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4oCy-00000007FH4-2xSZ for linux-arm-kernel@lists.infradead.org; Tue, 15 Apr 2025 21:52:46 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id D13695C4B0F; Tue, 15 Apr 2025 21:50:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 82C7AC4CEEB; Tue, 15 Apr 2025 21:52:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744753963; bh=wfntpCJd/e5roM+54wRFN7CgYmeIDo3y6frBznii81c=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=eKhQLP6FH7xmcUyckmyjejCwflDtvSAli4tTNgAZ+aBAlUsHToD25NrJuJU+e3udZ r40l9Qfi4TCmgk0pQ9z+CIX6bgDzYw1cmG/wQBCwEPx5xp78EyAcx8KElYzDmVYfLL lysGeEPwHjH9mFqlhOjLZbIdzJYSSyhzIAcWmeRjHJDYi+I8a6APETeTlc7qeiUMqK SV3beJlcx2XRY5xu5smvyLt5iwmYreb2Yh0GM9cJPUWBbWNGhZQu87ZF+QB/dK180B NqnVI4iOviuRosjQgQ9ZiF/j2kMgpp5AXdIv7pVlUDNZy2tQRkBl63ET78aV/nWu/4 /mnX4gui5bMHA== 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 72187C369AB; Tue, 15 Apr 2025 21:52:43 +0000 (UTC) Date: Tue, 15 Apr 2025 23:52:34 +0200 Subject: [PATCH 1/3] dt-bindings: spmi: Add generic SPMI NVMEM MIME-Version: 1.0 Message-Id: <20250415-spmi-nvmem-v1-1-22067be253cf@gmail.com> References: <20250415-spmi-nvmem-v1-0-22067be253cf@gmail.com> In-Reply-To: <20250415-spmi-nvmem-v1-0-22067be253cf@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=1744753962; l=2233; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=591KYbP5CwVkqQ6YYbLbnzAujw1V85G/WXwDPpVeG5A=; b=dtHz27lt85WFhI+s2T92MhW7ImjxiLCLFGTibgzijQjFJYGkCw1YoJ6DMIPShYH1XV08HvqP6 vT8H80dEvlNDXgEm50C3wLDnRILWCNSnLf4fl0U5MKN3bFeT8X5KjrN 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-20250415_145244_862272_CAE48FB5 X-CRM114-Status: GOOD ( 12.18 ) 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 --- .../devicetree/bindings/nvmem/spmi-nvmem.yaml | 44 ++++++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 45 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..0041babefc37ed4d82d7d6f68fc67d29eed53d9f --- /dev/null +++ b/Documentation/devicetree/bindings/nvmem/spmi-nvmem.yaml @@ -0,0 +1,44 @@ +# 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-pmu + - apple,sera-pmu + - apple,stowe-pmu + - const: spmi-nvmem + + reg: + maxItems: 1 + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include + + pmu@f { + compatible = "apple,maverick-pmu", "spmi-nvmem"; + reg = <0xf SPMI_USID>; + }; + +... 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 Tue Apr 15 21:52:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Finkelstein X-Patchwork-Id: 14052839 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 634A3C369AB for ; Tue, 15 Apr 2025 21:59:02 +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=EKF5OPCwpRYb9QtC3Y0mBbPrzxCSXmpYmE7O+0Istwg=; b=x79BAkwoMpE/wiK5ldKoSLOYqM x0OUnB1BWG3Ivw6fhvYYtW7b9+HawHP3HYMQjtj9WFc4mFnKRO1RCLrbQJWVY/X231QM342W/g+Jq c3Egk5R7uGmviiaddoWnU4Lh3tlDgTpZnW2q5/zO8by+ptsDuy+J9AN2yHzMjXnX3scXVK8C0PTUk v2TOL0EHO13nYocrtHZyvnvTdcRbrPuyhQNvxPn6PMMUR9KvXzfnOoHCkfV2qDDo2R/cLaFEQscwP tzCX85KQoaYTvHcsgiKiVCt8svU7mEU9UP+YmDOIceSDugVMcNVYGQGq2Sk9k6w6dcXn8NHwc7a5O BllC1ifw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4oIv-00000007GNx-34OK; Tue, 15 Apr 2025 21:58:53 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4oCy-00000007FGr-3MPB for linux-arm-kernel@lists.infradead.org; Tue, 15 Apr 2025 21:52:46 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id AFA4D44BFC; Tue, 15 Apr 2025 21:52:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 90983C4CEEE; Tue, 15 Apr 2025 21:52:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744753963; bh=BVmxalFQ+1RPy6SBUBeC9SYYAKWIGqXGuT46WhlJFKg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=WWrbTkss41+whbRqBMJbEjZ21A/TM+LiJoMG65JDK8PCWit3uREjR/aSksS+F0zLj Osi5+vX7Y3c73wHpQMkxXtYFlCdp3PAxbxQ0jXVjK8eYGrNvc3+i/ptAvQhVaK22YO UQEKMAYcJqag/yU1PyIdKaMy4NmBJLK3m89AijDjtZy/caFLpRYl3tWTH0GC8DFteU XvChc9c9uXuQUa3w6cN21EMzTlJEbEqO8f+PQfk/A++bQx57hOVQ/g1tUAX3DRVT8q wWjRpSV+p7Stu2gDmvRK2oCf4PHBS1NaSsCtgGonxO3N+hosO7UBdILdLBKB2ZELAY c8hFNcthH5SUw== 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 80748C369C4; Tue, 15 Apr 2025 21:52:43 +0000 (UTC) Date: Tue, 15 Apr 2025 23:52:35 +0200 Subject: [PATCH 2/3] nvmem: Add spmi-nvmem driver MIME-Version: 1.0 Message-Id: <20250415-spmi-nvmem-v1-2-22067be253cf@gmail.com> References: <20250415-spmi-nvmem-v1-0-22067be253cf@gmail.com> In-Reply-To: <20250415-spmi-nvmem-v1-0-22067be253cf@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=1744753962; l=4406; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=UH9wM81/psSJmAH9PoTzOXnAfvXuDX0j1X8GybEfIcs=; b=ieKtICAShggkKCQz1Mc2h1LtL8JAugPgVHn+knoMlqP7wMi6HtoHN0/noeAVjK3K3xu0aQXCn PsV/shL78C2DCkb7cLxqSJ6J6VRolZ5FBXf4TzylXi42+VGGyPxcy0L 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-20250415_145244_901533_6ED4339E X-CRM114-Status: GOOD ( 20.71 ) 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. Signed-off-by: Hector Martin Signed-off-by: Sasha Finkelstein Reviewed-by: Neal Gompa --- MAINTAINERS | 1 + drivers/nvmem/Kconfig | 14 +++++++++++ drivers/nvmem/Makefile | 2 ++ drivers/nvmem/spmi-nvmem.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 79 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..9ec907d8aa6ef7df0ea45cc35e92d8239d2705ee 100644 --- a/drivers/nvmem/Kconfig +++ b/drivers/nvmem/Kconfig @@ -310,6 +310,20 @@ 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" + default ARCH_APPLE + 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 Tue Apr 15 21:52:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Finkelstein X-Patchwork-Id: 14052840 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 007A1C369AB for ; Tue, 15 Apr 2025 22:00: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=TidItVX470qd1Qz4cbTqqLWHe7MrSVKQ3GsYvWrIp8c=; b=IRCFTv0HL3ej9P0Dn6nnWOyNbd zqNgCshy7FKXXkofp+qkBNv95qLB0SpMEegg5jnK7SbmnP+3cAlesEGeU3dMFjDdhjXT9PLY4oqih dEpAp57Heuyhv/UOqV21FalGpMegZhh9tle2PZpn36fmhtoULfcVgNCE9XS/aL7VXuQ5VX3kD2kDN bP+ydXnK1SZtkoMpWCGlZj9iTJJsry5tCszlaJEI0dZoZ/Y9te/h0eraNz3db947r8/ceDhzAlNas ksVD+Bsl1SFwGc/uvR/Om4MWDwmEKNmdpvKiOCpcFj+ZAuGtjvcoWJouLk4H8Sla4VAnquJkjHdoN W4HIKQyQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4oKj-00000007Gjg-1sUZ; Tue, 15 Apr 2025 22:00:45 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4oCz-00000007FH8-0TZa for linux-arm-kernel@lists.infradead.org; Tue, 15 Apr 2025 21:52:46 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 96BE7A4A711; Tue, 15 Apr 2025 21:47:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 98794C4CEEF; Tue, 15 Apr 2025 21:52:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744753963; bh=PVTDyzSaiIpFn2vPpTAguPeJMOjp9i2ibxMxEsqpwtU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=RrWxDEgRTK0ZhOd9MR4BMDNEXRcE5G/gjnmwtUjBP9KmWSqgL4BULz+k/afSa4MgT CQqsW41hnNrFQABLehM4kxETZUhayV8MlQ6RSgW/Mg3+/aWxU5hMTQjtyc64Xld+l6 kb4H/HwTxNm/L9CSewRwAKPy1V6Z3+mL52EXY7YtEybROQ6Qg5tyQ+BSyasOSvoWwt VfumhB34E+4s0eKC3u92eiCN/1t7X8HXICLEGRWBAoULY459dCRUnJ5gMsWNolMD2u QUXoXytECeWN4WphHAL3M+2HS1N2dJj9cztv4ZQRRda+HKBIZwcZBJCcLrejWlZRdc /ltw25iRNkQPg== 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 8EA72C369C2; Tue, 15 Apr 2025 21:52:43 +0000 (UTC) Date: Tue, 15 Apr 2025 23:52:36 +0200 Subject: [PATCH 3/3] arm64: dts: apple: Add PMU NVMEM MIME-Version: 1.0 Message-Id: <20250415-spmi-nvmem-v1-3-22067be253cf@gmail.com> References: <20250415-spmi-nvmem-v1-0-22067be253cf@gmail.com> In-Reply-To: <20250415-spmi-nvmem-v1-0-22067be253cf@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=1744753962; l=6050; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=FkRZ7GthVmmbSujIkVNnHCgsxe2R4byiyM8zrad9aQk=; b=S9noVN4xTQB1SJbqDHNgWXzSMmzjFVX+fRWTLRXOciHR2Sy3C/qKKNwyTbNWTmspqZJpPnVtO EDTq4fBajrJBOSTVksgxKk7sENUihDeYFmybk/ZaZCE2iWK8OQET+zR 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-20250415_145245_286291_7ADBFAA9 X-CRM114-Status: GOOD ( 10.44 ) 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 Signed-off-by: Sasha Finkelstein --- 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..9e4402b0bdc085a32d26048ccf1ac4ea20c1e0c2 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>; + + pmu1: pmu@f { + compatible = "apple,maverick-pmu", "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..03bfe1cb173de009b4cd46508e24358008cf42f5 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>; + + pmu1: pmu@f { + compatible = "apple,sera-pmu", "spmi-nvmem"; + reg = <0xf SPMI_USID>; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + pm_setting: pm-setting@d001 { + reg = <0xd001 0x1>; + }; + + rtc_offset: rtc-offset@d100 { + reg = <0xd100 0x6>; + }; + + 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>; + }; + }; + }; }; pinctrl_nub: pinctrl@23d1f0000 { diff --git a/arch/arm64/boot/dts/apple/t8112.dtsi b/arch/arm64/boot/dts/apple/t8112.dtsi index 950d1f906ba3023c1d118179207a2099345aae94..55ab72cf627efe2e3295409b9af1b2128b829801 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>; + + pmu1: pmu@e { + compatible = "apple,stowe-pmu", "spmi-nvmem"; + reg = <0xe SPMI_USID>; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + pm_setting: pm-setting@f801 { + reg = <0xf801 0x1>; + }; + + rtc_offset: rtc-offset@f900 { + reg = <0xf900 0x6>; + }; + + 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>; + }; + + fault_shadow: fault-shadow@867b { + reg = <0x867b 0x10>; + }; + + socd: socd@8b00 { + reg = <0x8b00 0x400>; + }; + }; + }; }; pinctrl_smc: pinctrl@23e820000 {