From patchwork Mon Mar 10 22:07:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Finkelstein via B4 Relay X-Patchwork-Id: 14010779 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 5E113C282DE for ; Mon, 10 Mar 2025 22:14:53 +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=04z65LD25HoSpE+Pe0ZirCIPjXsxz1kemI7gey54MOs=; b=ARxV8XrsU6gfPBw3Nw5PH00/bW Dxk1IyQFYEklNVmhvrv1H5UP5DLLPLUAqv+Fb7Kj0jW96PN8HxvNowTsf4Dqn0udIrvNVj1TpyHTh p9Otm0S2ERMg2i89ou6FkVFzizq83mucuSv3VPV/Ub6F5st0PJm0pdEeWdBAtoEceqXCllog4LeA0 oPtIofLG9ToImtv3OaaNgKaOVC+iRlcYcDTeSTCvXvbgUupYrtM/nPn5izeR8bhqPCfgLwVIyJ6Sf o9bTAylAj9wrhAJsnULX36P7d8uZl6ieYzIwhqZvvBvRbf60GYJhLwV0YK2ePGcTY/8wTebluQ9nH c5OckEsQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1trlOU-000000045wP-20PG; Mon, 10 Mar 2025 22:14:42 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1trlI2-000000045Dy-2WVO for linux-arm-kernel@lists.infradead.org; Mon, 10 Mar 2025 22:08:05 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 7687C5C6320; Mon, 10 Mar 2025 22:05:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 92966C4CEED; Mon, 10 Mar 2025 22:08:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741644480; bh=oaQhe+dmVE4Ni7Ifv3uW7vdmevvK7rvXJMBO9gKwwxo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=p/4/OCB0VE3+QIL1WWn1tDiMGzJXlTnFKiA0DxONW9lE3KJy3hnMC3/btqphjFq5g SN9Ycy1STuZBGKAdtj46p3WjnDYgtSFtoAXEO9U7ojxIDFeYlXfi8WsXrf2XJi5OxV r/PM6EgeAHhvTGw46nylPXFasXz1WTGmFY59AkPvq8GYc6lrYURLKR6ttOTaboZaue h80QsxyTAWb9GU78vZzG96TXMY/9poy65Eqj6Ni4UFxLO6s/d8mWahWlEiH0TntYXn kc8EowT6xTzGMRCbTmsvvinVFkLuRnxlwrF9nHP4CNOAuZclUB1vY2HdKxRkM4B4VV gve+atDtFUXyA== 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 79D70C28B30; Mon, 10 Mar 2025 22:08:00 +0000 (UTC) From: Sasha Finkelstein via B4 Relay Date: Mon, 10 Mar 2025 23:07:58 +0100 Subject: [PATCH v3 1/3] dt-bindings: spmi: Add Apple SPMI controller MIME-Version: 1.0 Message-Id: <20250310-spmi-v3-1-92a82e7d9f0d@gmail.com> References: <20250310-spmi-v3-0-92a82e7d9f0d@gmail.com> In-Reply-To: <20250310-spmi-v3-0-92a82e7d9f0d@gmail.com> To: Sven Peter , Janne Grunau , Alyssa Rosenzweig , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Sasha Finkelstein X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1741644479; l=2426; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=pDg6BHX8yhXPsIWO6kJBvdxVHd8GSLyf4Z1JkcNwg+U=; b=KiRktVb0Tmmq+7Xhyq0yRNnEROe9ZZyi+ImNWMBOjbCeAmMaUpU005jmU+n3nQ1fYBavPgpa2 +okBPspZAOyAsCW5lCzO9nyn6DyALt4HgZONMs6/rnNn/kz69oYue3l 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-20250310_150802_756368_F6E4D860 X-CRM114-Status: GOOD ( 12.67 ) 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 Add bindings for the SPMI controller present on most Apple SoCs Reviewed-by: Rob Herring (Arm) Reviewed-by: Sven Peter Signed-off-by: Sasha Finkelstein --- .../devicetree/bindings/spmi/apple,spmi.yaml | 49 ++++++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 50 insertions(+) diff --git a/Documentation/devicetree/bindings/spmi/apple,spmi.yaml b/Documentation/devicetree/bindings/spmi/apple,spmi.yaml new file mode 100644 index 0000000000000000000000000000000000000000..16bd7eb2b7af2c0b176f0e5b1970f4670af691da --- /dev/null +++ b/Documentation/devicetree/bindings/spmi/apple,spmi.yaml @@ -0,0 +1,49 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/spmi/apple,spmi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple SPMI controller + +maintainers: + - Sasha Finkelstein + +description: A SPMI controller present on most Apple SoCs + +allOf: + - $ref: spmi.yaml# + +properties: + compatible: + items: + - enum: + - apple,t8103-spmi + - apple,t6000-spmi + - apple,t8112-spmi + - const: apple,spmi + + reg: + maxItems: 1 + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include + + spmi@920a1300 { + compatible = "apple,t6000-spmi", "apple,spmi"; + reg = <0x920a1300 0x100>; + #address-cells = <2>; + #size-cells = <0>; + + pmic@f { + reg = <0xf SPMI_USID>; + /* PMIC-specific properties */ + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 8e0736dc2ee0e33544fa373a4978b7dae18c040c..271ff8110df83c2d4fe7fbbfffc0a72259460bc5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2236,6 +2236,7 @@ F: Documentation/devicetree/bindings/pci/apple,pcie.yaml F: Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml F: Documentation/devicetree/bindings/power/apple* F: Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml +F: Documentation/devicetree/bindings/spmi/apple,spmi.yaml F: Documentation/devicetree/bindings/watchdog/apple,wdt.yaml F: arch/arm64/boot/dts/apple/ F: drivers/bluetooth/hci_bcm4377.c From patchwork Mon Mar 10 22:07:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Finkelstein via B4 Relay X-Patchwork-Id: 14010776 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 1D902C282DE for ; Mon, 10 Mar 2025 22:09:56 +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=GmpO8wb4Rh+VBu0vYLqi2gmMJWFUtaNeJ+Tise1RSQ8=; b=PzmH8AFoV+r736eGxtIca7DpUG XD/OZP6t/aYiEsW28iFhVOeasw2fUnRl+qIA4/gq/uf8hkNWGIFAK2/2eoQqaElT/HC9yKzVQeBdU rZV0C7TmV8/IF3C+jxviPb0+/+PYON1UoTxLubCPCTAwbBmc3phgXHC2lZUXKXpOWtAaIOcivXVvO zvffbjKHuP8M/ojDIb68C4ubDIyRSS3wbCwKk1bExSMMZvf5IoGQxu0CQRCZg4n6ohtmyqlALEBqt DU6sAhm28XoWUZqw3XBq78YT2ylZrwBSUHKwaGS12syg80Ga91a18o92QHTOyWlQ15ka6Cl5EuF8T TfBAcKzA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1trlJg-000000045S1-2HiN; Mon, 10 Mar 2025 22:09:44 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1trlI2-000000045Dz-2Wvg for linux-arm-kernel@lists.infradead.org; Mon, 10 Mar 2025 22:08:03 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id A31045C63E2; Mon, 10 Mar 2025 22:05:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id AC7D9C4CEF1; Mon, 10 Mar 2025 22:08:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741644480; bh=EFBQsxI8pshryAs5welcgFtVvdljjCYlYHIliRUCN0g=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=T7AxrnWwl+KG9BRTWXFgPs8c7bNcD6ugwJ7L7zXXPj7CSquyNeqGGQbCX/MNLfRtX wHoz1eF5I81ki5wNClxExGV2mi4+jKgIdg5OfGbnCt2RXhROucB2l9L0Ki+p9bzibN /x8/2LEjufteu5eKp3NVuPOHPG9u48DEgIodSCBHRY8jGc92FWq41JIBVLwCtIzXNr /caFsQAIOJkVhCNYhgB0oH4axWYMx34tw8YJt94lVgLpiXmSWDRLmq/fGg2PnK0d2s nMhkN7ikvbI3YTfUofOcjAJJ9UtTuIxU1FSvXwCM9ig5m6pzg5bx5Q5AvUyeaQNP4/ gdDteA+i1ijbQ== 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 9CF95C35FF1; Mon, 10 Mar 2025 22:08:00 +0000 (UTC) From: Sasha Finkelstein via B4 Relay Date: Mon, 10 Mar 2025 23:07:59 +0100 Subject: [PATCH v3 2/3] spmi: add a spmi driver for Apple SoC MIME-Version: 1.0 Message-Id: <20250310-spmi-v3-2-92a82e7d9f0d@gmail.com> References: <20250310-spmi-v3-0-92a82e7d9f0d@gmail.com> In-Reply-To: <20250310-spmi-v3-0-92a82e7d9f0d@gmail.com> To: Sven Peter , Janne Grunau , Alyssa Rosenzweig , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Sasha Finkelstein , Jean-Francois Bortolotti X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1741644479; l=6952; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=HWm9h1XrGTkFNhxBV+c5Dt9QP4ibWUbEVLcXuEk4LbU=; b=N+ISCvI9qhC6f+C9ojUGAgFxxaKOPvbTTvcggQkVCXYZk51zqzExrkC4aqa+udqMBxTAfogRa 2gmdYbUGcXYD+A60msfHJh2jUH9rksdMuFFA9XuVbHShR1hNQBHS9nS 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-20250310_150802_734588_3ABCA561 X-CRM114-Status: GOOD ( 21.15 ) 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: Jean-Francois Bortolotti The connected PMU contains several useful nvmem cells such as RTC offset, boot failure counters, reboot/shutdown selector, and a few others. In addition M3+ machines have their USB-PD controller connected via SPMI. Signed-off-by: Jean-Francois Bortolotti Reviewed-by: Sven Peter Co-developed-by: Sasha Finkelstein Signed-off-by: Sasha Finkelstein Reviewed-by: Alyssa Rosenzweig --- MAINTAINERS | 1 + drivers/spmi/Kconfig | 8 ++ drivers/spmi/Makefile | 1 + drivers/spmi/spmi-apple-controller.c | 168 +++++++++++++++++++++++++++++++++++ 4 files changed, 178 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 271ff8110df83c2d4fe7fbbfffc0a72259460bc5..9006695261d29fbc1e15659c2b43d7afeee0b656 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2254,6 +2254,7 @@ F: drivers/nvmem/apple-efuses.c F: drivers/pinctrl/pinctrl-apple-gpio.c F: drivers/pwm/pwm-apple.c F: drivers/soc/apple/* +F: drivers/spmi/spmi-apple-controller.c F: drivers/watchdog/apple_wdt.c F: include/dt-bindings/interrupt-controller/apple-aic.h F: include/dt-bindings/pinctrl/apple.h diff --git a/drivers/spmi/Kconfig b/drivers/spmi/Kconfig index 73780204631463631cabcbad5bf83e8dbbee94ce..9005fa91d9f4e541403ccc7bf84e0592402ac41e 100644 --- a/drivers/spmi/Kconfig +++ b/drivers/spmi/Kconfig @@ -11,6 +11,14 @@ menuconfig SPMI if SPMI +config SPMI_APPLE + tristate "Apple SoC SPMI Controller platform driver" + depends on ARCH_APPLE || COMPILE_TEST + help + If you say yes to this option, support will be included for the + SPMI controller present on many Apple SoCs, including the + t8103 (M1) and t600x (M1 Pro/Max). + config SPMI_HISI3670 tristate "Hisilicon 3670 SPMI Controller" select IRQ_DOMAIN_HIERARCHY diff --git a/drivers/spmi/Makefile b/drivers/spmi/Makefile index 7f152167bb05b2c24a0f9669f60278152898eebb..38ac635645ba65aa46cb5e8a50072ed9771e229b 100644 --- a/drivers/spmi/Makefile +++ b/drivers/spmi/Makefile @@ -4,6 +4,7 @@ # obj-$(CONFIG_SPMI) += spmi.o spmi-devres.o +obj-$(CONFIG_SPMI_APPLE) += spmi-apple-controller.o obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o obj-$(CONFIG_SPMI_MSM_PMIC_ARB) += spmi-pmic-arb.o obj-$(CONFIG_SPMI_MTK_PMIF) += spmi-mtk-pmif.o diff --git a/drivers/spmi/spmi-apple-controller.c b/drivers/spmi/spmi-apple-controller.c new file mode 100644 index 0000000000000000000000000000000000000000..697b3e8bb023566f17911fc222666d84f5e14c91 --- /dev/null +++ b/drivers/spmi/spmi-apple-controller.c @@ -0,0 +1,168 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Apple SoC SPMI device driver + * + * Copyright The Asahi Linux Contributors + * + * Inspired by: + * OpenBSD support Copyright (c) 2021 Mark Kettenis + * Correllium support Copyright (C) 2021 Corellium LLC + * hisi-spmi-controller.c + * spmi-pmic-arb.c Copyright (c) 2021, The Linux Foundation. + */ + +#include +#include +#include +#include +#include +#include + +/* SPMI Controller Registers */ +#define SPMI_STATUS_REG 0 +#define SPMI_CMD_REG 0x4 +#define SPMI_RSP_REG 0x8 + +#define SPMI_RX_FIFO_EMPTY BIT(24) + +#define REG_POLL_INTERVAL_US 10000 +#define REG_POLL_TIMEOUT_US (REG_POLL_INTERVAL_US * 5) + +struct apple_spmi { + void __iomem *regs; +}; + +#define poll_reg(spmi, reg, val, cond) \ + readl_poll_timeout((spmi)->regs + (reg), (val), (cond), \ + REG_POLL_INTERVAL_US, REG_POLL_TIMEOUT_US) + +static inline u32 apple_spmi_pack_cmd(u8 opc, u8 sid, u16 saddr, size_t len) +{ + return opc | sid << 8 | saddr << 16 | (len - 1) | (1 << 15); +} + +/* Wait for Rx FIFO to have something */ +static int apple_spmi_wait_rx_not_empty(struct spmi_controller *ctrl) +{ + struct apple_spmi *spmi = spmi_controller_get_drvdata(ctrl); + int ret; + u32 status; + + ret = poll_reg(spmi, SPMI_STATUS_REG, status, !(status & SPMI_RX_FIFO_EMPTY)); + if (ret) { + dev_err(&ctrl->dev, + "failed to wait for RX FIFO not empty\n"); + return ret; + } + + return 0; +} + +static int spmi_read_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid, + u16 saddr, u8 *buf, size_t len) +{ + struct apple_spmi *spmi = spmi_controller_get_drvdata(ctrl); + u32 spmi_cmd = apple_spmi_pack_cmd(opc, sid, saddr, len); + u32 rsp; + size_t len_read = 0; + u8 i; + int ret; + + writel(spmi_cmd, spmi->regs + SPMI_CMD_REG); + + ret = apple_spmi_wait_rx_not_empty(ctrl); + if (ret) + return ret; + + /* Discard SPMI reply status */ + readl(spmi->regs + SPMI_RSP_REG); + + /* Read SPMI data reply */ + while (len_read < len) { + rsp = readl(spmi->regs + SPMI_RSP_REG); + i = 0; + while ((len_read < len) && (i < 4)) { + buf[len_read++] = ((0xff << (8 * i)) & rsp) >> (8 * i); + i += 1; + } + } + + return 0; +} + +static int spmi_write_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid, + u16 saddr, const u8 *buf, size_t len) +{ + struct apple_spmi *spmi = spmi_controller_get_drvdata(ctrl); + u32 spmi_cmd = apple_spmi_pack_cmd(opc, sid, saddr, len); + size_t i = 0, j; + int ret; + + writel(spmi_cmd, spmi->regs + SPMI_CMD_REG); + + while (i < len) { + j = 0; + spmi_cmd = 0; + while ((j < 4) & (i < len)) + spmi_cmd |= buf[i++] << (j++ * 8); + + writel(spmi_cmd, spmi->regs + SPMI_CMD_REG); + } + + ret = apple_spmi_wait_rx_not_empty(ctrl); + if (ret) + return ret; + + /* Discard */ + readl(spmi->regs + SPMI_RSP_REG); + + return 0; +} + +static int apple_spmi_probe(struct platform_device *pdev) +{ + struct apple_spmi *spmi; + struct spmi_controller *ctrl; + int ret; + + ctrl = devm_spmi_controller_alloc(&pdev->dev, sizeof(*spmi)); + if (IS_ERR(ctrl)) + return -ENOMEM; + + spmi = spmi_controller_get_drvdata(ctrl); + + spmi->regs = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(spmi->regs)) + return PTR_ERR(spmi->regs); + + ctrl->dev.of_node = pdev->dev.of_node; + + ctrl->read_cmd = spmi_read_cmd; + ctrl->write_cmd = spmi_write_cmd; + + ret = devm_spmi_controller_add(&pdev->dev, ctrl); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "spmi_controller_add failed\n"); + + return 0; +} + +static const struct of_device_id apple_spmi_match_table[] = { + { .compatible = "apple,spmi", }, + {} +}; +MODULE_DEVICE_TABLE(of, apple_spmi_match_table); + +static struct platform_driver apple_spmi_driver = { + .probe = apple_spmi_probe, + .driver = { + .name = "apple-spmi", + .of_match_table = apple_spmi_match_table, + }, +}; +module_platform_driver(apple_spmi_driver); + +MODULE_AUTHOR("Jean-Francois Bortolotti "); +MODULE_DESCRIPTION("Apple SoC SPMI driver"); +MODULE_LICENSE("GPL"); From patchwork Mon Mar 10 22:08:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Finkelstein via B4 Relay X-Patchwork-Id: 14010778 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 81FD4C282DE for ; Mon, 10 Mar 2025 22:13: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=omYq6PecBpZUkuPCrtO4iUuY+5XsWIH+VdKDw8lCeP4=; b=sgeBtuXwUG5ox9p9iSKyebJRW4 Gi3O7bNfbdpSX5IsMsJBuwTB+t8iQ4fJXm4YaTvk4JEnpC7HyAQb0x3+sl2cp77CjN510RB59q880 6j+0lEwqeWk+MMmqR/yeLWBLm6atp0vhz5XMCDYWF6KxHIPJXTJ5Dnj0tRrBXCqQh7In5OlEi7sYl 8+5EYs2SXqw5c1/M67EAhkYbzpi0ARha5P9zMbx7Y1as6a330TmTFwSshpIqNfzQWbKxDKfhUc99S 5B5wG1LBVPkg4t2SXMapkKGPXfKOAtWl5nZ9T2REu9KOxGDGhfIMwBCtrlWv9aIJTQ6RkuaFnnnmc hinExdlA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1trlMt-000000045pT-3XzG; Mon, 10 Mar 2025 22:13:03 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1trlI2-000000045E0-41NP for linux-arm-kernel@lists.infradead.org; Mon, 10 Mar 2025 22:08:04 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 836B2A464F4; Mon, 10 Mar 2025 22:02:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id C7888C4CEF4; Mon, 10 Mar 2025 22:08:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741644480; bh=FmBWfKgtkrA7kVFNMhyDWV+nuxm8zwZ6nWuvPNtzkKI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=JpWJkz3k4tjE9o+oUUtQ8mQ8lkMnsUCqEAi3X85nXrrwRuc8kHYZ/1l28PI5tFKni AAdrDZozazntpspNu/2/QEvFwgcDQSwfnP4l0o+f93JbU1ggiftJ7I+ca/EFIstnX2 iTsdFCo6f41pDJbU0jNffuWg1IpjHksVaWxN4p0piCJtvJhMp1X+rxOv5aBpmRAJba uVygJFX5qhPAtCEojrBZ6i6MuKD/B4pzPGvoF0yM5mzj9PkkFFq9k+RtdUjBbHztQs GQHPtinMY9l3yxOeBcSfUsyOf++ndu80S8tenC/3hCVh5W0xfj+o27GzOLBq86z+cr bNHyrTxJc724w== 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 BC5CCC28B30; Mon, 10 Mar 2025 22:08:00 +0000 (UTC) From: Sasha Finkelstein via B4 Relay Date: Mon, 10 Mar 2025 23:08:00 +0100 Subject: [PATCH v3 3/3] arm64: dts: apple: Add SPMI controller nodes MIME-Version: 1.0 Message-Id: <20250310-spmi-v3-3-92a82e7d9f0d@gmail.com> References: <20250310-spmi-v3-0-92a82e7d9f0d@gmail.com> In-Reply-To: <20250310-spmi-v3-0-92a82e7d9f0d@gmail.com> To: Sven Peter , Janne Grunau , Alyssa Rosenzweig , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Sasha Finkelstein , Nick Chan X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1741644479; l=2708; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=Pa8VSPAfUl5rQWcSmiEYDiYAy3MCXTK35oo91BheHOg=; b=GOd8zWco/1HabLA5aHDW6D1sJ33ybbnjoVDC+caUzRNKsUkXPPsrIOcdLLp+IHdKIJkQEUa3P 4iebaR/tpqwBdnnuk5Px2vlaS0qWgeJz8kJYHVfMf3kdbnhUqMwM1tz 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-20250310_150803_128784_E5573EE7 X-CRM114-Status: GOOD ( 10.02 ) 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 Add device tree entries for the SPMI controller Reviewed-by: Nick Chan Signed-off-by: Sasha Finkelstein --- arch/arm64/boot/dts/apple/t600x-die0.dtsi | 7 +++++++ arch/arm64/boot/dts/apple/t8103.dtsi | 8 ++++++++ arch/arm64/boot/dts/apple/t8112.dtsi | 7 +++++++ 3 files changed, 22 insertions(+) diff --git a/arch/arm64/boot/dts/apple/t600x-die0.dtsi b/arch/arm64/boot/dts/apple/t600x-die0.dtsi index b1c875e692c8fb9c0af46a23568a7b0cd720141b..64d4f301ca850ddb043bccc087e0b874fb96da9b 100644 --- a/arch/arm64/boot/dts/apple/t600x-die0.dtsi +++ b/arch/arm64/boot/dts/apple/t600x-die0.dtsi @@ -45,6 +45,13 @@ pinctrl_smc: pinctrl@290820000 { ; }; + nub_spmi0: spmi@2920a1300 { + compatible = "apple,t6000-spmi", "apple,spmi"; + reg = <0x2 0x920a1300 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + }; + wdt: watchdog@2922b0000 { compatible = "apple,t6000-wdt", "apple,wdt"; reg = <0x2 0x922b0000 0x0 0x4000>; diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi index 9b0dad6b618444ac6b1c9735c50cccfc3965f947..0f03dc808cf7c6b7d71afc79dd29d368f957f979 100644 --- a/arch/arm64/boot/dts/apple/t8103.dtsi +++ b/arch/arm64/boot/dts/apple/t8103.dtsi @@ -11,6 +11,7 @@ #include #include #include +#include / { compatible = "apple,t8103", "apple,arm-platform"; @@ -604,6 +605,13 @@ pcie_pins: pcie-pins { }; }; + nub_spmi: spmi@23d0d9300 { + compatible = "apple,t8103-spmi", "apple,spmi"; + reg = <0x2 0x3d0d9300 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + }; + pinctrl_nub: pinctrl@23d1f0000 { compatible = "apple,t8103-pinctrl", "apple,pinctrl"; reg = <0x2 0x3d1f0000 0x0 0x4000>; diff --git a/arch/arm64/boot/dts/apple/t8112.dtsi b/arch/arm64/boot/dts/apple/t8112.dtsi index 1666e6ab250bc0be9b8318e3c8fc903ccd3f3760..fa4309bb92975c4edbc11c998496f125267f2353 100644 --- a/arch/arm64/boot/dts/apple/t8112.dtsi +++ b/arch/arm64/boot/dts/apple/t8112.dtsi @@ -679,6 +679,13 @@ wdt: watchdog@23d2b0000 { interrupts = ; }; + nub_spmi: spmi@23d714000 { + compatible = "apple,t8112-spmi", "apple,spmi"; + reg = <0x2 0x3d714000 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + }; + pinctrl_smc: pinctrl@23e820000 { compatible = "apple,t8112-pinctrl", "apple,pinctrl"; reg = <0x2 0x3e820000 0x0 0x4000>;