From nobody Wed Dec 17 08:52:30 2025 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 7216B290BB4 for ; Fri, 9 May 2025 12:25:01 +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=1746793501; cv=none; b=YXqX4B3rgM7ETo/KTNAoJmy29if1JoKys32iLuLfl3AgUHZYlfrIplMfJBAwkFb9V5wbQth28SfAlBiEstg1OAipZafq4H3RQWNaO+e4Ce/LmvVXEa53rlj4GCIoCuDvSq5wMCUvtKFB9fgeeJkn0qYm7MuUelqsnR2t+KFE0gE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746793501; c=relaxed/simple; bh=8tiCEG/Ty13jXmzt2yqaeYzw3QEM8nhZilKHFPi1Kfg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jrOOmpO+1xETwWm8UdJaoIg16Yha1COHQudVCTXe4KTy9KAQ/isPntjfRTsg80bHO7ZgC0/29YdSaYtrk2LogkR0dOBprC8Qb28uQK48HDX6f2k28BLCIOXx1NZACOnBKhhW4IflOpvEh0r63htKhmB0G9OGJ0yU3663ZJgHCCc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hOD8bXDz; 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="hOD8bXDz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E31FDC4CEEB; Fri, 9 May 2025 12:24:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746793501; bh=8tiCEG/Ty13jXmzt2yqaeYzw3QEM8nhZilKHFPi1Kfg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hOD8bXDzRcvgrYOc1Zue/J/ESvhXwILq9gYKuEAc3tJycVXHPZdPNucJv6YM+gi6Z EB+NtSm5lgg+TN+bVtafWtLBQ7uwhMWaLXoQTidYLhvgq+8GCbXTYth9iPhfzj11zR KRj8qq2Ty8V4aOYakKdefOXG/vR1EycrX1TpBmG0e1pQJPD/1TvoXHHYPmCkXMUlt7 rEEcIcTMW3hCrqSeyxTN0tqey5LGiO56HYaOmhLpe1Gl8FG9k1BME66JxA6EugFGae 6SJrbAVdW+agRkHc+23bPdO0JON7fwlLBeN3uCGCYXe/h/Qpwg7//YnFs7vjt5a25N eD2f3R/K8Z5jg== From: srini@kernel.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven , Arnd Bergmann , Srinivas Kandagatla Subject: [PATCH 1/3] nvmem: Remove unused nvmem cell table support Date: Fri, 9 May 2025 13:24:50 +0100 Message-ID: <20250509122452.11827-2-srini@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250509122452.11827-1-srini@kernel.org> References: <20250509122452.11827-1-srini@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geert Uytterhoeven Board files are deprecated by DT, and the last user of nvmem_add_cell_table() was removed by commit 2af4fcc0d3574482 ("ARM: davinci: remove unused board support") in v6.3. Hence remove all support for nvmem cell tables, and update the documentation. Device drivers can still register a single cell using nvmem_add_one_cell() (which was not documented before). Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann Signed-off-by: Srinivas Kandagatla --- Documentation/driver-api/nvmem.rst | 14 ++---- drivers/nvmem/core.c | 68 ------------------------------ include/linux/nvmem-provider.h | 24 ----------- 3 files changed, 4 insertions(+), 102 deletions(-) diff --git a/Documentation/driver-api/nvmem.rst b/Documentation/driver-api/= nvmem.rst index 5d9500d21ecc..790e2dc652c0 100644 --- a/Documentation/driver-api/nvmem.rst +++ b/Documentation/driver-api/nvmem.rst @@ -59,10 +59,10 @@ For example, a simple nvram case:: devm_nvmem_register(&config); } =20 -Users of board files can define and register nvmem cells using the -nvmem_cell_table struct:: +Device drivers can define and register an nvmem cell using the nvmem_cell_= info +struct:: =20 - static struct nvmem_cell_info foo_nvmem_cells[] =3D { + static const struct nvmem_cell_info foo_nvmem_cell =3D { { .name =3D "macaddr", .offset =3D 0x7f00, @@ -70,13 +70,7 @@ nvmem_cell_table struct:: } }; =20 - static struct nvmem_cell_table foo_nvmem_cell_table =3D { - .nvmem_name =3D "i2c-eeprom", - .cells =3D foo_nvmem_cells, - .ncells =3D ARRAY_SIZE(foo_nvmem_cells), - }; - - nvmem_add_cell_table(&foo_nvmem_cell_table); + int nvmem_add_one_cell(nvmem, &foo_nvmem_cell); =20 Additionally it is possible to create nvmem cell lookup entries and regist= er them with the nvmem framework from machine code as shown in the example be= low:: diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index e206efc29a00..fd2a9698d1c9 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -47,9 +47,6 @@ struct nvmem_cell { static DEFINE_MUTEX(nvmem_mutex); static DEFINE_IDA(nvmem_ida); =20 -static DEFINE_MUTEX(nvmem_cell_mutex); -static LIST_HEAD(nvmem_cell_tables); - static DEFINE_MUTEX(nvmem_lookup_mutex); static LIST_HEAD(nvmem_lookup_list); =20 @@ -719,41 +716,6 @@ int nvmem_unregister_notifier(struct notifier_block *n= b) } EXPORT_SYMBOL_GPL(nvmem_unregister_notifier); =20 -static int nvmem_add_cells_from_table(struct nvmem_device *nvmem) -{ - const struct nvmem_cell_info *info; - struct nvmem_cell_table *table; - struct nvmem_cell_entry *cell; - int rval =3D 0, i; - - mutex_lock(&nvmem_cell_mutex); - list_for_each_entry(table, &nvmem_cell_tables, node) { - if (strcmp(nvmem_dev_name(nvmem), table->nvmem_name) =3D=3D 0) { - for (i =3D 0; i < table->ncells; i++) { - info =3D &table->cells[i]; - - cell =3D kzalloc(sizeof(*cell), GFP_KERNEL); - if (!cell) { - rval =3D -ENOMEM; - goto out; - } - - rval =3D nvmem_cell_info_to_nvmem_cell_entry(nvmem, info, cell); - if (rval) { - kfree(cell); - goto out; - } - - nvmem_cell_entry_add(cell); - } - } - } - -out: - mutex_unlock(&nvmem_cell_mutex); - return rval; -} - static struct nvmem_cell_entry * nvmem_find_cell_entry_by_name(struct nvmem_device *nvmem, const char *cell= _id) { @@ -1040,10 +1002,6 @@ struct nvmem_device *nvmem_register(const struct nvm= em_config *config) goto err_remove_cells; } =20 - rval =3D nvmem_add_cells_from_table(nvmem); - if (rval) - goto err_remove_cells; - if (config->add_legacy_fixed_of_cells) { rval =3D nvmem_add_cells_from_legacy_of(nvmem); if (rval) @@ -2151,32 +2109,6 @@ int nvmem_device_write(struct nvmem_device *nvmem, } EXPORT_SYMBOL_GPL(nvmem_device_write); =20 -/** - * nvmem_add_cell_table() - register a table of cell info entries - * - * @table: table of cell info entries - */ -void nvmem_add_cell_table(struct nvmem_cell_table *table) -{ - mutex_lock(&nvmem_cell_mutex); - list_add_tail(&table->node, &nvmem_cell_tables); - mutex_unlock(&nvmem_cell_mutex); -} -EXPORT_SYMBOL_GPL(nvmem_add_cell_table); - -/** - * nvmem_del_cell_table() - remove a previously registered cell info table - * - * @table: table of cell info entries - */ -void nvmem_del_cell_table(struct nvmem_cell_table *table) -{ - mutex_lock(&nvmem_cell_mutex); - list_del(&table->node); - mutex_unlock(&nvmem_cell_mutex); -} -EXPORT_SYMBOL_GPL(nvmem_del_cell_table); - /** * nvmem_add_cell_lookups() - register a list of cell lookup entries * diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h index 515676ebe598..615a560d9edb 100644 --- a/include/linux/nvmem-provider.h +++ b/include/linux/nvmem-provider.h @@ -137,25 +137,6 @@ struct nvmem_config { struct device *base_dev; }; =20 -/** - * struct nvmem_cell_table - NVMEM cell definitions for given provider - * - * @nvmem_name: Provider name. - * @cells: Array of cell definitions. - * @ncells: Number of cell definitions in the array. - * @node: List node. - * - * This structure together with related helper functions is provided for u= sers - * that don't can't access the nvmem provided structure but wish to regist= er - * cell definitions for it e.g. board files registering an EEPROM device. - */ -struct nvmem_cell_table { - const char *nvmem_name; - const struct nvmem_cell_info *cells; - size_t ncells; - struct list_head node; -}; - /** * struct nvmem_layout - NVMEM layout definitions * @@ -190,9 +171,6 @@ void nvmem_unregister(struct nvmem_device *nvmem); struct nvmem_device *devm_nvmem_register(struct device *dev, const struct nvmem_config *cfg); =20 -void nvmem_add_cell_table(struct nvmem_cell_table *table); -void nvmem_del_cell_table(struct nvmem_cell_table *table); - int nvmem_add_one_cell(struct nvmem_device *nvmem, const struct nvmem_cell_info *info); =20 @@ -223,8 +201,6 @@ devm_nvmem_register(struct device *dev, const struct nv= mem_config *c) return nvmem_register(c); } =20 -static inline void nvmem_add_cell_table(struct nvmem_cell_table *table) {} -static inline void nvmem_del_cell_table(struct nvmem_cell_table *table) {} static inline int nvmem_add_one_cell(struct nvmem_device *nvmem, const struct nvmem_cell_info *info) { --=20 2.43.0 From nobody Wed Dec 17 08:52:30 2025 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 4C0EA2900BE for ; Fri, 9 May 2025 12:25:03 +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=1746793504; cv=none; b=MFmO5CwBshedp//7bdn7beFzdI+pPORD3gFm5DEmLyYpqsDAIYoCUk5ryzSMV6sL+8Fj2fA4Ua8kzLOPirpOPFaB8ebzOuH7V5+Gp41QOJqWoINzm6lTx99iqgpUzhEx71skQdaE6w03lrwUGHU8m2e6LMnR6rocVyWssMbBHKk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746793504; c=relaxed/simple; bh=WF0ApFUf7eXA928KnHMjP6pRsHIxtL7KqqA4YWZKbns=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UtBDaOlrpDou6MGcAkVjM9jfVaeTSMhBDJCM0cT9NiTjLrc+Y7segtM98j2rVd5qUeVUEAP8oboasnMYt6vX6mH8qWUggHkKZv481vTYXQ2C/Hpl0Yy3fhW6ao8yOwCau0h96fvareOIOvPDQi0MY3EElJJEsKOeF9JlMyKyb4E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VGO9LYJ5; 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="VGO9LYJ5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5223C4CEE4; Fri, 9 May 2025 12:25:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746793503; bh=WF0ApFUf7eXA928KnHMjP6pRsHIxtL7KqqA4YWZKbns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VGO9LYJ5H03e9N9s96h1IZgJp1156xfnKkFOqOKMx4Dnw1n636c/l9SGVOz5RBaoU do+11aof+H+Yc4ZobMxUmfT7AeZvzqA+jMsWazqmuy1GA0MZGKfmBaKQhyKlDEy3FK REJYD5/vX0VL5EhJdCOeFCecroRhS98X+tRgVYJgBjvs945HNB5rsWQLtT55er3PxC 0eO8XdsdiO6aNI5wrTD0jz2fhAn96hcJvHQFHySplNgJV+amVX6Lu1/izhM1+KdTSJ IzX9lOX3ge8MtpoOTr9D2P4URoRLv7bSUxxNd9tergIG38UumkVh8F0aLZTGSkA+NG SnIS5UwNIZwNg== From: srini@kernel.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Sasha Finkelstein , Alyssa Rosenzweig , Rob Herring , Neal Gompa , Srinivas Kandagatla Subject: [PATCH 2/3] dt-bindings: spmi: Add Apple SPMI NVMEM Date: Fri, 9 May 2025 13:24:51 +0100 Message-ID: <20250509122452.11827-3-srini@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250509122452.11827-1-srini@kernel.org> References: <20250509122452.11827-1-srini@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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: Rob Herring (Arm) Reviewed-by: Neal Gompa Signed-off-by: Srinivas Kandagatla --- .../bindings/nvmem/apple,spmi-nvmem.yaml | 54 +++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 55 insertions(+) create mode 100644 Documentation/devicetree/bindings/nvmem/apple,spmi-nvme= m.yaml 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 000000000000..80b5a6cdcec9 --- /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 3cbf9ac0d83f..9936fa9fe87c 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.43.0 From nobody Wed Dec 17 08:52:30 2025 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 9996F2900BE for ; Fri, 9 May 2025 12:25:06 +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=1746793507; cv=none; b=dzJdBGCmVqCVZvd91NZXtFs9sJ/HB1IRDTzx6Y7juDvjJDQk5XFzMUzciM0z4har4V3PR+OPRLjKSnc/jQ+TK5CfyY6Dsl32NXdBmPV48YMRxke77IrI813MiZvWUMBC+NEnwFXegURuyiIqvNF50DvQRs9dMdnQM/FNXzaksvI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746793507; c=relaxed/simple; bh=RMw7g4/SU9cO0pK7UMO3xQvgqzcugLhcbfNZwcAQsyw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pHZ7VIrca1AJrjE0pCzF61/68PXeP3coLeFlLglt7WobhPZcPNGoJNm3OvZkULVeofloKBuNRB8dWaqdNJuMjMnmyr9cVpam6MjGNUx6W2V5v28QcTcZ71lVPfadd9chkDdZEt3DKz2x/FzDaWj+x4baM5QL2kPWk5naaLi5fnU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ejE+Bw2g; 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="ejE+Bw2g" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5132CC4CEF0; Fri, 9 May 2025 12:25:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746793506; bh=RMw7g4/SU9cO0pK7UMO3xQvgqzcugLhcbfNZwcAQsyw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ejE+Bw2g7kYUOibE/82DsluAfFH4MF4zSofN9+xNe25lLkNo6Y9zpiGMcvlgcBUYf s2pRz+NbDVlDIVPZfF8s4kiEZeaRYMXkSOFCfZf3jGpmGkJeicXhHQIvrQPfWRZnAV JnvcCD4CcvE3+ET3ZvtD7NawCo4OgP5jqncOFwY7M2GBZV8HYIRQJqCQL+DyTKir50 hxoo3bgKVpE3OWV4WiGQY1zu0aL21wK1thKIwY+T5pftMSJ4A2hjV2nUhcrVZKTc/J tHu2OZ6twjfWVJP3dsnkEFx5W21zsZzBJTxxSzRJyYA1pdfLuTo3D6wFaWdxdSuUEV yU5zOzGMGdoTQ== From: srini@kernel.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Hector Martin , Neal Gompa , Alyssa Rosenzweig , Sasha Finkelstein , Srinivas Kandagatla Subject: [PATCH 3/3] nvmem: Add apple-spmi-nvmem driver Date: Fri, 9 May 2025 13:24:52 +0100 Message-ID: <20250509122452.11827-4-srini@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250509122452.11827-1-srini@kernel.org> References: <20250509122452.11827-1-srini@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Srinivas Kandagatla --- MAINTAINERS | 1 + drivers/nvmem/Kconfig | 13 +++++++ drivers/nvmem/Makefile | 2 ++ drivers/nvmem/apple-spmi-nvmem.c | 62 ++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+) create mode 100644 drivers/nvmem/apple-spmi-nvmem.c diff --git a/MAINTAINERS b/MAINTAINERS index 9936fa9fe87c..65abe712170d 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 8671b7c974b9..ae4afbd8293c 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 5b77bbb6488b..89a3c252c2c8 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 000000000000..88614005d5ce --- /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.43.0