From nobody Fri Apr 17 22:34:56 2026 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 5A4A5CCA489 for ; Thu, 21 Jul 2022 17:21:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230302AbiGURVc (ORCPT ); Thu, 21 Jul 2022 13:21:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229510AbiGURV0 (ORCPT ); Thu, 21 Jul 2022 13:21:26 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 991322C115 for ; Thu, 21 Jul 2022 10:21:24 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id b21-20020a05600c4e1500b003a32bc8612fso1182223wmq.3 for ; Thu, 21 Jul 2022 10:21:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XkkKPN3JJIki5/fJ0m2iMmrfk4IJDQ0Iyb2jgEwcMfA=; b=MPZoE7gQwOxPubrMsSNTRL2lSMXyd7GdLpsv87PPzdomrz6yEU381zHGLjU0kmnqeQ WtGx7JqzCm8T0cLSIzMZ5v5SrIr3ldYAkBNphbsgO6sAXriMu5lefm+3TPJzBs1yp2o4 UNIRU3SS8Z0voBJ6/nUisMbU0iz1vkak5zWJDLUK7ntavyNgeaAkrGT8Nxxa/1sXLAen vY4eDgkECXnqYcPEX2Ckqn/xr5bFqLiUZFlYFin4gcB3e8pCsy49RWJEjvTMubhJT/3k UdnH6aq/fqdfp+5TUF5OB38JDpy3yExgYHEVNT1hfYXYmPktMJbQGROk7dqSLV+CTlDl xa5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XkkKPN3JJIki5/fJ0m2iMmrfk4IJDQ0Iyb2jgEwcMfA=; b=7syYrxV/y1Ncd5eEjxNjMtHrcM9xXGBxUlzg0S3v2LDhzF++U8HRpERtCRaNK7fHYs eFlLK8dUjDIGDI1zzDYfnPa7Gu7MuRBmpCf30F+rXpcDQnj2qo9QvUUWYRSdwrjsVu+t f6o/fXOHqSPdbdRYW/cqRV+i4VoZ48BBkHAztIgF3wv4OnnD72smYIQPQOgzXvJkl0ZC CoiHfcAtEKL+9W42XQpfY0H1WQBGLd/0xRfhabPIvoqWNOZdWv4HqHYCOKe7l6cS7cbm 0VnPrmZYNoLsc1b6VCWYQdtsWTv4bs9tAHlvly/oK016z7ZLtmIGRP6JMegHkQSXIeAH vL+g== X-Gm-Message-State: AJIora/qHat6t3qXqTYyPTOl839OI51X0bIl1xBg9pMn5itOiH/U99/7 LLUI07IUnxjavXUv/4B1sws+uA== X-Google-Smtp-Source: AGRyM1uhhSObQMZkAZrCHl/IohFymT6ZizEWGdATrGEa0Aj1iPY95PQHYw/2A70KC/Ux7C4ZW05kEg== X-Received: by 2002:a1c:f314:0:b0:3a2:fee4:91d4 with SMTP id q20-20020a1cf314000000b003a2fee491d4mr8835647wmq.108.1658424083196; Thu, 21 Jul 2022 10:21:23 -0700 (PDT) Received: from henark71.. ([109.76.125.251]) by smtp.gmail.com with ESMTPSA id e24-20020a05600c219800b003a2cf1535aasm2455697wme.17.2022.07.21.10.21.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jul 2022 10:21:22 -0700 (PDT) From: Conor Dooley To: u.kleine-koenig@pengutronix.de Cc: conor.dooley@microchip.com, daire.mcnamara@microchip.com, devicetree@vger.kernel.org, krzysztof.kozlowski+dt@linaro.org, lee.jones@linaro.org, linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org, linux-riscv@lists.infradead.org, robh+dt@kernel.org, thierry.reding@gmail.com, Rob Herring Subject: [PATCH v7 1/4] dt-bindings: pwm: fix microchip corePWM's pwm-cells Date: Thu, 21 Jul 2022 18:21:07 +0100 Message-Id: <20220721172109.941900-2-mail@conchuod.ie> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220721172109.941900-1-mail@conchuod.ie> References: <20220721172109.941900-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley corePWM is capable of inverted operation but the binding requires \#pwm-cells of 2. Expand the binding to support setting the polarity. Fixes: df77f7735786 ("dt-bindings: pwm: add microchip corepwm binding") Acked-by: Rob Herring Signed-off-by: Conor Dooley Acked-by: Uwe Kleine-K=C3=B6nig --- Documentation/devicetree/bindings/pwm/microchip,corepwm.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/pwm/microchip,corepwm.yaml b= /Documentation/devicetree/bindings/pwm/microchip,corepwm.yaml index a7fae1772a81..cd8e9a8907f8 100644 --- a/Documentation/devicetree/bindings/pwm/microchip,corepwm.yaml +++ b/Documentation/devicetree/bindings/pwm/microchip,corepwm.yaml @@ -30,7 +30,9 @@ properties: maxItems: 1 =20 "#pwm-cells": - const: 2 + enum: [2, 3] + description: + The only flag supported by the controller is PWM_POLARITY_INVERTED. =20 microchip,sync-update-mask: description: | --=20 2.37.1 From nobody Fri Apr 17 22:34:56 2026 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 3079BC433EF for ; Thu, 21 Jul 2022 17:21:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231161AbiGURVe (ORCPT ); Thu, 21 Jul 2022 13:21:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229691AbiGURV1 (ORCPT ); Thu, 21 Jul 2022 13:21:27 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07EF22B613 for ; Thu, 21 Jul 2022 10:21:26 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id k11so2760895wrx.5 for ; Thu, 21 Jul 2022 10:21:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FRltm9CBKXROfT3TUcmTyCGbNeVKq4rgRYEpJSVmOTw=; b=BE/cWNCZlI0Yl2QqiuxKv8xSMdjJtWyLI/XATrhxomnVoulKNVnl6BscEEGiBjoi9J BZOY1voXavMn91Z/eD4KGNkYrKldYtbHnOVL31JiY9igICQa28VuBFpx1hmSWvjqUBMi EAF89C6f9VFQib4yYUeWDY4QnawWxcEGZaqJxhodUJRAMPnLNgBM1MsV8JAH3Pm8Q/K3 QLWhvk4FjCGQ8/NuTqbwo4jLB77Q/+7i44oo4RfpKwLjr/T9JMa90ra6huIGyOmB+4rE rnWdSdTKQ60CBLLWjeIuFgpJMUz3Ao57HKpHTsKgf5FKN+P/m5U1ukj43M+l8uMN9ZR0 BWog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FRltm9CBKXROfT3TUcmTyCGbNeVKq4rgRYEpJSVmOTw=; b=LRUgR+oDjvJPTVXVfKuin20CSVu55b8/7gd6npcSgucv8Ie1W1XkmBhhumyfbFEDxi 5jkrmBqYcYfneOqytL0jQfgKcRkBKVgpjQ+o4iMn5/OKtpcL7779gATqvm9yK0bz48yU 7Z6GbQ1ETvFnx8oBId0WinBgSqN2blvdVjvq7y8Sm4SblIQqTZOEYwh5XoQvi5V7csVE m0ZEHAgZHdoMNUr8exFxEtjaDTpPLrW3pEkM5685vxWxe6O6TwxEBGaU6OgjFZcFkMKs KpObdtAQQl5cWjSOf7uvna9AIBNc/otCFBj4xgugeVrNlXNwr3m6IZroz2nAcsuAt0iy nomg== X-Gm-Message-State: AJIora/SCmY75LL+AEnIudq6qtz3yQ881XLcYyhrxjtJDvLTiUaALLWp Yrso/fjTYEWQpnVF2UPWUwGKVg== X-Google-Smtp-Source: AGRyM1vbAYGz2xsyca/zeMEjF8XABXoOModC93BUJZC9+XeAjfvxiTzDa0Td1Cv679XzakodtlQW7A== X-Received: by 2002:a05:6000:609:b0:21d:92ad:562 with SMTP id bn9-20020a056000060900b0021d92ad0562mr34175479wrb.369.1658424084463; Thu, 21 Jul 2022 10:21:24 -0700 (PDT) Received: from henark71.. ([109.76.125.251]) by smtp.gmail.com with ESMTPSA id e24-20020a05600c219800b003a2cf1535aasm2455697wme.17.2022.07.21.10.21.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jul 2022 10:21:23 -0700 (PDT) From: Conor Dooley To: u.kleine-koenig@pengutronix.de Cc: conor.dooley@microchip.com, daire.mcnamara@microchip.com, devicetree@vger.kernel.org, krzysztof.kozlowski+dt@linaro.org, lee.jones@linaro.org, linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org, linux-riscv@lists.infradead.org, robh+dt@kernel.org, thierry.reding@gmail.com Subject: [PATCH v7 2/4] riscv: dts: fix the icicle's #pwm-cells Date: Thu, 21 Jul 2022 18:21:08 +0100 Message-Id: <20220721172109.941900-3-mail@conchuod.ie> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220721172109.941900-1-mail@conchuod.ie> References: <20220721172109.941900-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley \#pwm-cells for the Icicle kit's fabric PWM was incorrectly set to 2 & blindly overridden by the (out of tree) driver anyway. The core can support inverted operation, so update the entry to correctly report its capabilities. Fixes: 72560c6559b8 ("riscv: dts: microchip: add fpga fabric section to ici= cle kit") Signed-off-by: Conor Dooley Reviewed-by: Uwe Kleine-K=C3=B6nig --- arch/riscv/boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi b/ar= ch/riscv/boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi index 0d28858b83f2..e09a13aef268 100644 --- a/arch/riscv/boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi +++ b/arch/riscv/boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi @@ -8,7 +8,7 @@ core_pwm0: pwm@41000000 { compatible =3D "microchip,corepwm-rtl-v4"; reg =3D <0x0 0x41000000 0x0 0xF0>; microchip,sync-update-mask =3D /bits/ 32 <0>; - #pwm-cells =3D <2>; + #pwm-cells =3D <3>; clocks =3D <&fabric_clk3>; status =3D "disabled"; }; --=20 2.37.1 From nobody Fri Apr 17 22:34:56 2026 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 CB540CCA487 for ; Thu, 21 Jul 2022 17:21:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231308AbiGURVl (ORCPT ); Thu, 21 Jul 2022 13:21:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229684AbiGURV3 (ORCPT ); Thu, 21 Jul 2022 13:21:29 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C01F2B611 for ; Thu, 21 Jul 2022 10:21:27 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id a5so3191247wrx.12 for ; Thu, 21 Jul 2022 10:21:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XKFlMNoRZNMbimi2EeV/cgP8CxzqyNd0gTC1i+1Q0p8=; b=NuG5LtZsrE2y2A2GHZ2TmuQPJSmxlwbrG+2zxN/GuT9QJrf/5B9dCPAEYzfAMvkQ/d +KTELN1uQgvJ0H6dZHI3zcoCvC2Y3p8JZZM4mYQyxouFvPM2jSpyfwjylflL8+TGnVkd hQTtJPF5v4zZduBRo67prW8oFjCJi0m5RyEmIXytCqfQIW0OeKaO6+hbcACsle7iQdyr Sy7h3b1oA+jlhHraI3BAn5lYDpQ90xCShwGEl3wTy4tVqfgMdn2RXN7yiI8g3C8YjqTC nk+Z+TsZOE9ZVvI15OxptB5yvRXPA9DmivDyjY7f1G8gcMyoQcaATmj+Hggu85jCkjlZ RMMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XKFlMNoRZNMbimi2EeV/cgP8CxzqyNd0gTC1i+1Q0p8=; b=iwc/Q4R8xqcaVeQEdNnqpHGHDAyIFLcHohX81tiV/OkfTgFi1XO9BwW0joL4YRlosL VRC+fzzRETQb6fqzc+QFrlX7Grkg6kQXJnq4e6RvkOVEtpMoB6xABTNqemIseq6Er2Zk Pl4tSR7hiH0rTxFXoIzI0PjDVwYBISdNM+AYdKu1rSkQccaDrx6lLaOmM6kYBBGN6hQl IxjKfgdFM9ZqbfzUFjHOWx46ckZIkH1tpv0lRZ7wRWnnABm2REr8ojgmcLZqXNUOPdj0 mQXwxtzHTtfCfpPKpqyIKdQjKbAHa2CSrD1yMMTM8+kww2xhT8lPKS/Kn1kiAYHiKa76 +N3Q== X-Gm-Message-State: AJIora93tERutCYzjKgsODY3FDdTSFksfCrj9n7+WFcT+l/3esMdWPZg W/lOWUmaHstGKAUd9g0t8MmDTw== X-Google-Smtp-Source: AGRyM1sNWeQliiCvTj3Nyh2PceHU2MN/Ch0q7YlErtvxjeyO/+YzH1WqBfejVKJOhLQ/0vDKJRk6Yw== X-Received: by 2002:a5d:5311:0:b0:21d:656b:807e with SMTP id e17-20020a5d5311000000b0021d656b807emr34478737wrv.521.1658424085611; Thu, 21 Jul 2022 10:21:25 -0700 (PDT) Received: from henark71.. ([109.76.125.251]) by smtp.gmail.com with ESMTPSA id e24-20020a05600c219800b003a2cf1535aasm2455697wme.17.2022.07.21.10.21.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jul 2022 10:21:25 -0700 (PDT) From: Conor Dooley To: u.kleine-koenig@pengutronix.de Cc: conor.dooley@microchip.com, daire.mcnamara@microchip.com, devicetree@vger.kernel.org, krzysztof.kozlowski+dt@linaro.org, lee.jones@linaro.org, linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org, linux-riscv@lists.infradead.org, robh+dt@kernel.org, thierry.reding@gmail.com Subject: [PATCH v7 3/4] pwm: add microchip soft ip corePWM driver Date: Thu, 21 Jul 2022 18:21:09 +0100 Message-Id: <20220721172109.941900-4-mail@conchuod.ie> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220721172109.941900-1-mail@conchuod.ie> References: <20220721172109.941900-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley Add a driver that supports the Microchip FPGA "soft" PWM IP core. Signed-off-by: Conor Dooley --- drivers/pwm/Kconfig | 10 + drivers/pwm/Makefile | 1 + drivers/pwm/pwm-microchip-core.c | 371 +++++++++++++++++++++++++++++++ 3 files changed, 382 insertions(+) create mode 100644 drivers/pwm/pwm-microchip-core.c diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig index 904de8d61828..007ea5750e73 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig @@ -383,6 +383,16 @@ config PWM_MEDIATEK To compile this driver as a module, choose M here: the module will be called pwm-mediatek. =20 +config PWM_MICROCHIP_CORE + tristate "Microchip corePWM PWM support" + depends on SOC_MICROCHIP_POLARFIRE || COMPILE_TEST + depends on HAS_IOMEM && OF + help + PWM driver for Microchip FPGA soft IP core. + + To compile this driver as a module, choose M here: the module + will be called pwm-microchip-core. + config PWM_MXS tristate "Freescale MXS PWM support" depends on ARCH_MXS || COMPILE_TEST diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile index 5c08bdb817b4..43feb7cfc66a 100644 --- a/drivers/pwm/Makefile +++ b/drivers/pwm/Makefile @@ -33,6 +33,7 @@ obj-$(CONFIG_PWM_LPSS_PCI) +=3D pwm-lpss-pci.o obj-$(CONFIG_PWM_LPSS_PLATFORM) +=3D pwm-lpss-platform.o obj-$(CONFIG_PWM_MESON) +=3D pwm-meson.o obj-$(CONFIG_PWM_MEDIATEK) +=3D pwm-mediatek.o +obj-$(CONFIG_PWM_MICROCHIP_CORE) +=3D pwm-microchip-core.o obj-$(CONFIG_PWM_MTK_DISP) +=3D pwm-mtk-disp.o obj-$(CONFIG_PWM_MXS) +=3D pwm-mxs.o obj-$(CONFIG_PWM_NTXEC) +=3D pwm-ntxec.o diff --git a/drivers/pwm/pwm-microchip-core.c b/drivers/pwm/pwm-microchip-c= ore.c new file mode 100644 index 000000000000..2d12248f86b8 --- /dev/null +++ b/drivers/pwm/pwm-microchip-core.c @@ -0,0 +1,371 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * corePWM driver for Microchip "soft" FPGA IP cores. + * + * Copyright (c) 2021-2022 Microchip Corporation. All rights reserved. + * Author: Conor Dooley + * Documentation: + * https://www.microsemi.com/document-portal/doc_download/1245275-corepwm-= hb + * + * Limitations: + * - If the IP block is configured without "shadow registers", all register + * writes will take effect immediately, causing glitches on the output. + * If shadow registers *are* enabled, a write to the "SYNC_UPDATE" regis= ter + * notifies the core that it needs to update the registers defining the + * waveform from the contents of the "shadow registers". + * - The IP block has no concept of a duty cycle, only rising/falling edge= s of + * the waveform. Unfortunately, if the rising & falling edges registers = have + * the same value written to them the IP block will do whichever of a ri= sing + * or a falling edge is possible. I.E. a 50% waveform at twice the reque= sted + * period. Therefore to get a 0% waveform, the output is set the max hig= h/low + * time depending on polarity. + * - The PWM period is set for the whole IP block not per channel. The dri= ver + * will only change the period if no other PWM output is enabled. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define PREG_TO_VAL(PREG) ((PREG) + 1) + +#define MCHPCOREPWM_PRESCALE_MAX 0x100 +#define MCHPCOREPWM_PERIOD_STEPS_MAX 0xff +#define MCHPCOREPWM_PERIOD_MAX 0xff00 + +#define MCHPCOREPWM_PRESCALE 0x00 +#define MCHPCOREPWM_PERIOD 0x04 +#define MCHPCOREPWM_EN(i) (0x08 + 0x04 * (i)) /* 0x08, 0x0c */ +#define MCHPCOREPWM_POSEDGE(i) (0x10 + 0x08 * (i)) /* 0x10, 0x18, ..., 0x8= 8 */ +#define MCHPCOREPWM_NEGEDGE(i) (0x14 + 0x08 * (i)) /* 0x14, 0x1c, ..., 0x8= c */ +#define MCHPCOREPWM_SYNC_UPD 0xe4 + +struct mchp_core_pwm_chip { + struct pwm_chip chip; + struct clk *clk; + struct mutex lock; /* protect the shared period */ + void __iomem *base; + u32 sync_update_mask; + u16 channel_enabled; +}; + +static inline struct mchp_core_pwm_chip *to_mchp_core_pwm(struct pwm_chip = *chip) +{ + return container_of(chip, struct mchp_core_pwm_chip, chip); +} + +static void mchp_core_pwm_enable(struct pwm_chip *chip, struct pwm_device = *pwm, + bool enable, u64 period) +{ + struct mchp_core_pwm_chip *mchp_core_pwm =3D to_mchp_core_pwm(chip); + u8 channel_enable, reg_offset, shift; + + /* + * There are two adjacent 8 bit control regs, the lower reg controls + * 0-7 and the upper reg 8-15. Check if the pwm is in the upper reg + * and if so, offset by the bus width. + */ + reg_offset =3D MCHPCOREPWM_EN(pwm->hwpwm >> 3); + shift =3D pwm->hwpwm & 7; + + channel_enable =3D readb_relaxed(mchp_core_pwm->base + reg_offset); + channel_enable &=3D ~(1 << shift); + channel_enable |=3D (enable << shift); + + writel_relaxed(channel_enable, mchp_core_pwm->base + reg_offset); + mchp_core_pwm->channel_enabled &=3D ~BIT(pwm->hwpwm); + mchp_core_pwm->channel_enabled |=3D enable << pwm->hwpwm; + + /* + * Notify the block to update the waveform from the shadow registers. + * The updated values will not appear on the bus until they have been + * applied to the waveform at the beginning of the next period. We must + * write these registers and wait for them to be applied before calling + * enable(). + */ + if (mchp_core_pwm->sync_update_mask & (1 << pwm->hwpwm)) { + writel_relaxed(1U, mchp_core_pwm->base + MCHPCOREPWM_SYNC_UPD); + usleep_range(period, period * 2); + } +} + +static u64 mchp_core_pwm_calc_duty(struct pwm_chip *chip, struct pwm_devic= e *pwm, + const struct pwm_state *state, u8 prescale, u8 period_steps) +{ + struct mchp_core_pwm_chip *mchp_core_pwm =3D to_mchp_core_pwm(chip); + u64 duty_steps, period, tmp; + u16 prescale_val =3D PREG_TO_VAL(prescale); + u8 period_steps_val =3D PREG_TO_VAL(period_steps); + + period =3D period_steps_val * prescale_val * NSEC_PER_SEC; + period =3D DIV64_U64_ROUND_UP(period, clk_get_rate(mchp_core_pwm->clk)); + + /* + * Calculate the duty cycle in multiples of the prescaled period: + * duty_steps =3D duty_in_ns / step_in_ns + * step_in_ns =3D (prescale * NSEC_PER_SEC) / clk_rate + * The code below is rearranged slightly to only divide once. + */ + duty_steps =3D state->duty_cycle * clk_get_rate(mchp_core_pwm->clk); + tmp =3D prescale_val * NSEC_PER_SEC; + return div64_u64(duty_steps, tmp); +} + +static void mchp_core_pwm_apply_duty(struct pwm_chip *chip, struct pwm_dev= ice *pwm, + const struct pwm_state *state, u64 duty_steps, u8 period_steps) +{ + struct mchp_core_pwm_chip *mchp_core_pwm =3D to_mchp_core_pwm(chip); + u8 posedge, negedge; + u8 period_steps_val =3D PREG_TO_VAL(period_steps); + + /* + * Turn the output on unless posedge =3D=3D negedge, in which case the + * duty is intended to be 0, but limitations of the IP block don't + * allow a zero length duty cycle - so just set the max high/low time + * respectively. + */ + if (state->polarity =3D=3D PWM_POLARITY_INVERSED) { + negedge =3D !duty_steps ? period_steps_val : 0u; + posedge =3D duty_steps; + } else { + posedge =3D !duty_steps ? period_steps_val : 0u; + negedge =3D duty_steps; + } + + writel_relaxed(posedge, mchp_core_pwm->base + MCHPCOREPWM_POSEDGE(pwm->hw= pwm)); + writel_relaxed(negedge, mchp_core_pwm->base + MCHPCOREPWM_NEGEDGE(pwm->hw= pwm)); +} + +static int mchp_core_pwm_calc_period(struct pwm_chip *chip, const struct p= wm_state *state, + u8 *prescale, u8 *period_steps) +{ + struct mchp_core_pwm_chip *mchp_core_pwm =3D to_mchp_core_pwm(chip); + u64 tmp, clk_rate; + + /* + * Calculate the period cycles and prescale values. + * The registers are each 8 bits wide & multiplied to compute the period + * using the formula: + * (clock_period) * (prescale + 1) * (period_steps + 1) + * so the maximum period that can be generated is 0x10000 times the + * period of the input clock. + * However, due to the design of the "hardware", it is not possible to + * attain a 100% duty cycle if the full range of period_steps is used. + * Therefore period_steps is restricted to 0xFE and the maximum multiple + * of the clock period attainable is 0xFF00. + */ + clk_rate =3D clk_get_rate(mchp_core_pwm->clk); + + /* + * If clk_rate is too big, the following multiplication might overflow. + * However this is implausible, as the fabric of current FPGAs cannot + * provide clocks at a rate high enough. + */ + if (clk_rate >=3D NSEC_PER_SEC) + return -EINVAL; + + tmp =3D mul_u64_u64_div_u64(state->period, clk_rate, NSEC_PER_SEC); + + if (tmp >=3D MCHPCOREPWM_PERIOD_MAX) { + *prescale =3D MCHPCOREPWM_PRESCALE_MAX - 1; + *period_steps =3D MCHPCOREPWM_PERIOD_STEPS_MAX - 1; + return 0; + } + + *prescale =3D div_u64(tmp, MCHPCOREPWM_PERIOD_STEPS_MAX); + /* PREG_TO_VAL() can produce a value larger than UINT8_MAX */ + *period_steps =3D div_u64(tmp, PREG_TO_VAL((u32)*prescale)) - 1; + + return 0; +} + +static inline void mchp_core_pwm_apply_period(struct mchp_core_pwm_chip *m= chp_core_pwm, + u8 prescale, u8 period_steps) +{ + writel_relaxed(prescale, mchp_core_pwm->base + MCHPCOREPWM_PRESCALE); + writel_relaxed(period_steps, mchp_core_pwm->base + MCHPCOREPWM_PERIOD); +} + +static int mchp_core_pwm_apply(struct pwm_chip *chip, struct pwm_device *p= wm, + const struct pwm_state *state) +{ + struct mchp_core_pwm_chip *mchp_core_pwm =3D to_mchp_core_pwm(chip); + struct pwm_state current_state =3D pwm->state; + bool period_locked; + u64 duty_steps; + u8 prescale, period_steps, hw_prescale, hw_period_steps; + int ret; + + ret =3D mutex_lock_interruptible(&mchp_core_pwm->lock); + if (ret) + return ret; + + if (!state->enabled) { + mchp_core_pwm_enable(chip, pwm, false, current_state.period); + mutex_unlock(&mchp_core_pwm->lock); + return 0; + } + + /* + * If the only thing that has changed is the duty cycle or the polarity, + * we can shortcut the calculations and just compute/apply the new duty + * cycle pos & neg edges + * As all the channels share the same period, do not allow it to be + * changed if any other channels are enabled. + * If the period is locked, it may not be possible to use a period + * less than that requested. In that case, we just abort. + */ + period_locked =3D mchp_core_pwm->channel_enabled & ~(1 << pwm->hwpwm); + + if (period_locked) { + mchp_core_pwm_calc_period(chip, state, &prescale, &period_steps); + hw_prescale =3D readb_relaxed(mchp_core_pwm->base + MCHPCOREPWM_PRESCALE= ); + hw_period_steps =3D readb_relaxed(mchp_core_pwm->base + MCHPCOREPWM_PERI= OD); + + if ((period_steps * prescale) < (hw_period_steps * hw_prescale)) { + mutex_unlock(&mchp_core_pwm->lock); + return -EINVAL; + } + + prescale =3D hw_prescale; + period_steps =3D hw_period_steps; + } else if (!current_state.enabled || current_state.period !=3D state->per= iod) { + ret =3D mchp_core_pwm_calc_period(chip, state, &prescale, &period_steps); + if (ret) { + mutex_unlock(&mchp_core_pwm->lock); + return ret; + } + mchp_core_pwm_apply_period(mchp_core_pwm, prescale, period_steps); + } else { + prescale =3D readb_relaxed(mchp_core_pwm->base + MCHPCOREPWM_PRESCALE); + period_steps =3D readb_relaxed(mchp_core_pwm->base + MCHPCOREPWM_PERIOD); + } + + duty_steps =3D mchp_core_pwm_calc_duty(chip, pwm, state, prescale, period= _steps); + + /* + * Because the period is per channel, it is possible that the requested + * duty cycle is longer than the period, in which case cap it to the + * period, IOW a 100% duty cycle. + */ + if (duty_steps > period_steps) + duty_steps =3D period_steps + 1; + + mchp_core_pwm_apply_duty(chip, pwm, state, duty_steps, period_steps); + + mchp_core_pwm_enable(chip, pwm, true, state->period); + + mutex_unlock(&mchp_core_pwm->lock); + + return 0; +} + +static void mchp_core_pwm_get_state(struct pwm_chip *chip, struct pwm_devi= ce *pwm, + struct pwm_state *state) +{ + struct mchp_core_pwm_chip *mchp_core_pwm =3D to_mchp_core_pwm(chip); + u16 prescale; + u8 period_steps, duty_steps, posedge, negedge; + int ret; + + ret =3D mutex_lock_interruptible(&mchp_core_pwm->lock); + if (ret) + return; + + if (mchp_core_pwm->channel_enabled & (1 << pwm->hwpwm)) + state->enabled =3D true; + else + state->enabled =3D false; + + prescale =3D PREG_TO_VAL(readb_relaxed(mchp_core_pwm->base + MCHPCOREPWM_= PRESCALE)); + + period_steps =3D PREG_TO_VAL(readb_relaxed(mchp_core_pwm->base + MCHPCORE= PWM_PERIOD)); + state->period =3D period_steps * prescale * NSEC_PER_SEC; + state->period =3D DIV64_U64_ROUND_UP(state->period, clk_get_rate(mchp_cor= e_pwm->clk)); + + posedge =3D readb_relaxed(mchp_core_pwm->base + MCHPCOREPWM_POSEDGE(pwm->= hwpwm)); + negedge =3D readb_relaxed(mchp_core_pwm->base + MCHPCOREPWM_NEGEDGE(pwm->= hwpwm)); + + if (negedge =3D=3D posedge) { + state->duty_cycle =3D state->period / 2; + } else { + duty_steps =3D abs((s16)posedge - (s16)negedge); + state->duty_cycle =3D duty_steps * prescale * NSEC_PER_SEC; + state->duty_cycle =3D DIV64_U64_ROUND_UP(state->duty_cycle, + clk_get_rate(mchp_core_pwm->clk)); + } + + state->polarity =3D negedge < posedge ? PWM_POLARITY_INVERSED : PWM_POLAR= ITY_NORMAL; + + mutex_unlock(&mchp_core_pwm->lock); +} + +static const struct pwm_ops mchp_core_pwm_ops =3D { + .apply =3D mchp_core_pwm_apply, + .get_state =3D mchp_core_pwm_get_state, + .owner =3D THIS_MODULE, +}; + +static const struct of_device_id mchp_core_of_match[] =3D { + { + .compatible =3D "microchip,corepwm-rtl-v4", + }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, mchp_core_of_match); + +static int mchp_core_pwm_probe(struct platform_device *pdev) +{ + struct mchp_core_pwm_chip *mchp_pwm; + struct resource *regs; + int ret; + + mchp_pwm =3D devm_kzalloc(&pdev->dev, sizeof(*mchp_pwm), GFP_KERNEL); + if (!mchp_pwm) + return -ENOMEM; + + mchp_pwm->base =3D devm_platform_get_and_ioremap_resource(pdev, 0, ®s); + if (IS_ERR(mchp_pwm->base)) + return PTR_ERR(mchp_pwm->base); + + mchp_pwm->clk =3D devm_clk_get_enabled(&pdev->dev, NULL); + if (IS_ERR(mchp_pwm->clk)) + return dev_err_probe(&pdev->dev, PTR_ERR(mchp_pwm->clk), + "failed to get PWM clock\n"); + + if (of_property_read_u32(pdev->dev.of_node, "microchip,sync-update-mask", + &mchp_pwm->sync_update_mask)) + mchp_pwm->sync_update_mask =3D 0u; + + mutex_init(&mchp_pwm->lock); + + mchp_pwm->chip.dev =3D &pdev->dev; + mchp_pwm->chip.ops =3D &mchp_core_pwm_ops; + mchp_pwm->chip.npwm =3D 16; + + ret =3D devm_pwmchip_add(&pdev->dev, &mchp_pwm->chip); + if (ret < 0) + return dev_err_probe(&pdev->dev, ret, "failed to add PWM chip\n"); + + return 0; +} + +static struct platform_driver mchp_core_pwm_driver =3D { + .driver =3D { + .name =3D "mchp-core-pwm", + .of_match_table =3D mchp_core_of_match, + }, + .probe =3D mchp_core_pwm_probe, +}; +module_platform_driver(mchp_core_pwm_driver); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Conor Dooley "); +MODULE_DESCRIPTION("corePWM driver for Microchip FPGAs"); --=20 2.37.1 From nobody Fri Apr 17 22:34:56 2026 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 87319C43334 for ; Thu, 21 Jul 2022 17:21:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231222AbiGURVi (ORCPT ); Thu, 21 Jul 2022 13:21:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229485AbiGURV2 (ORCPT ); Thu, 21 Jul 2022 13:21:28 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51CB92AC65 for ; Thu, 21 Jul 2022 10:21:27 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id bk26so3197314wrb.11 for ; Thu, 21 Jul 2022 10:21:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SXLvUdDnjJEodQJ94faqLUeDy8d1elhS2wljuKyR9r4=; b=OSGxsO7g2K40pu0NwLqzvnlUz82CEbFPTvtAHhq0Lt42XIo478IZ0cVHDyZcv3LzN+ doQwS0X5S7UHIxC9NIByl8mpgfD+9fykQt8oCdaEmU61OOI4m/PpDnv1MosqFBkN+Mm6 Eah/SZ6SreSS+CWTZNEMdvTvTRoLgblAU2dfyUrMl5tNJESdszbOWXfe3Gd+tsC1mNIa V/LZjsE1Rq7iYgiJNcx4XZ1FcwcPBXWrZdOyi6bpWW07Bp7wovr21Nkp97BOPnXf9a9S k2mwT8d9r+UvMll3RAl+MpEmvZNnLBOi+1iHTbqB2z5dlGiFL851dRrd2FQgyyixo8v7 HSYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SXLvUdDnjJEodQJ94faqLUeDy8d1elhS2wljuKyR9r4=; b=SYtPPhb/Ge7nFGfYrRy0QVHM+oYpvzIMMsxWh99HSV+6fdRZyoMNETumuhJqGQBFOA 7cgzHu3oc+xq/tfcU22kJ5nTUYs3ouMmUZVvDirZclXKvwSPYb7fU/XX0wsyaSoPkT7Q IJlMCfLl2L4ng6PxU5n9XUoMyp+gPVSR7Oxro925XlPFm0UQqR13XEKc4ygtgF3TOBug 7qYFb7vMWvr9FOy0khwsu6jMORYpIA/vR5SPiDPfV46klP26w6eaVbh1GLAjpCfhxP/z rcPXWo2kZTu6Zo4rPOqlhsoNLq5Tn5YE3HE+Oa9fL0F3UA9CLtnW0StU9/89tRs4eq7C YT+g== X-Gm-Message-State: AJIora/zlPLDYh1/HeBInHtTl/WoqGK9HaXS9P4XaPzLmLg8IzxnCA0a xVE9SYLeCMAigm7DiABX3ceQ9w== X-Google-Smtp-Source: AGRyM1sIASv9vmR7KNGAFsXqp4jOf5Se7BsMQgouD3zNrQ1FA0oeq0+2XKTq6qHLn4chl5q3KOnZWQ== X-Received: by 2002:a05:6000:1847:b0:21d:c149:263 with SMTP id c7-20020a056000184700b0021dc1490263mr30567246wri.449.1658424086844; Thu, 21 Jul 2022 10:21:26 -0700 (PDT) Received: from henark71.. ([109.76.125.251]) by smtp.gmail.com with ESMTPSA id e24-20020a05600c219800b003a2cf1535aasm2455697wme.17.2022.07.21.10.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jul 2022 10:21:26 -0700 (PDT) From: Conor Dooley To: u.kleine-koenig@pengutronix.de Cc: conor.dooley@microchip.com, daire.mcnamara@microchip.com, devicetree@vger.kernel.org, krzysztof.kozlowski+dt@linaro.org, lee.jones@linaro.org, linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org, linux-riscv@lists.infradead.org, robh+dt@kernel.org, thierry.reding@gmail.com Subject: [PATCH v7 4/4] MAINTAINERS: add pwm to PolarFire SoC entry Date: Thu, 21 Jul 2022 18:21:10 +0100 Message-Id: <20220721172109.941900-5-mail@conchuod.ie> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220721172109.941900-1-mail@conchuod.ie> References: <20220721172109.941900-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley Add the newly introduced pwm driver to the existing PolarFire SoC entry. Signed-off-by: Conor Dooley --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 7d14a446df13..c785765c66b7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17510,6 +17510,7 @@ F: drivers/char/hw_random/mpfs-rng.c F: drivers/clk/microchip/clk-mpfs.c F: drivers/mailbox/mailbox-mpfs.c F: drivers/pci/controller/pcie-microchip-host.c +F: drivers/pwm/pwm-microchip-core.c F: drivers/rtc/rtc-mpfs.c F: drivers/soc/microchip/ F: drivers/spi/spi-microchip-core.c --=20 2.37.1