From nobody Fri Sep 12 00:39:53 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD756C678DB for ; Tue, 14 Feb 2023 15:59:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233291AbjBNP6f (ORCPT ); Tue, 14 Feb 2023 10:58:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233342AbjBNP6A (ORCPT ); Tue, 14 Feb 2023 10:58:00 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0146A2BF25; Tue, 14 Feb 2023 07:57:44 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7B303B81E24; Tue, 14 Feb 2023 15:57:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 347A4C433EF; Tue, 14 Feb 2023 15:57:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676390262; bh=fNduKqqPUYV6F1M5u00Pcrdw5zzaBtWuks1TRf+NJ/0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=NutoAAPmhiTsVna0yHCjaRN6lTKVuyIoiSoapq4gLoWLUZsUJ7eRASr5KYUVo9RYb +bkMVThto8j5RGh4Gs0kq0F4Tk5pxv7oJvI2g6Eb3x6JNaD14oUVIFKJ6qfuJqhhv9 n1mk4Nmf56f8StzBBjx0CJQt1PKXafoVGAtOHMzNT5w44+DE1ENhmIN/qZ4Z+sNNcY DprT8QWe20jqMPg6JJouP9c0OwFhh+FWi6L1fORGn3wz2vQsZRWcRWZrQh6Y6a50cG Y3blRSlBMeWDnf1tIIqGGfBH13zgJr5RUG1ZhdmqAKSaE4cNHhECQsycoz+uyEHpNB LskAckXbv6uyQ== 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 18A89C6379F; Tue, 14 Feb 2023 15:57:42 +0000 (UTC) From: Sasha Finkelstein via B4 Submission Endpoint Date: Tue, 14 Feb 2023 16:57:23 +0100 Subject: [PATCH RESEND 2 v7 1/5] dt-bindings: pwm: Add Apple PWM controller MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230214-fpwm-v7-1-fb0a6bfbd037@gmail.com> References: <20230214-fpwm-v7-0-fb0a6bfbd037@gmail.com> In-Reply-To: <20230214-fpwm-v7-0-fb0a6bfbd037@gmail.com> To: Thierry Reding , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Rob Herring , Krzysztof Kozlowski , - , Sasha Finkelstein , Hector Martin , Sven Peter , Alyssa Rosenzweig Cc: linux-pwm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Krzysztof Kozlowski X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1676390260; l=1759; i=fnkl.kernel@gmail.com; s=20230213; h=from:subject:message-id; bh=BeW75+AIFJcFrpFjOZabHWBRDLlSvckpqesK7uzTCx4=; b=s+tNMPIU6I5o9UPGsiZm/CArcN1IeGxgbgkzNTohM1pS17BErYBiDP/1d519ZLxoU1YsjgH+V d1dh0sEgglWDmRoqnMNxtFFYzJYbAEjaIcu68sEPKJtopT9HMm4O7l8 X-Developer-Key: i=fnkl.kernel@gmail.com; a=ed25519; pk=7LFSAJtxIWAs9LzCIyX0sSvCZy2wQTyEIu1zch6o804= X-Endpoint-Received: by B4 Submission Endpoint for fnkl.kernel@gmail.com/20230213 with auth_id=28 X-Original-From: Sasha Finkelstein Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sasha Finkelstein Apple SoCs such as the M1 contain a PWM controller used among other things to control the keyboard backlight. Signed-off-by: Sasha Finkelstein Reviewed-by: Krzysztof Kozlowski Acked-by: Sven Peter --- .../devicetree/bindings/pwm/apple,s5l-fpwm.yaml | 51 ++++++++++++++++++= ++++ 1 file changed, 51 insertions(+) diff --git a/Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml b/Do= cumentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml new file mode 100644 index 000000000000..142157bff0cd --- /dev/null +++ b/Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml @@ -0,0 +1,51 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/pwm/apple,s5l-fpwm.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple FPWM controller + +maintainers: + - asahi@lists.linux.dev + - Sasha Finkelstein + +description: PWM controller used for keyboard backlight on ARM Macs + +properties: + compatible: + items: + - enum: + - apple,t8103-fpwm + - apple,t6000-fpwm + - apple,t8112-fpwm + - const: apple,s5l-fpwm + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + power-domains: + maxItems: 1 + + "#pwm-cells": + const: 2 + +required: + - compatible + - reg + - clocks + +additionalProperties: false + +examples: + - | + pwm@235044000 { + compatible =3D "apple,t8103-fpwm", "apple,s5l-fpwm"; + reg =3D <0x35044000 0x4000>; + power-domains =3D <&ps_fpwm1>; + clocks =3D <&clkref>; + #pwm-cells =3D <2>; + }; --=20 Git-137.1) From nobody Fri Sep 12 00:39:53 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDB8EC678D4 for ; Tue, 14 Feb 2023 15:59:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233383AbjBNP6h (ORCPT ); Tue, 14 Feb 2023 10:58:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233361AbjBNP6C (ORCPT ); Tue, 14 Feb 2023 10:58:02 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0619E2BEFE; Tue, 14 Feb 2023 07:57:45 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 24B87CE1DDF; Tue, 14 Feb 2023 15:57:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 42566C4339E; Tue, 14 Feb 2023 15:57:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676390262; bh=mdeu5NwcV69CinND5uBT5R84jgOoioaM9qohNC7tOpE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=kImq1Eu/eUco1cKy5fO30pMN1ISpoQSyckduihp3K54LOKVJC+b7JVUc+frpxbCAv I9vqVo3A76xgiMKqp/MEn2P7h2HSszKNoo9FJl3pqlG15HhzlRBIGO5ndHWmyVcnn3 303fc+5huukAPp4kjZeMT0a29Wzg4RyBNmDfY8BXc6uzl4Kqnu6sgEyVUAGq/5xoxr A7Cw95wCoQJ/RnM/0FMPZuZckHz1ZXL1CcLDMRyS8PK/iW5jbv4+7HcuZKd7D67wL/ Yf1a29BSCmt8Yw8BfYAPyZmP5H3bKBPqnHsn7c5KbfDsBAPDyZAoYSSD/l5/SugsmL Nu/Ck/Zr1xRYQ== 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 2D03CC05027; Tue, 14 Feb 2023 15:57:42 +0000 (UTC) From: Sasha Finkelstein via B4 Submission Endpoint Date: Tue, 14 Feb 2023 16:57:24 +0100 Subject: [PATCH RESEND 2 v7 2/5] pwm: Add Apple PWM controller MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230214-fpwm-v7-2-fb0a6bfbd037@gmail.com> References: <20230214-fpwm-v7-0-fb0a6bfbd037@gmail.com> In-Reply-To: <20230214-fpwm-v7-0-fb0a6bfbd037@gmail.com> To: Thierry Reding , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Rob Herring , Krzysztof Kozlowski , - , Sasha Finkelstein , Hector Martin , Sven Peter , Alyssa Rosenzweig Cc: linux-pwm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1676390260; l=6451; i=fnkl.kernel@gmail.com; s=20230213; h=from:subject:message-id; bh=lwp+zNXuVmVlUScBEP6xNgWVKJk43JYJIexegTOlJP8=; b=oYRGnlBbUz3pxzkHeZeRJUzt76rWOQMZs+4stI8QuKdIbAToOZ7Z4igXgn/yjIXU7Kwu+lZjO o7sACGmZVGVDwRmTTZfoFbPYrb1Sg6jQXS7kfZLxMGjSaY0k1nrSUdY X-Developer-Key: i=fnkl.kernel@gmail.com; a=ed25519; pk=7LFSAJtxIWAs9LzCIyX0sSvCZy2wQTyEIu1zch6o804= X-Endpoint-Received: by B4 Submission Endpoint for fnkl.kernel@gmail.com/20230213 with auth_id=28 X-Original-From: Sasha Finkelstein Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sasha Finkelstein Adds the Apple PWM controller driver. Signed-off-by: Sasha Finkelstein Acked-by: Sven Peter --- drivers/pwm/Kconfig | 12 ++++ drivers/pwm/Makefile | 1 + drivers/pwm/pwm-apple.c | 159 ++++++++++++++++++++++++++++++++++++++++++++= ++++ 3 files changed, 172 insertions(+) diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig index dae023d783a2..8df861b1f4a3 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig @@ -51,6 +51,18 @@ config PWM_AB8500 To compile this driver as a module, choose M here: the module will be called pwm-ab8500. =20 +config PWM_APPLE + tristate "Apple SoC PWM support" + depends on ARCH_APPLE || COMPILE_TEST + help + Generic PWM framework driver for PWM controller present on + Apple SoCs + + Say Y here if you have an ARM Apple laptop, otherwise say N + + To compile this driver as a module, choose M here: the module + will be called pwm-apple. + config PWM_ATMEL tristate "Atmel PWM support" depends on ARCH_AT91 || COMPILE_TEST diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile index 7bf1a29f02b8..19899b912e00 100644 --- a/drivers/pwm/Makefile +++ b/drivers/pwm/Makefile @@ -2,6 +2,7 @@ obj-$(CONFIG_PWM) +=3D core.o obj-$(CONFIG_PWM_SYSFS) +=3D sysfs.o obj-$(CONFIG_PWM_AB8500) +=3D pwm-ab8500.o +obj-$(CONFIG_PWM_APPLE) +=3D pwm-apple.o obj-$(CONFIG_PWM_ATMEL) +=3D pwm-atmel.o obj-$(CONFIG_PWM_ATMEL_HLCDC_PWM) +=3D pwm-atmel-hlcdc.o obj-$(CONFIG_PWM_ATMEL_TCB) +=3D pwm-atmel-tcb.o diff --git a/drivers/pwm/pwm-apple.c b/drivers/pwm/pwm-apple.c new file mode 100644 index 000000000000..551e07d49bf7 --- /dev/null +++ b/drivers/pwm/pwm-apple.c @@ -0,0 +1,159 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Driver for the Apple SoC PWM controller + * + * Copyright The Asahi Linux Contributors + * + * Limitations: + * - The writes to cycle registers are shadowed until a write to + * the control register. + * - If both OFF_CYCLES and ON_CYCLES are set to 0, the output + * is a constant off signal. + * - When APPLE_PWM_CTRL is set to 0, the output is constant low + */ + +#include +#include +#include +#include +#include +#include + +#define APPLE_PWM_CTRL 0x00 +#define APPLE_PWM_ON_CYCLES 0x1c +#define APPLE_PWM_OFF_CYCLES 0x18 + +#define APPLE_PWM_CTRL_ENABLE BIT(0) +#define APPLE_PWM_CTRL_MODE BIT(2) +#define APPLE_PWM_CTRL_UPDATE BIT(5) +#define APPLE_PWM_CTRL_TRIGGER BIT(9) +#define APPLE_PWM_CTRL_INVERT BIT(10) +#define APPLE_PWM_CTRL_OUTPUT_ENABLE BIT(14) + +struct apple_pwm { + struct pwm_chip chip; + void __iomem *base; + u64 clkrate; +}; + +static inline struct apple_pwm *to_apple_pwm(struct pwm_chip *chip) +{ + return container_of(chip, struct apple_pwm, chip); +} + +static int apple_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, + const struct pwm_state *state) +{ + struct apple_pwm *fpwm; + + if (state->polarity =3D=3D PWM_POLARITY_INVERSED) + return -EINVAL; + + fpwm =3D to_apple_pwm(chip); + if (state->enabled) { + u64 on_cycles, off_cycles; + + on_cycles =3D mul_u64_u64_div_u64(fpwm->clkrate, + state->duty_cycle, NSEC_PER_SEC); + if (on_cycles > 0xFFFFFFFF) + return -ERANGE; + + off_cycles =3D mul_u64_u64_div_u64(fpwm->clkrate, + state->period, NSEC_PER_SEC) - on_cycles; + if (off_cycles > 0xFFFFFFFF) + return -ERANGE; + + writel(on_cycles, fpwm->base + APPLE_PWM_ON_CYCLES); + writel(off_cycles, fpwm->base + APPLE_PWM_OFF_CYCLES); + writel(APPLE_PWM_CTRL_ENABLE | APPLE_PWM_CTRL_OUTPUT_ENABLE | APPLE_PWM_= CTRL_UPDATE, + fpwm->base + APPLE_PWM_CTRL); + } else { + writel(0, fpwm->base + APPLE_PWM_CTRL); + } + return 0; +} + +static int apple_pwm_get_state(struct pwm_chip *chip, struct pwm_device *p= wm, + struct pwm_state *state) +{ + struct apple_pwm *fpwm; + u32 on_cycles, off_cycles, ctrl; + + fpwm =3D to_apple_pwm(chip); + + ctrl =3D readl(fpwm->base + APPLE_PWM_CTRL); + on_cycles =3D readl(fpwm->base + APPLE_PWM_ON_CYCLES); + off_cycles =3D readl(fpwm->base + APPLE_PWM_OFF_CYCLES); + + state->enabled =3D (ctrl & APPLE_PWM_CTRL_ENABLE) && (ctrl & APPLE_PWM_CT= RL_OUTPUT_ENABLE); + state->polarity =3D PWM_POLARITY_NORMAL; + // on_cycles + off_cycles is 33 bits, NSEC_PER_SEC is 30, there is no ove= rflow + state->duty_cycle =3D DIV64_U64_ROUND_UP((u64)on_cycles * NSEC_PER_SEC, f= pwm->clkrate); + state->period =3D DIV64_U64_ROUND_UP(((u64)off_cycles + (u64)on_cycles) * + NSEC_PER_SEC, fpwm->clkrate); + + return 0; +} + +static const struct pwm_ops apple_pwm_ops =3D { + .apply =3D apple_pwm_apply, + .get_state =3D apple_pwm_get_state, + .owner =3D THIS_MODULE, +}; + +static int apple_pwm_probe(struct platform_device *pdev) +{ + struct apple_pwm *fpwm; + struct clk *clk; + int ret; + + fpwm =3D devm_kzalloc(&pdev->dev, sizeof(*fpwm), GFP_KERNEL); + if (!fpwm) + return -ENOMEM; + + fpwm->base =3D devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(fpwm->base)) + return PTR_ERR(fpwm->base); + + clk =3D devm_clk_get_enabled(&pdev->dev, NULL); + if (IS_ERR(clk)) + return dev_err_probe(&pdev->dev, PTR_ERR(clk), "unable to get the clock"= ); + + /* + * Uses the 24MHz system clock on all existing devices, can only + * happen if the device tree is broken + * + * This check is done to prevent an overflow in .apply + */ + fpwm->clkrate =3D clk_get_rate(clk); + if (fpwm->clkrate > NSEC_PER_SEC) + return dev_err_probe(&pdev->dev, -EINVAL, "pwm clock out of range"); + + fpwm->chip.dev =3D &pdev->dev; + fpwm->chip.npwm =3D 1; + fpwm->chip.ops =3D &apple_pwm_ops; + + ret =3D devm_pwmchip_add(&pdev->dev, &fpwm->chip); + if (ret < 0) + return dev_err_probe(&pdev->dev, ret, "unable to add pwm chip"); + + return 0; +} + +static const struct of_device_id apple_pwm_of_match[] =3D { + { .compatible =3D "apple,s5l-fpwm" }, + {} +}; +MODULE_DEVICE_TABLE(of, apple_pwm_of_match); + +static struct platform_driver apple_pwm_driver =3D { + .probe =3D apple_pwm_probe, + .driver =3D { + .name =3D "apple-pwm", + .of_match_table =3D apple_pwm_of_match, + }, +}; +module_platform_driver(apple_pwm_driver); + +MODULE_DESCRIPTION("Apple SoC PWM driver"); +MODULE_LICENSE("Dual MIT/GPL"); --=20 Git-137.1) From nobody Fri Sep 12 00:39:53 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E968C64ED9 for ; Tue, 14 Feb 2023 15:58:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233391AbjBNP6E (ORCPT ); Tue, 14 Feb 2023 10:58:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233309AbjBNP54 (ORCPT ); Tue, 14 Feb 2023 10:57:56 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B836B2B092; Tue, 14 Feb 2023 07:57:43 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F32E16174B; Tue, 14 Feb 2023 15:57:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 5763EC433A0; Tue, 14 Feb 2023 15:57:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676390262; bh=bd22GtPmWPipNXDyfrZ2Gq2UCaJZTLghuNgzdi0NEkk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=sH62gTk6NImWvGPVl8dDoS/JFvO1YcCvrQH63pSk4PpZJeB/aRFOjEisBPedxY/kX i3VZys1vgY+y/Lk4kCsX8e3q5juUP15AicYp59Q6pwl6DDjj4zbaQEP+G1UcgOYdTd XDdwPXRUgTw0br2DUMsea9Edkp8eE1Hcx1huQjampU71LxgtPT0rvhb1G9rmWyxSKH mxhCQRiIVsBpf1YMCLfEw962k7sm7mlrjq2UuTbSNSBhHfEzZj3qcmN+3a51339rae pjqOb1BOGIcgLAdGj2OtS4fggX+e7DOiobw/D26316BJejJrfcPJCq711r8SQ2g4a7 Sqv2c250whjwQ== 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 3F63CC64EC7; Tue, 14 Feb 2023 15:57:42 +0000 (UTC) From: Sasha Finkelstein via B4 Submission Endpoint Date: Tue, 14 Feb 2023 16:57:25 +0100 Subject: [PATCH RESEND 2 v7 3/5] arm64: dts: apple: t8103: Add PWM controller MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230214-fpwm-v7-3-fb0a6bfbd037@gmail.com> References: <20230214-fpwm-v7-0-fb0a6bfbd037@gmail.com> In-Reply-To: <20230214-fpwm-v7-0-fb0a6bfbd037@gmail.com> To: Thierry Reding , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Rob Herring , Krzysztof Kozlowski , - , Sasha Finkelstein , Hector Martin , Sven Peter , Alyssa Rosenzweig Cc: linux-pwm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1676390260; l=2898; i=fnkl.kernel@gmail.com; s=20230213; h=from:subject:message-id; bh=X/0B/iNzJLmduQtxNfWIcVJ9VO4Au0DVrk19Cp1+og4=; b=2Qs/rzTqfOfByMYiDzfa6CMGo+v+mIbZrc0lsg+2odCPm+zufQb6hAHFBeaUCJzxcW0J1aRJK tkJnn7qgCSLD9lJxrmcq07IjdEq9lP8wHwDyC9Kj+I0jW4jyZhEaj54 X-Developer-Key: i=fnkl.kernel@gmail.com; a=ed25519; pk=7LFSAJtxIWAs9LzCIyX0sSvCZy2wQTyEIu1zch6o804= X-Endpoint-Received: by B4 Submission Endpoint for fnkl.kernel@gmail.com/20230213 with auth_id=28 X-Original-From: Sasha Finkelstein Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sasha Finkelstein Adds PWM controller and keyboard backlight bindings for M1 MacBooks Signed-off-by: Sasha Finkelstein Acked-by: Sven Peter --- arch/arm64/boot/dts/apple/t8103-j293.dts | 17 +++++++++++++++++ arch/arm64/boot/dts/apple/t8103-j313.dts | 17 +++++++++++++++++ arch/arm64/boot/dts/apple/t8103.dtsi | 9 +++++++++ 3 files changed, 43 insertions(+) diff --git a/arch/arm64/boot/dts/apple/t8103-j293.dts b/arch/arm64/boot/dts= /apple/t8103-j293.dts index 151074109a11..7381dccc1613 100644 --- a/arch/arm64/boot/dts/apple/t8103-j293.dts +++ b/arch/arm64/boot/dts/apple/t8103-j293.dts @@ -11,10 +11,23 @@ =20 #include "t8103.dtsi" #include "t8103-jxxx.dtsi" +#include =20 / { compatible =3D "apple,j293", "apple,t8103", "apple,arm-platform"; model =3D "Apple MacBook Pro (13-inch, M1, 2020)"; + + led-controller { + compatible =3D "pwm-leds"; + led-0 { + pwms =3D <&fpwm1 0 40000>; + label =3D "kbd_backlight"; + function =3D LED_FUNCTION_KBD_BACKLIGHT; + color =3D ; + max-brightness =3D <255>; + default-state =3D "keep"; + }; + }; }; =20 &bluetooth0 { @@ -47,3 +60,7 @@ &i2c2 { &i2c4 { status =3D "okay"; }; + +&fpwm1 { + status =3D "okay"; +}; \ No newline at end of file diff --git a/arch/arm64/boot/dts/apple/t8103-j313.dts b/arch/arm64/boot/dts= /apple/t8103-j313.dts index bc1f865aa790..1e26aa1ef525 100644 --- a/arch/arm64/boot/dts/apple/t8103-j313.dts +++ b/arch/arm64/boot/dts/apple/t8103-j313.dts @@ -11,10 +11,23 @@ =20 #include "t8103.dtsi" #include "t8103-jxxx.dtsi" +#include =20 / { compatible =3D "apple,j313", "apple,t8103", "apple,arm-platform"; model =3D "Apple MacBook Air (M1, 2020)"; + + led-controller { + compatible =3D "pwm-leds"; + led-0 { + pwms =3D <&fpwm1 0 40000>; + label =3D "kbd_backlight"; + function =3D LED_FUNCTION_KBD_BACKLIGHT; + color =3D ; + max-brightness =3D <255>; + default-state =3D "keep"; + }; + }; }; =20 &bluetooth0 { @@ -39,3 +52,7 @@ &pcie0_dart_2 { =20 /delete-node/ &port01; /delete-node/ &port02; + +&fpwm1 { + status =3D "okay"; +}; diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/app= le/t8103.dtsi index 9859219699f4..5300fd115561 100644 --- a/arch/arm64/boot/dts/apple/t8103.dtsi +++ b/arch/arm64/boot/dts/apple/t8103.dtsi @@ -432,6 +432,15 @@ i2c4: i2c@235020000 { status =3D "disabled"; /* only used in J293 */ }; =20 + fpwm1: pwm@235044000 { + compatible =3D "apple,t8103-fpwm", "apple,s5l-fpwm"; + reg =3D <0x2 0x35044000 0x0 0x4000>; + power-domains =3D <&ps_fpwm1>; + clocks =3D <&clkref>; + #pwm-cells =3D <2>; + status =3D "disabled"; + }; + serial0: serial@235200000 { compatible =3D "apple,s5l-uart"; reg =3D <0x2 0x35200000 0x0 0x1000>; --=20 Git-137.1) From nobody Fri Sep 12 00:39:53 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11329C6FA8E for ; Tue, 14 Feb 2023 15:59:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233455AbjBNP6j (ORCPT ); Tue, 14 Feb 2023 10:58:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233350AbjBNP6B (ORCPT ); Tue, 14 Feb 2023 10:58:01 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3334B2BF3A; Tue, 14 Feb 2023 07:57:45 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id B26B6B81E23; Tue, 14 Feb 2023 15:57:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 69FD1C433A4; Tue, 14 Feb 2023 15:57:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676390262; bh=T0yrlYh6fLNBmEygIOf06ax4LoeO/yfEvilUDk3ALb0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=vJyOZJRS85OiH26Yuvz9dUda7A9oXYAjobYN/6Od0l+4sV5O7txxj8sCVw3uTKSxf O1QVipiWdi3So8NwVAXDrXyirSJuhQmBwhzkjuKAzVUau/vHzRoxhlnlAExBrC4eM9 rhof3qeMFEzfoWxuL2tH5d3guOLEza2AKDylFlltPlzVIEzE9Ey273AqkXu3QIb34r cMcOaASPk/SsjRQlkAGpbP48R2ng4dEgr/0KYodN1dxMUeG3rTwkyHOXDqej03Bs6Z lJ9xwX/ZmV/fzaxMZ/oEjveDj+Y6CyNdudFWhUVEXIsZDli+kApMvPkiuLVWGXUnjT GLvmrlrI3nNGA== 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 5751FC61DA4; Tue, 14 Feb 2023 15:57:42 +0000 (UTC) From: Sasha Finkelstein via B4 Submission Endpoint Date: Tue, 14 Feb 2023 16:57:26 +0100 Subject: [PATCH RESEND 2 v7 4/5] arm64: dts: apple: t600x: Add PWM controller MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230214-fpwm-v7-4-fb0a6bfbd037@gmail.com> References: <20230214-fpwm-v7-0-fb0a6bfbd037@gmail.com> In-Reply-To: <20230214-fpwm-v7-0-fb0a6bfbd037@gmail.com> To: Thierry Reding , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Rob Herring , Krzysztof Kozlowski , - , Sasha Finkelstein , Hector Martin , Sven Peter , Alyssa Rosenzweig Cc: linux-pwm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sasha Finkelstein <7d578vix8hzw@opayq.net> X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1676390260; l=2061; i=fnkl.kernel@gmail.com; s=20230213; h=from:subject:message-id; bh=kC8e0IqG+WMbKwdUXKBwuQCvwcxm5IAUASQM0mxJcPI=; b=zGEWaepBrbPEkQW+DCCoHr+t9lOmeP0pCzkIVcJZXf01/1a4XZzv1NyxN1Mlf8HrqymEXgxpC UYK160mvLHrCGy8/njLg3+Tgsu8mcEYZDktFIQb2iHTSN3bXNKSk90r X-Developer-Key: i=fnkl.kernel@gmail.com; a=ed25519; pk=7LFSAJtxIWAs9LzCIyX0sSvCZy2wQTyEIu1zch6o804= X-Endpoint-Received: by B4 Submission Endpoint for fnkl.kernel@gmail.com/20230213 with auth_id=28 X-Original-From: Sasha Finkelstein Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sasha Finkelstein <7d578vix8hzw@opayq.net> Adds PWM controller and keyboard backlight bindings for M1 Pro/Max MacBook = Pros Signed-off-by: Sasha Finkelstein Acked-by: Hector Martin --- arch/arm64/boot/dts/apple/t600x-die0.dtsi | 9 +++++++++ arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/arch/arm64/boot/dts/apple/t600x-die0.dtsi b/arch/arm64/boot/dt= s/apple/t600x-die0.dtsi index 1c41954e3899..9157ae2a9f7f 100644 --- a/arch/arm64/boot/dts/apple/t600x-die0.dtsi +++ b/arch/arm64/boot/dts/apple/t600x-die0.dtsi @@ -71,6 +71,15 @@ sio_dart_1: iommu@39b008000 { power-domains =3D <&ps_sio_cpu>; }; =20 + fpwm0: pwm@39b030000 { + compatible =3D "apple,t6000-fpwm", "apple,s5l-fpwm"; + reg =3D <0x3 0x9b030000 0x0 0x4000>; + power-domains =3D <&ps_fpwm0>; + clocks =3D <&clkref>; + #pwm-cells =3D <2>; + status =3D "disabled"; + }; + i2c0: i2c@39b040000 { compatible =3D "apple,t6000-i2c", "apple,i2c"; reg =3D <0x3 0x9b040000 0x0 0x4000>; diff --git a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi b/arch/arm64/bo= ot/dts/apple/t600x-j314-j316.dtsi index 34906d522f0a..96de7165df6d 100644 --- a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi +++ b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi @@ -9,6 +9,8 @@ * Copyright The Asahi Linux Contributors */ =20 +#include + / { aliases { serial0 =3D &serial0; @@ -34,6 +36,18 @@ memory@10000000000 { device_type =3D "memory"; reg =3D <0x100 0 0x2 0>; /* To be filled by loader */ }; + + led-controller { + compatible =3D "pwm-leds"; + led-0 { + pwms =3D <&fpwm0 0 40000>; + label =3D "kbd_backlight"; + function =3D LED_FUNCTION_KBD_BACKLIGHT; + color =3D ; + max-brightness =3D <255>; + default-state =3D "keep"; + }; + }; }; =20 &serial0 { @@ -110,5 +124,9 @@ &pcie0_dart_3 { status =3D "disabled"; }; =20 +&fpwm0 { + status =3D "okay"; +}; + /delete-node/ &port02; /delete-node/ &port03; --=20 Git-137.1) From nobody Fri Sep 12 00:39:53 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 423C1C64ED8 for ; Tue, 14 Feb 2023 15:58:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233072AbjBNP6G (ORCPT ); Tue, 14 Feb 2023 10:58:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233325AbjBNP54 (ORCPT ); Tue, 14 Feb 2023 10:57:56 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5C892BF23; Tue, 14 Feb 2023 07:57:43 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 48C7D61749; Tue, 14 Feb 2023 15:57:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 87B13C433AA; Tue, 14 Feb 2023 15:57:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676390262; bh=GPz86XLDJFtm5sktETv7LGbxB+3BUpvXFZ/fjo1wLAY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=H2IilQ8RY3chpEp7FKFgkgVdil1YMWadJ1hnv/YIucCkIUcJ2Wdd5Dekg1H1evbFK pLUnjW022LDOgAZxDcT9TbbJoKg7yQPVJmR97K/Mdw28LUqDv9aCoGrTvGcJBlA7Ea nO1qhpUA1nrYU7Crvy2I7ufA+odzm4JSElzXp5zzuMQNUfqgbwcABcsgAd4bbBkq5f 16x74tiMsV8FZ9DhEXq/ViJPjzmr35V5aIzIdFo94gkGuivZLBLRFQWcdcTyaOXn+E 7HMddXlic2YRY+dbq/A9qTYvyajS4WxmHHa5/n5uIZ9lbiflxZpuVdjISMEHbLrLTA 7YX/qBktHhgng== 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 767EBC6379F; Tue, 14 Feb 2023 15:57:42 +0000 (UTC) From: Sasha Finkelstein via B4 Submission Endpoint Date: Tue, 14 Feb 2023 16:57:27 +0100 Subject: [PATCH RESEND 2 v7 5/5] MAINTAINERS: Add entries for Apple PWM driver MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230214-fpwm-v7-5-fb0a6bfbd037@gmail.com> References: <20230214-fpwm-v7-0-fb0a6bfbd037@gmail.com> In-Reply-To: <20230214-fpwm-v7-0-fb0a6bfbd037@gmail.com> To: Thierry Reding , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Rob Herring , Krzysztof Kozlowski , - , Sasha Finkelstein , Hector Martin , Sven Peter , Alyssa Rosenzweig Cc: linux-pwm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1676390260; l=1109; i=fnkl.kernel@gmail.com; s=20230213; h=from:subject:message-id; bh=GrEUGtM2OJTH5FgLdv6n7LxVKdGyoQJCtx5zNyLu7Uc=; b=VbEBD0lmvIFf29a30+kZXONQhIxC/88KjblodB1TNUskgBcgFy1vf9IqyQjp/CqI4WkPwUkG6 zuu8ZEJ2za5CdHCo5BNB4TRrIt0595zgje25xZPF2h4vWzyVFySJ//O X-Developer-Key: i=fnkl.kernel@gmail.com; a=ed25519; pk=7LFSAJtxIWAs9LzCIyX0sSvCZy2wQTyEIu1zch6o804= X-Endpoint-Received: by B4 Submission Endpoint for fnkl.kernel@gmail.com/20230213 with auth_id=28 X-Original-From: Sasha Finkelstein Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sasha Finkelstein Add the MAINTAINERS entries for the driver Signed-off-by: Sasha Finkelstein Acked-by: Sven Peter --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 39ff1a717625..96e50defd646 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1968,6 +1968,7 @@ F: Documentation/devicetree/bindings/nvmem/apple,efus= es.yaml 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/pwm-apple.yaml F: Documentation/devicetree/bindings/watchdog/apple,wdt.yaml F: arch/arm64/boot/dts/apple/ F: drivers/bluetooth/hci_bcm4377.c @@ -1983,6 +1984,7 @@ F: drivers/mailbox/apple-mailbox.c F: drivers/nvme/host/apple.c 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/watchdog/apple_wdt.c F: include/dt-bindings/interrupt-controller/apple-aic.h --=20 Git-137.1)