From nobody Fri Sep 20 20:38:33 2024 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 ED206C77B73 for ; Wed, 19 Apr 2023 19:25:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229562AbjDSTZP (ORCPT ); Wed, 19 Apr 2023 15:25:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229872AbjDSTZM (ORCPT ); Wed, 19 Apr 2023 15:25:12 -0400 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1CDF6A5B; Wed, 19 Apr 2023 12:25:03 -0700 (PDT) Received: from local by fudo.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.96) (envelope-from ) id 1ppDQM-0003x2-0p; Wed, 19 Apr 2023 21:25:02 +0200 Date: Wed, 19 Apr 2023 20:24:57 +0100 From: Daniel Golle To: devicetree@vger.kernel.org, linux-pwm@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Rob Herring , Krzysztof Kozlowski , Thierry Reding , Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= , Matthias Brugger , AngeloGioacchino Del Regno , John Crispin Subject: [PATCH 1/2] dt-bindings: pwm: mediatek: Add mediatek,mt7981 compatible Message-ID: <4877689269af862ea9ddd199d8aa96b2d7fcf6fe.1681932165.git.daniel@makrotopia.org> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add compatible string for the PWM unit found of the MediaTek MT7981 SoC. This is in preparation to adding support in the pwm-mediatek.c driver. Signed-off-by: Daniel Golle Acked-by: Krzysztof Kozlowski Reviewed-by: AngeloGioacchino Del Regno --- Documentation/devicetree/bindings/pwm/mediatek,mt2712-pwm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/pwm/mediatek,mt2712-pwm.yaml= b/Documentation/devicetree/bindings/pwm/mediatek,mt2712-pwm.yaml index 8e176ba7a525f..0fbe8a6469eb2 100644 --- a/Documentation/devicetree/bindings/pwm/mediatek,mt2712-pwm.yaml +++ b/Documentation/devicetree/bindings/pwm/mediatek,mt2712-pwm.yaml @@ -22,6 +22,7 @@ properties: - mediatek,mt7623-pwm - mediatek,mt7628-pwm - mediatek,mt7629-pwm + - mediatek,mt7981-pwm - mediatek,mt7986-pwm - mediatek,mt8183-pwm - mediatek,mt8365-pwm --=20 2.40.0 From nobody Fri Sep 20 20:38:33 2024 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 929B5C77B73 for ; Wed, 19 Apr 2023 19:26:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231348AbjDST0G (ORCPT ); Wed, 19 Apr 2023 15:26:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230163AbjDST0A (ORCPT ); Wed, 19 Apr 2023 15:26:00 -0400 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 289586E85; Wed, 19 Apr 2023 12:25:59 -0700 (PDT) Received: from local by fudo.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.96) (envelope-from ) id 1ppDRF-0003xn-1W; Wed, 19 Apr 2023 21:25:57 +0200 Date: Wed, 19 Apr 2023 20:25:51 +0100 From: Daniel Golle To: linux-pwm@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Thierry Reding , Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= , Matthias Brugger , AngeloGioacchino Del Regno , John Crispin Subject: [PATCH 2/2] pwm: mediatek: Add support for MT7981 Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The PWM unit on MT7981 uses different register offsets than previous MediaTek PWM units. Add support for these new offsets and add support for PWM on MT7981 which has 3 PWM channels, one of them is typically used for a temperature controlled fan. Signed-off-by: Daniel Golle --- drivers/pwm/pwm-mediatek.c | 54 ++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/drivers/pwm/pwm-mediatek.c b/drivers/pwm/pwm-mediatek.c index 5b5eeaff35da6..2bfb5bedf570b 100644 --- a/drivers/pwm/pwm-mediatek.c +++ b/drivers/pwm/pwm-mediatek.c @@ -34,10 +34,14 @@ =20 #define PWM_CLK_DIV_MAX 7 =20 +#define REG_V1 1 +#define REG_V2 2 + struct pwm_mediatek_of_data { unsigned int num_pwms; bool pwm45_fixup; bool has_ck_26m_sel; + u8 reg_ver; }; =20 /** @@ -59,10 +63,14 @@ struct pwm_mediatek_chip { const struct pwm_mediatek_of_data *soc; }; =20 -static const unsigned int pwm_mediatek_reg_offset[] =3D { +static const unsigned int mtk_pwm_reg_offset_v1[] =3D { 0x0010, 0x0050, 0x0090, 0x00d0, 0x0110, 0x0150, 0x0190, 0x0220 }; =20 +static const unsigned int mtk_pwm_reg_offset_v2[] =3D { + 0x0080, 0x00c0, 0x0100, 0x0140, 0x0180, 0x1c0, 0x200, 0x0240 +}; + static inline struct pwm_mediatek_chip * to_pwm_mediatek_chip(struct pwm_chip *chip) { @@ -111,7 +119,19 @@ static inline void pwm_mediatek_writel(struct pwm_medi= atek_chip *chip, unsigned int num, unsigned int offset, u32 value) { - writel(value, chip->regs + pwm_mediatek_reg_offset[num] + offset); + u32 pwm_offset; + + switch (chip->soc->reg_ver) { + case REG_V2: + pwm_offset =3D mtk_pwm_reg_offset_v2[num]; + break; + + case REG_V1: + default: + pwm_offset =3D mtk_pwm_reg_offset_v1[num]; + } + + writel(value, chip->regs + pwm_offset + offset); } =20 static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *p= wm, @@ -285,60 +305,77 @@ static const struct pwm_mediatek_of_data mt2712_pwm_d= ata =3D { .num_pwms =3D 8, .pwm45_fixup =3D false, .has_ck_26m_sel =3D false, + .reg_ver =3D REG_V1, }; =20 static const struct pwm_mediatek_of_data mt6795_pwm_data =3D { .num_pwms =3D 7, .pwm45_fixup =3D false, .has_ck_26m_sel =3D false, + .reg_ver =3D REG_V1, }; =20 static const struct pwm_mediatek_of_data mt7622_pwm_data =3D { .num_pwms =3D 6, .pwm45_fixup =3D false, .has_ck_26m_sel =3D true, + .reg_ver =3D REG_V1, }; =20 static const struct pwm_mediatek_of_data mt7623_pwm_data =3D { .num_pwms =3D 5, .pwm45_fixup =3D true, .has_ck_26m_sel =3D false, + .reg_ver =3D REG_V1, }; =20 static const struct pwm_mediatek_of_data mt7628_pwm_data =3D { .num_pwms =3D 4, .pwm45_fixup =3D true, .has_ck_26m_sel =3D false, + .reg_ver =3D REG_V1, }; =20 static const struct pwm_mediatek_of_data mt7629_pwm_data =3D { .num_pwms =3D 1, .pwm45_fixup =3D false, .has_ck_26m_sel =3D false, + .reg_ver =3D REG_V1, }; =20 -static const struct pwm_mediatek_of_data mt8183_pwm_data =3D { - .num_pwms =3D 4, +static const struct pwm_mediatek_of_data mt7981_pwm_data =3D { + .num_pwms =3D 3, .pwm45_fixup =3D false, .has_ck_26m_sel =3D true, + .reg_ver =3D REG_V2, }; =20 -static const struct pwm_mediatek_of_data mt8365_pwm_data =3D { - .num_pwms =3D 3, +static const struct pwm_mediatek_of_data mt7986_pwm_data =3D { + .num_pwms =3D 2, .pwm45_fixup =3D false, .has_ck_26m_sel =3D true, + .reg_ver =3D REG_V1, }; =20 -static const struct pwm_mediatek_of_data mt7986_pwm_data =3D { - .num_pwms =3D 2, +static const struct pwm_mediatek_of_data mt8183_pwm_data =3D { + .num_pwms =3D 4, + .pwm45_fixup =3D false, + .has_ck_26m_sel =3D true, + .reg_ver =3D REG_V1, +}; + +static const struct pwm_mediatek_of_data mt8365_pwm_data =3D { + .num_pwms =3D 3, .pwm45_fixup =3D false, .has_ck_26m_sel =3D true, + .reg_ver =3D REG_V1, }; =20 static const struct pwm_mediatek_of_data mt8516_pwm_data =3D { .num_pwms =3D 5, .pwm45_fixup =3D false, .has_ck_26m_sel =3D true, + .reg_ver =3D REG_V1, }; =20 static const struct of_device_id pwm_mediatek_of_match[] =3D { @@ -348,6 +385,7 @@ static const struct of_device_id pwm_mediatek_of_match[= ] =3D { { .compatible =3D "mediatek,mt7623-pwm", .data =3D &mt7623_pwm_data }, { .compatible =3D "mediatek,mt7628-pwm", .data =3D &mt7628_pwm_data }, { .compatible =3D "mediatek,mt7629-pwm", .data =3D &mt7629_pwm_data }, + { .compatible =3D "mediatek,mt7981-pwm", .data =3D &mt7981_pwm_data }, { .compatible =3D "mediatek,mt7986-pwm", .data =3D &mt7986_pwm_data }, { .compatible =3D "mediatek,mt8183-pwm", .data =3D &mt8183_pwm_data }, { .compatible =3D "mediatek,mt8365-pwm", .data =3D &mt8365_pwm_data }, --=20 2.40.0