From patchwork Wed May 24 19:47:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 13254482 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 5A5D2C7EE2E for ; Wed, 24 May 2023 19:53:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:References:Cc:To:From: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HgIN1I4oxEgUB+gxOJCNCgeWCnunKlUJecgx95zfeyg=; b=mkM+DFn5vQjnvN mhFs1eoARFA0aabfRH0pKDaKnTGn+MlTCHH9b1oWe5Zg1COS5UVMcnU+jnq+OJLXgKVvgr6XQxnMN MI+D4q9BAWZpRFVn47S6qQFG2f2vCwLp6ViBvSr9qbhtwuBaUY9smdlZBThdSboRZFDapRvA3UqM9 440Xz3ZmUQWZX5YPB8INvirvnhSoosyfRKpowbkvKvr1ki2vN1G+JPZ4mkSB51l0Su7WnNYqrp+t0 ssTvjNcU94/+MnNKAt4rvYzwLjl062mWs5NK+mEd6yFzqByVEgqkoc7gnLD2X9hYYDdSelzeDrwL/ V0DSnYqKnu1P1T3dNQkQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q1uXN-00EWDF-2H; Wed, 24 May 2023 19:52:45 +0000 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q1uXL-00EWCf-0r; Wed, 24 May 2023 19:52:44 +0000 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-510d967249aso2859610a12.1; Wed, 24 May 2023 12:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684957959; x=1687549959; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=FfpJcXgNC9r2DJpgp6E9iGBv/JmFVRlvC0D1pq4re0k=; b=RyeyFUci0Xkt3P2B6mgdNQYs5srDXC6YVdvztLyA0HhBmXkdEzPioa6aoT2CbHeCCh vwrKMEXZA9hWTdO2IW4nQQSn2NLYjjSzx01lJoQtVMzyQ2QrvDnpjIQ9S/L/oau1bhtG ouY/95M7IpRpLWExR8yefpbOoekwlXHa6YG4UKzOFu+l0AJ9FdjKkd/72CNYM/GhbLsd EVwW+IN+x8sUJEBFovKYJMD51o0/a7f0C1U0BQLr+kJi0r8Rv/oqrPcS+mvd6Q/A+R5O 9SetGwMTAlbUWxAqwwaGtL5DEMwy/z/yRIKOHvbff+rA04BMj//G47ihP2NvpfKq1Kpx z6Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684957959; x=1687549959; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FfpJcXgNC9r2DJpgp6E9iGBv/JmFVRlvC0D1pq4re0k=; b=S+zvxEtQFGxMBHojvM0IWTYBu7ziFInU7cRB5HDkMlP5yva+xqCMc34BQfns7GuVCu uYqpyrXWl3QKaGUKLKXESTymWfsxftQrB8oiuZKAlaIeFSVHnH5mD1fhYZh8pzcL1A/A MGxKo1OIxA/foX0gAbUBqNUHEZw/6ZdzxF899poRrNjLdc7ymg/Q5xB8lU90LTGbNHfv bV3DClhCmbICJcxaG+B9MzTLo8pu1kDF1QefnXPfsmjW5odzcM6NiWAWMsiy2mP2/18/ ngXkbbryKWtmewQ+tRqL5sNubr00N0qMcpIO1bJi5/ty7GTlhxHGJsoq68/MFLYapKd5 Cn5w== X-Gm-Message-State: AC+VfDzdC5PDUc6eTYsoXqFU5XDTP+W75Ro7laAOaOWGk8BgYHzwH39/ 1BIGmTFtXUdIKa/U8hB3hYU= X-Google-Smtp-Source: ACHHUZ5LNXTyD94Y8CVwqrQrbJL9IGSs2sEcAr6YfOqlSGqos84mpbqvuYMAKymvzgVdMu1Hx9bW2g== X-Received: by 2002:a05:6402:187:b0:4fd:2b04:6e8b with SMTP id r7-20020a056402018700b004fd2b046e8bmr2979484edv.29.1684957958850; Wed, 24 May 2023 12:52:38 -0700 (PDT) Received: from ?IPV6:2a01:c23:c519:9c00:cd4b:d130:35c7:5e08? (dynamic-2a01-0c23-c519-9c00-cd4b-d130-35c7-5e08.c23.pool.telefonica.de. [2a01:c23:c519:9c00:cd4b:d130:35c7:5e08]) by smtp.googlemail.com with ESMTPSA id bq2-20020a056402214200b00510d7152dc7sm249605edb.30.2023.05.24.12.52.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 May 2023 12:52:38 -0700 (PDT) Message-ID: <2f376c8b-32a9-a3a7-3454-4a864ab8ab44@gmail.com> Date: Wed, 24 May 2023 21:47:43 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: [PATCH v5 RESEND 1/6] pwm: meson: modify and simplify calculation in meson_pwm_get_state Content-Language: en-US From: Heiner Kallweit To: Jerome Brunet , Martin Blumenstingl , Neil Armstrong , Kevin Hilman , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , "thierry.reding@gmail.com" Cc: "linux-arm-kernel@lists.infradead.org" , "open list:ARM/Amlogic Meson..." , linux-pwm@vger.kernel.org, Dmitry Rokosov References: In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230524_125243_323930_EB635D66 X-CRM114-Status: GOOD ( 11.72 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org I don't see a reason why we should treat the case lo < hi differently and return 0 as period and duty_cycle. The current logic was added with c375bcbaabdb ("pwm: meson: Read the full hardware state in meson_pwm_get_state()"), Martin as original author doesn't remember why it was implemented this way back then. So let's handle it as normal use case and also remove the optimization for lo == 0. I think the improved readability is worth it. Fixes: c375bcbaabdb ("pwm: meson: Read the full hardware state in meson_pwm_get_state()") Reviewed-by: Uwe Kleine-König Reviewed-by: Dmitry Rokosov Acked-by: Martin Blumenstingl Cc: stable@vger.kernel.org Signed-off-by: Heiner Kallweit --- drivers/pwm/pwm-meson.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index 5732300eb..3865538dd 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -351,18 +351,8 @@ static int meson_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm, channel->lo = FIELD_GET(PWM_LOW_MASK, value); channel->hi = FIELD_GET(PWM_HIGH_MASK, value); - if (channel->lo == 0) { - state->period = meson_pwm_cnt_to_ns(chip, pwm, channel->hi); - state->duty_cycle = state->period; - } else if (channel->lo >= channel->hi) { - state->period = meson_pwm_cnt_to_ns(chip, pwm, - channel->lo + channel->hi); - state->duty_cycle = meson_pwm_cnt_to_ns(chip, pwm, - channel->hi); - } else { - state->period = 0; - state->duty_cycle = 0; - } + state->period = meson_pwm_cnt_to_ns(chip, pwm, channel->lo + channel->hi); + state->duty_cycle = meson_pwm_cnt_to_ns(chip, pwm, channel->hi); state->polarity = PWM_POLARITY_NORMAL; From patchwork Wed May 24 19:48:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 13254483 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 8193BC77B73 for ; Wed, 24 May 2023 19:53:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:References:Cc:To:From: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xFCZa+1RzcFMvd1AhtSVWpSb85995Aw0o6KDtCAjA3E=; b=MDhXFB7SU780C7 KDPss22AsatRAevm/wnkC4V4S0a8cF/2mE+NSJpoa7G28x2l4wrR3nR/lVlQdRrKFhpKnOV/v7Jm3 BNXJ9F1LH0zBuCyTN3h/EBLPKES+2UAqG8db1O03AuP9E0m+TVY8f6RfljRyKBgxfE/aPQw4TcpYQ wNrn6s0nvvMsBeqwqM9R0fj4XjT+sbVArbTVdx+9ZU5kwHUXjfyQf0VlqAKESElpCaVmgiXBaJRUy bnkfLcYxIK+VmWYC4yvBPMOmgAUKu70OF3VwKviNPKjAmPOnHbUTlJfN8/tOEKwIkNH3BBSKGtUNJ kzFRywFhsPvli7xdIv9A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q1uXV-00EWJW-2t; Wed, 24 May 2023 19:52:53 +0000 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q1uXN-00EWCg-2d; Wed, 24 May 2023 19:52:47 +0000 Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-970056276acso196779966b.2; Wed, 24 May 2023 12:52:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684957960; x=1687549960; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=cQt4vB+zOkte7n2X6CmDlExagU5OjizdoI8k0JY4EOQ=; b=VLVIYvlc3xdaG9fQAmq0qTM3/d1XkHI3Dy98zU6LPqU4j5jkVLj8I0l/QfJ7fopq98 Y7udraFpDOT4vT7TH7YRfIGNbH+0QmXBCVX2c8K5/ts1UEuHJwJcwBh8F5nRiCqnmu7z 64PwJNGolisTqhQv51c9N+U5tgIiGUcNEi17zZAc1zvKnN/CYHpWc8L/7QE/KjYta1ew xDlfRkAn+LD8+6awh1IWOSRb2KBGHzdBJ6X6MD0Dd1NuxloSv54VIxiByoAtQPWzP57T w1qrMJvK4K7conyQxYAGkGqWpGMN3bV3R4GVwYOACNWGCQeMU+P8aYtAISWeLYpMcUQz mrlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684957960; x=1687549960; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=cQt4vB+zOkte7n2X6CmDlExagU5OjizdoI8k0JY4EOQ=; b=On/Ckd2gXClqy23cqI/8iZ9TuazEc7a6PP0XX/Sgi5bQ2nYaOzsEopLHkWANwtUFt9 tMhMwSeBFu6nsfMsgAUvqkuwokwRtjl2a5CBm9LaiLBWgLmfCLBFzgIMfpvVoftpf/KZ rTMj0mkSwf7VCVaqKZ0f/KOxLkvzuNsr6ze9vs1md3voHKV2OwfLmQ10Zv2vmjkMT8Ls er2TV9HHBr07ycSsnpxUNLCXcbMOS6Zqa8VJvyc111dw6letX4RtYGnKam4HZ+ynkMYT ZUuypvV6vC5hgPx8PTEBTkAGXSoUriaSnR4t9MsbiPolnIJutyzs69aX/if8r5rYkRrx YLUg== X-Gm-Message-State: AC+VfDxKL2hNq7TjXep/kVSe00jgaFkoD+tz6bQBn4TCWLtzMn+vEOIK 7epTDy2blBI25JvxJ5jzQvk= X-Google-Smtp-Source: ACHHUZ6dOxNjjb/xWU+h6RMte8RHv9yjBTI+rcetpEsrC+chSNhcbvNnj6piReqjqfzJg4MSRSPQtA== X-Received: by 2002:a17:907:9449:b0:969:cbf4:98fa with SMTP id dl9-20020a170907944900b00969cbf498famr17499502ejc.65.1684957960342; Wed, 24 May 2023 12:52:40 -0700 (PDT) Received: from ?IPV6:2a01:c23:c519:9c00:cd4b:d130:35c7:5e08? (dynamic-2a01-0c23-c519-9c00-cd4b-d130-35c7-5e08.c23.pool.telefonica.de. [2a01:c23:c519:9c00:cd4b:d130:35c7:5e08]) by smtp.googlemail.com with ESMTPSA id jy2-20020a170907762200b0096f689848desm6160383ejc.195.2023.05.24.12.52.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 May 2023 12:52:40 -0700 (PDT) Message-ID: <404a7747-298c-683f-e32c-5f009fff744f@gmail.com> Date: Wed, 24 May 2023 21:48:36 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: [PATCH v5 RESEND 2/6] pwm: meson: fix handling of period/duty if greater than UINT_MAX Content-Language: en-US From: Heiner Kallweit To: Jerome Brunet , Martin Blumenstingl , Neil Armstrong , Kevin Hilman , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , "thierry.reding@gmail.com" Cc: "linux-arm-kernel@lists.infradead.org" , "open list:ARM/Amlogic Meson..." , linux-pwm@vger.kernel.org, Dmitry Rokosov References: In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230524_125245_855894_01FC454B X-CRM114-Status: GOOD ( 10.81 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org state->period/duty are of type u64, and if their value is greater than UINT_MAX, then the cast to uint will cause problems. Fix this by changing the type of the respective local variables to u64. Fixes: b79c3670e120 ("pwm: meson: Don't duplicate the polarity internally") Cc: stable@vger.kernel.org Suggested-by: Uwe Kleine-König Reviewed-by: Martin Blumenstingl Signed-off-by: Heiner Kallweit --- drivers/pwm/pwm-meson.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index 3865538dd..33107204a 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -156,8 +156,9 @@ static int meson_pwm_calc(struct meson_pwm *meson, struct pwm_device *pwm, const struct pwm_state *state) { struct meson_pwm_channel *channel = &meson->channels[pwm->hwpwm]; - unsigned int duty, period, pre_div, cnt, duty_cnt; + unsigned int pre_div, cnt, duty_cnt; unsigned long fin_freq; + u64 duty, period; duty = state->duty_cycle; period = state->period; @@ -179,19 +180,19 @@ static int meson_pwm_calc(struct meson_pwm *meson, struct pwm_device *pwm, dev_dbg(meson->chip.dev, "fin_freq: %lu Hz\n", fin_freq); - pre_div = div64_u64(fin_freq * (u64)period, NSEC_PER_SEC * 0xffffLL); + pre_div = div64_u64(fin_freq * period, NSEC_PER_SEC * 0xffffLL); if (pre_div > MISC_CLK_DIV_MASK) { dev_err(meson->chip.dev, "unable to get period pre_div\n"); return -EINVAL; } - cnt = div64_u64(fin_freq * (u64)period, NSEC_PER_SEC * (pre_div + 1)); + cnt = div64_u64(fin_freq * period, NSEC_PER_SEC * (pre_div + 1)); if (cnt > 0xffff) { dev_err(meson->chip.dev, "unable to get period cnt\n"); return -EINVAL; } - dev_dbg(meson->chip.dev, "period=%u pre_div=%u cnt=%u\n", period, + dev_dbg(meson->chip.dev, "period=%llu pre_div=%u cnt=%u\n", period, pre_div, cnt); if (duty == period) { @@ -204,14 +205,13 @@ static int meson_pwm_calc(struct meson_pwm *meson, struct pwm_device *pwm, channel->lo = cnt; } else { /* Then check is we can have the duty with the same pre_div */ - duty_cnt = div64_u64(fin_freq * (u64)duty, - NSEC_PER_SEC * (pre_div + 1)); + duty_cnt = div64_u64(fin_freq * duty, NSEC_PER_SEC * (pre_div + 1)); if (duty_cnt > 0xffff) { dev_err(meson->chip.dev, "unable to get duty cycle\n"); return -EINVAL; } - dev_dbg(meson->chip.dev, "duty=%u pre_div=%u duty_cnt=%u\n", + dev_dbg(meson->chip.dev, "duty=%llu pre_div=%u duty_cnt=%u\n", duty, pre_div, duty_cnt); channel->pre_div = pre_div; From patchwork Wed May 24 19:49:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 13254485 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 0D7C2C7EE2D for ; Wed, 24 May 2023 19:53:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:References:Cc:To:From: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MmR41oN1NuzxRbMDycPZWS8eZbp51lKwd5RbnFagsFM=; b=U+Z3yODCi9JiT9 4/OMIMb3XBdyhzSno8qqsv76qbgQ0KO34cwsnBe7UnFSMmPy3IJQkA1zNx+Q5rkp0s+CfExPAE+8c pEczAaNH4oejJ2mKFPgn8x8fNZt4l+kEm9B38dnZoSLZKv4yi7C1k7UbtMc9q9gbJMmXMSQrLCMdB /Fv4ZC16TiE4U8ldS0M8sv7FJV50vZWOuTTXy4/VCmf9kVxM0B+0SqN/AIzofuIdF3b/NWiAq8sPB zWLbJFxAv0IqXvBfEUtd1tl+rgvkm/mqEzVNTY2YdEfGWixVK/hB7PjO2Hk1pyKQRGwpNPvDyCfUx T4dkABZ++SjQRGFWcyFQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q1uXW-00EWMc-2g; Wed, 24 May 2023 19:52:54 +0000 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q1uXO-00EWCj-0x; Wed, 24 May 2023 19:52:47 +0000 Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-510eb3dbaaeso2687865a12.1; Wed, 24 May 2023 12:52:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684957961; x=1687549961; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=huiHW4dncLR47flGGAupi0WrSV1QYNNVKtZqQryUTzY=; b=dsrlahShI+oOFmQGiaxR6DL1/8uRWGER0QU0YNaZMN0E84+iFYiQAjqDVpxTPe6ymI C9JJIySL6OJj3yOF9TrvuEMiL08h1tANYfc2EEUce4QDUgl/WBh2flHOsPrWK9HKA4sO m+BNKNFRpHUjVGREE+Ja70P5Dk7oid7btIO9Avy47mFNMcv/6Eskinmyxoa4riz2xpZb nXlUbPJae8kmsvcjy9IuRIX7Qvz+ffAXKLbONIQX2NTlWxCIteBerkHgSQZPSgDf9TsI 2bduq9qoZe/7RnK4Si7rt4eZPs1RApQq5qHAxAtsq7hqbyWa02L7vnVXD7riM1DYbdIE U8vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684957961; x=1687549961; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=huiHW4dncLR47flGGAupi0WrSV1QYNNVKtZqQryUTzY=; b=QYJtJ9OZAvKv7GmHRwv1Jo/c7qViXZesrdKyGMUepP36A0vrfPQ6nVYvqcyLjszI3w MAMIrc+CWDPmw6Nch39kvD2FPKq9dDIKpF7i0NADwB8pCA3ltbIk1Y1YT8iM24iOg1uo 3nVuJpLbvxD/fy+Z0mLyJ/Iya3dwceqfDwv5dA/4nAOFTTMgeJ8zvWYp2d/MJGGemdfp FKbVNaO2fR89X8wZXAJ8sZ+Hyi217NJQpljSTBgVkVbotPcixypfIFcaYYAnBHhwFabF 3EDJeXennQ/PC/F6aXVfq7GyA1ceXUqsePmud2/nEFUHKw87k73WxNWoQ7ueYcygJ2bc upnw== X-Gm-Message-State: AC+VfDzQirufZf2V6mhdFaVrvuY92+fQYaUnYcwSYjbFHMz/iVP6h7H4 eIJe5dZncXzkmv+9eZ5KafgBMgeeCFw= X-Google-Smtp-Source: ACHHUZ5R3W40IgcQ1r4eOjPc+CNdCENjaL837ZQ/cOoRzFvhp9Lo1Fu9x7WUx6yT7JP3w8IPi8KeEA== X-Received: by 2002:aa7:df0d:0:b0:510:b636:4073 with SMTP id c13-20020aa7df0d000000b00510b6364073mr2698727edy.3.1684957961621; Wed, 24 May 2023 12:52:41 -0700 (PDT) Received: from ?IPV6:2a01:c23:c519:9c00:cd4b:d130:35c7:5e08? (dynamic-2a01-0c23-c519-9c00-cd4b-d130-35c7-5e08.c23.pool.telefonica.de. [2a01:c23:c519:9c00:cd4b:d130:35c7:5e08]) by smtp.googlemail.com with ESMTPSA id d8-20020aa7c1c8000000b0050bc6983041sm236985edp.96.2023.05.24.12.52.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 May 2023 12:52:41 -0700 (PDT) Message-ID: Date: Wed, 24 May 2023 21:49:56 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: [PATCH v5 RESEND 3/6] pwm: meson: remove not needed check in meson_pwm_calc Content-Language: en-US From: Heiner Kallweit To: Jerome Brunet , Martin Blumenstingl , Neil Armstrong , Kevin Hilman , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , "thierry.reding@gmail.com" Cc: "linux-arm-kernel@lists.infradead.org" , "open list:ARM/Amlogic Meson..." , linux-pwm@vger.kernel.org, Dmitry Rokosov References: In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230524_125246_336666_30A9FDE5 X-CRM114-Status: UNSURE ( 9.43 ) X-CRM114-Notice: Please train this message. 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org period >= duty implies that cnt >= duty_cnt. We verified before that cnt <= 0xffff, therefore we can omit the check here. Suggested-by: Uwe Kleine-König Signed-off-by: Heiner Kallweit --- drivers/pwm/pwm-meson.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index 33107204a..aad4a0ed3 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -204,12 +204,7 @@ static int meson_pwm_calc(struct meson_pwm *meson, struct pwm_device *pwm, channel->hi = 0; channel->lo = cnt; } else { - /* Then check is we can have the duty with the same pre_div */ duty_cnt = div64_u64(fin_freq * duty, NSEC_PER_SEC * (pre_div + 1)); - if (duty_cnt > 0xffff) { - dev_err(meson->chip.dev, "unable to get duty cycle\n"); - return -EINVAL; - } dev_dbg(meson->chip.dev, "duty=%llu pre_div=%u duty_cnt=%u\n", duty, pre_div, duty_cnt); From patchwork Wed May 24 19:50:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 13254487 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 A84EDC77B73 for ; Wed, 24 May 2023 19:53:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:References:Cc:To:From: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=erJ7wbdmerE6evsBRFHVQ/A/S1HNCNVTcJaPenmBFjE=; b=0ZG7d4eHd63xW5 JGn8Hcs4uHP0hy/NDIRZjAC5q+/jwmknTzzrkZN7y5jCanKvwPksknpEGPoaLcFDsDheYKSLYDTCv E5IX0hW0vM/8A9Gq51gVkTVGptV64tWar/rRCFz/+Z0MMsTkAIvzJ5wsfQe285dbxb0SwMIRSkR+G sEh7d6z1TpDppQlPFCL4Kbr6quC4sLjnCNmsV7mnR9iJxOAh2C93SOOXMlyXeyvSoDD53sUqFhdNp M2gYbYlpD2SUCyD1i/ltSTv4LctoU5JL0IkppGahV2aapqdXwyk+L6hucC6+f+wJr3Udk2tW4TZGb eZCFSxyLhgg9k9n2kr8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q1uXY-00EWOC-2V; Wed, 24 May 2023 19:52:56 +0000 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q1uXP-00EWCz-1p; Wed, 24 May 2023 19:52:48 +0000 Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-510d92184faso2859684a12.1; Wed, 24 May 2023 12:52:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684957963; x=1687549963; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=3eG2syH0BhFk7l81W2r9jp4pFx0n58Jnrg59ebu1LHI=; b=c9xjDb20x9sv/xOAq5qD7rkWgjz4K3MhMe0d0o10cron/fCjhkbanF0ArSKeX54RC3 hQTerh7+l8ePSNg16oIX7ibcLUedyB4vrDRz3H1E7qJS3oWXbZZCliBEU5xmOCNklSLA eLb0dFycCcsg/SfbqfhHC2Fqshhda3JwRuZASoOIaZ5GKF3HE0aEV1hgKwLiQHTNQpzu xHamvoUMqFVViyaaTzsQ62XC3z6Jg6108OC2jfSWYQNxixu/WgSzmkhwD6TO+N4fesJC 121or4KTfn2fPU0ecGiCD9pAtuQhJDMnuR3vH5LYBWwdFNqyY8SIAbEz06T8elQ48W2a z+NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684957963; x=1687549963; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3eG2syH0BhFk7l81W2r9jp4pFx0n58Jnrg59ebu1LHI=; b=Pgpv4NUOI4Wr11rx/E/fHlnX5XPUsTX1p4yvdLnb3QYDvHnj24D75tjM/ap6aKp3Wi t411GeXTWf3WS+Yu73wz1TmON5VU5+gXEO0G8YqGr65S1IGIJzi9sDR41oLIhsFkgbbI ziqvy44NWhKqCpQiydIKLNPd1VNX+E9FpfR2l9yLIaEM1h9N61Z83BabGpLx4AX38bdd 44m0/0DLHQ4mUWVp4k+/mLpAH0KAmuF1GVt0+VV+kPRTtO/kKnphimv1flAGbxE9YgBK mGfiRhSRZSvjKhtQEBbLJ8bH4WqYL0gk60l7OAQQ4I2I1GQjwlcDbG+7wbyB7ox327/O sCQA== X-Gm-Message-State: AC+VfDwmbXRFQvHYdRfbGfnbanlpWXHFVPKPRk/dA5qQ47H+Sd1RVNnc RaRcn4TV9/nQn/eoQPXtfWs= X-Google-Smtp-Source: ACHHUZ5o4LbgBZPqSOoHI0mb/Xd2/MbyIzIlwOY6bt7Na5w8qSFaO2NGBSYPsfqGeLYhssYHMbq94Q== X-Received: by 2002:aa7:dd10:0:b0:510:82b4:844d with SMTP id i16-20020aa7dd10000000b0051082b4844dmr2740318edv.2.1684957962851; Wed, 24 May 2023 12:52:42 -0700 (PDT) Received: from ?IPV6:2a01:c23:c519:9c00:cd4b:d130:35c7:5e08? (dynamic-2a01-0c23-c519-9c00-cd4b-d130-35c7-5e08.c23.pool.telefonica.de. [2a01:c23:c519:9c00:cd4b:d130:35c7:5e08]) by smtp.googlemail.com with ESMTPSA id o2-20020a056402038200b00506987c5c71sm233641edv.70.2023.05.24.12.52.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 May 2023 12:52:42 -0700 (PDT) Message-ID: <63e33220-0765-0e04-ef34-fea81e8fa347@gmail.com> Date: Wed, 24 May 2023 21:50:47 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: [PATCH v5 4/6] pwm: meson: switch to using struct clk_parent_data for mux parents Content-Language: en-US From: Heiner Kallweit To: Jerome Brunet , Martin Blumenstingl , Neil Armstrong , Kevin Hilman , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , "thierry.reding@gmail.com" Cc: "linux-arm-kernel@lists.infradead.org" , "open list:ARM/Amlogic Meson..." , linux-pwm@vger.kernel.org, Dmitry Rokosov References: In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230524_125247_608897_644857EC X-CRM114-Status: GOOD ( 12.12 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org We'll use struct clk_parent_data for mux/div/gate initialization in the follow-up patches. As a first step switch the mux from using parent_names to clk_parent_data. Suggested-by: Martin Blumenstingl Reviewed-by: Martin Blumenstingl Tested-by: Martin Blumenstingl Signed-off-by: Heiner Kallweit --- v3: - move setting mux parent data out of the loop --- drivers/pwm/pwm-meson.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index aad4a0ed3..1654fdbb0 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -61,6 +61,7 @@ #define MISC_A_EN BIT(0) #define MESON_NUM_PWMS 2 +#define MESON_MAX_MUX_PARENTS 4 static struct meson_pwm_channel_data { u8 reg_offset; @@ -477,21 +478,27 @@ MODULE_DEVICE_TABLE(of, meson_pwm_matches); static int meson_pwm_init_channels(struct meson_pwm *meson) { + struct clk_parent_data mux_parent_data[MESON_MAX_MUX_PARENTS] = {}; struct device *dev = meson->chip.dev; - struct clk_init_data init; unsigned int i; char name[255]; int err; + for (i = 0; i < meson->data->num_parents; i++) { + mux_parent_data[i].index = -1; + mux_parent_data[i].name = meson->data->parent_names[i]; + } + for (i = 0; i < meson->chip.npwm; i++) { struct meson_pwm_channel *channel = &meson->channels[i]; + struct clk_init_data init = {}; snprintf(name, sizeof(name), "%s#mux%u", dev_name(dev), i); init.name = name; init.ops = &clk_mux_ops; init.flags = 0; - init.parent_names = meson->data->parent_names; + init.parent_data = mux_parent_data; init.num_parents = meson->data->num_parents; channel->mux.reg = meson->base + REG_MISC_AB; From patchwork Wed May 24 19:51:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 13254484 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 555AFC77B73 for ; Wed, 24 May 2023 19:53:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:References:Cc:To:From: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3MbspbkLldwmgRu45n5gyaemBdphptcCveWJ3rV/JwY=; b=QFFeYhorZeuiQE utB4tqfX7cmC3RQp/HUdxXd1qzmNN1CYEtL0UbrG28O2tTMlXauf2GPPL2LDQ8NRi8lad/5yY3Gwv stT+BTyrk42NRUTacgqjfc9sCW5dDbhSiWIIP33CF7YSOaLYJFJjFGPLe3QbBBKZmTjdkk+xHv59+ Xa8oaJqKPD2XJ/fMUflMR+ogthkBJsMy8TfPi6oHKrbuE5Q+p8jz14BUPnpoKf6dll/HjFfnmz/UD k708cDYy1uQXNXgkeipZto/4A4dBMiM/X0/GQxB9oJyRbQAXJ7Jgz/gu9f1QMi+hbwG50i1fVRef6 FAPX+eZOOBsotleaGLkA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q1uXX-00EWNO-2c; Wed, 24 May 2023 19:52:55 +0000 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q1uXO-00EWD0-2q; Wed, 24 May 2023 19:52:48 +0000 Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-50c8d87c775so2361400a12.3; Wed, 24 May 2023 12:52:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684957964; x=1687549964; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Hl1kkCphfbJI88idtjaX2xpMK1X0udpSgx92Bt3FmGI=; b=XNoJlpcaIjo8XTFbt/plZPj0Rp3IRj1FYeVMJSveLP/W5C8Myo3bcizGstTbcWXfva 7MwcHv/LKRD70PvWvDmBdt4auDSF99I334KYCWZlobNth1bz8qpZb1eBmjyjoI9ffPa/ kj//sYFuiFD0ioI0MgW+V0mhdrJeRxCu7V9YRBDLDsONF7A6P8lu1+dUzyAfDM6lBRLg x7hilR8AY8WRm7H+CJADO1oYQybpqKltouEPJDPQ2LC3deg5ijFw67H6jmJNT7V3Ot9v lS4yai9ToxDUB7njcUZ/VUp+6wVltSphAOn6n593H76BldvLxipsydVOckOuXDg77jfI 0LHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684957964; x=1687549964; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Hl1kkCphfbJI88idtjaX2xpMK1X0udpSgx92Bt3FmGI=; b=bmy7QPYHGDdUCgKNoBnFRByWuTlocNDp1sMiWuPoISoSJztvOESxSDlQXzJkV00iqm BjUFTliQRchT1oJ2Y94ToFbdxx5UPKxx8u6ospg0s8DWJ9uxhimrnetyz8yhL+TQne4+ FLkWfysLWBIAe80qHuAw9v/rWFqliH3nqolV9zdSxpqnMsTw43ssZiZhZ19sr4n219uP Z8hLv8D6tPLcWDg0glhmK74olRZ20KytLoCysAAF0g2dLnqLBURCv8WL8GHKK6Ww4mRE A5GW0P4Cp3IG/BEJorruw/M1SmMOMYbJO3zs42cDuDDGE/d6Ix5IlCdH+HBv7uYe13Sw OgfQ== X-Gm-Message-State: AC+VfDz+GRaAgeBpDcQiCBC6Rqy2f1Y595ranucB7BtHf/V0qdkdZ2fv +k4vOCQzl/ck4IUBS+WVJnQ= X-Google-Smtp-Source: ACHHUZ7QEbGR8niAlZXQq9UvZeaSVO3i9pUfQXd4Kp36n2cr6kPDx+VAuUubCeIyrzEbJZrRbeH/tg== X-Received: by 2002:a05:6402:1381:b0:504:8c1a:70db with SMTP id b1-20020a056402138100b005048c1a70dbmr2875364edv.32.1684957964006; Wed, 24 May 2023 12:52:44 -0700 (PDT) Received: from ?IPV6:2a01:c23:c519:9c00:cd4b:d130:35c7:5e08? (dynamic-2a01-0c23-c519-9c00-cd4b-d130-35c7-5e08.c23.pool.telefonica.de. [2a01:c23:c519:9c00:cd4b:d130:35c7:5e08]) by smtp.googlemail.com with ESMTPSA id r14-20020aa7cb8e000000b005027d31615dsm232772edt.62.2023.05.24.12.52.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 May 2023 12:52:43 -0700 (PDT) Message-ID: Date: Wed, 24 May 2023 21:51:31 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: [PATCH v5 5/6] pwm: meson: don't use hdmi/video clock as mux parent Content-Language: en-US From: Heiner Kallweit To: Jerome Brunet , Martin Blumenstingl , Neil Armstrong , Kevin Hilman , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , "thierry.reding@gmail.com" Cc: "linux-arm-kernel@lists.infradead.org" , "open list:ARM/Amlogic Meson..." , linux-pwm@vger.kernel.org, Dmitry Rokosov References: In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230524_125246_915274_7C0EDF5F X-CRM114-Status: GOOD ( 11.85 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The meson_vclk code from the display driver may change the rate of the video clock. Therefore better don't use it as pwm mux parent. After removing this clock from the parent list pwm_gxbb_data and pwm_g12a_ee_data are the same as pwm_meson8b_data. So we can remove them. Reported-by: Martin Blumenstingl Reviewed-by: Martin Blumenstingl Signed-off-by: Heiner Kallweit --- v4: - improve commit message --- drivers/pwm/pwm-meson.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index 1654fdbb0..48dcc44df 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -364,7 +364,7 @@ static const struct pwm_ops meson_pwm_ops = { }; static const char * const pwm_meson8b_parent_names[] = { - "xtal", "vid_pll", "fclk_div4", "fclk_div3" + "xtal", NULL, "fclk_div4", "fclk_div3" }; static const struct meson_pwm_data pwm_meson8b_data = { @@ -372,15 +372,6 @@ static const struct meson_pwm_data pwm_meson8b_data = { .num_parents = ARRAY_SIZE(pwm_meson8b_parent_names), }; -static const char * const pwm_gxbb_parent_names[] = { - "xtal", "hdmi_pll", "fclk_div4", "fclk_div3" -}; - -static const struct meson_pwm_data pwm_gxbb_data = { - .parent_names = pwm_gxbb_parent_names, - .num_parents = ARRAY_SIZE(pwm_gxbb_parent_names), -}; - /* * Only the 2 first inputs of the GXBB AO PWMs are valid * The last 2 are grounded @@ -430,15 +421,6 @@ static const struct meson_pwm_data pwm_g12a_ao_cd_data = { .num_parents = ARRAY_SIZE(pwm_g12a_ao_cd_parent_names), }; -static const char * const pwm_g12a_ee_parent_names[] = { - "xtal", "hdmi_pll", "fclk_div4", "fclk_div3" -}; - -static const struct meson_pwm_data pwm_g12a_ee_data = { - .parent_names = pwm_g12a_ee_parent_names, - .num_parents = ARRAY_SIZE(pwm_g12a_ee_parent_names), -}; - static const struct of_device_id meson_pwm_matches[] = { { .compatible = "amlogic,meson8b-pwm", @@ -446,7 +428,7 @@ static const struct of_device_id meson_pwm_matches[] = { }, { .compatible = "amlogic,meson-gxbb-pwm", - .data = &pwm_gxbb_data + .data = &pwm_meson8b_data }, { .compatible = "amlogic,meson-gxbb-ao-pwm", @@ -462,7 +444,7 @@ static const struct of_device_id meson_pwm_matches[] = { }, { .compatible = "amlogic,meson-g12a-ee-pwm", - .data = &pwm_g12a_ee_data + .data = &pwm_meson8b_data }, { .compatible = "amlogic,meson-g12a-ao-pwm-ab", From patchwork Wed May 24 19:52:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 13254486 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 B789FC77B7C for ; Wed, 24 May 2023 19:53:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:References:Cc:To:From: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HfM5HkCsw1qfCpBCU/X2TD0I2vHt5biay+zd94jEtV8=; b=BVBird9UW2jQJv q6n2x7YMS6fttxR14u99pn8WnNepJChRnDuopeN6riXu7s6UHqhohuOwmRL5ptc2QJjNl/Dun1/X8 7IsEjEIKN/Pbs2yJlmosne1VyUkrBhCgeZLjvl4lIfqpeJSpWEOBPppuNZ7vr/Q12uPutZFFkV0Ux eiLxC6GKuEMalcEGDWHtkxtjwf4hNSPj7Ecbq1iziH2lZfPo3BMY6tLhYEoPBsAH6zey7bqWhkX2C 8yOzy7UA2+IM8xadQ7hwQwX67igm9O0jjwpNU1GJe+bEGmKX7ULo5phnCl54+xjIGeISF9bHblcMw OuC8jR0nD047MnBQWUBQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q1uXZ-00EWPD-2Z; Wed, 24 May 2023 19:52:57 +0000 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q1uXR-00EWDN-0V; Wed, 24 May 2023 19:52:51 +0000 Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-510b6a24946so2717269a12.0; Wed, 24 May 2023 12:52:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684957965; x=1687549965; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=vibbdVSC64d7h0aZ4zXN81eGjJt2js9ztMIl2I7znr0=; b=sHNiDeEsiB+i6Qy9bW4IQWAPrZYLRsMXHgaa1UBglt/EZ3bzXb5b1rSM6wFLdGLwmd v0nZ/l8uO54gBYvWXbGqLyxH0uYFNFp2RiSdvxqmFUnA1BgsMHiFSC/wsm7fs0lxRZz7 zDjj1Js1MKGhYc4zmUT1j9iVWVOv7OlQIwg6dkgwuiuhoH9GjRqy/ZrZVv3VoZ+F+k6D MsYiWjihqZmrgEsWs9358wBK+vVH8YuraSRGEm7PcQ1t6rbrS69EpHvxi+z+B7H55Cp0 7YROOMDRx3FGVHxJPVrWiMhZFoSjOhXWQWUPU6M9sUlk7ynkIC/TSS9klizcw8yVAmHP Cubw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684957965; x=1687549965; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vibbdVSC64d7h0aZ4zXN81eGjJt2js9ztMIl2I7znr0=; b=huletzmr3M/oIHmIoaI9Dr47WoChqvqCVtkGlvnePoM87W1Yt1o49X3Ebn1H2Wi7Fl FrdbQFf/Z8bt9diRf89uvsoTZ7xwqdSu0vyZMg7MZ5CiRjqQzDAqsZLXPwd0iRtafZkT zDH8gqVxyFPttlNXTZaOQuDjROCzmE/kJ1ZcjaSQJsP2vCUllR+5qkckaCxXZ0XMOswy AFOwvBHOwWwPpf4E/N1/k5jZ8xSl70Gw3r9IRfVcv2otBK2vV4leR4gK6RntOiOrPTR9 EzXfjzGZInHfc3rwOUYcz0FpqlVSZgQE/Ocz92bNeO+OesDQY9unnSJTMRSZI4x8vxsO xHhw== X-Gm-Message-State: AC+VfDy0GvDQ1Uxr2DafqkNWC/B10ZVpA14Sq5ok0StwAzIL2VdhIoHk farydj/GMSiB3/n2t7W59QI= X-Google-Smtp-Source: ACHHUZ6WZWgjjLO4fmRZODK6B57Zb98c8JVVM8dsgjY437DZUOUIXbPUET+ZELL9pob+GvDjO4d06g== X-Received: by 2002:a05:6402:494:b0:50b:d5e5:519d with SMTP id k20-20020a056402049400b0050bd5e5519dmr2864310edv.4.1684957965267; Wed, 24 May 2023 12:52:45 -0700 (PDT) Received: from ?IPV6:2a01:c23:c519:9c00:cd4b:d130:35c7:5e08? (dynamic-2a01-0c23-c519-9c00-cd4b-d130-35c7-5e08.c23.pool.telefonica.de. [2a01:c23:c519:9c00:cd4b:d130:35c7:5e08]) by smtp.googlemail.com with ESMTPSA id u24-20020a05640207d800b00504a356b149sm246313edy.25.2023.05.24.12.52.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 May 2023 12:52:44 -0700 (PDT) Message-ID: <8970e813-1fd8-edbd-afe0-7ebf94b31044@gmail.com> Date: Wed, 24 May 2023 21:52:21 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: [PATCH v5 6/6] pwm: meson: make full use of common clock framework Content-Language: en-US From: Heiner Kallweit To: Jerome Brunet , Martin Blumenstingl , Neil Armstrong , Kevin Hilman , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , "thierry.reding@gmail.com" Cc: "linux-arm-kernel@lists.infradead.org" , "open list:ARM/Amlogic Meson..." , linux-pwm@vger.kernel.org, Dmitry Rokosov References: In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230524_125249_203723_96EAAB72 X-CRM114-Status: GOOD ( 33.28 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Newer versions of the PWM block use a core clock with external mux, divider, and gate. These components either don't exist any longer in the PWM block, or they are bypassed. To minimize needed changes for supporting the new version, the internal divider and gate should be handled by CCF too. I didn't see a good way to split the patch, therefore it's somewhat bigger. What it does: - The internal mux is handled by CCF already. Register also internal divider and gate with CCF, so that we have one representation of the input clock: [mux] parent of [divider] parent of [gate] - Now that CCF selects an appropriate mux parent, we don't need the DT-provided default parent any longer. Accordingly we can also omit setting the mux parent directly in the driver. - Instead of manually handling the pre-div divider value, let CCF set the input clock. Targeted input clock frequency is 0xffff * 1/period for best precision. - For the "inverted pwm disabled" scenario target an input clock frequency of ULONG_MAX. This ensures that the remaining low pulses have minimum length. I don't have hw with the old PWM block, therefore I couldn't test this patch. With the not yet included extension for the new PWM block (channel->clk coming directly from get_clk(external_clk)) I didn't notice any problem. My system uses PWM for the CPU voltage regulator and for the SDIO 32kHz clock. Note: The clock gate in the old PWM block is permanently disabled. This seems to indicate that it's not used by the new PWM block. Signed-off-by: Heiner Kallweit --- Changes to RFT/RFC version: - use parent_hws instead of parent_names for div/gate clock - use devm_clk_hw_register where the struct clk * returned by devm_clk_register isn't needed v2: - add patch 1 - add patch 3 - switch to using clk_parent_data in all relevant places v3: - add flag CLK_IGNORE_UNUSED v4: - remove variable tmp in meson_pwm_get_state - don't use deprecated function devm_clk_register v5: - add clk_en_shift - use div_u64 when dividing by NSEC_PER_SEC - use div64_ul in meson_pwm_cnt_to_ns - remove check for __clk_is_enabled(channel->clk) from meson_pwm_get_state() because this is always true once the PWM is requested --- drivers/pwm/pwm-meson.c | 158 +++++++++++++++++++++++----------------- 1 file changed, 90 insertions(+), 68 deletions(-) diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index 48dcc44df..22f54db3a 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -49,9 +49,9 @@ #define PWM_HIGH_MASK GENMASK(31, 16) #define REG_MISC_AB 0x8 -#define MISC_B_CLK_EN BIT(23) -#define MISC_A_CLK_EN BIT(15) -#define MISC_CLK_DIV_MASK 0x7f +#define MISC_B_CLK_EN_SHIFT 23 +#define MISC_A_CLK_EN_SHIFT 15 +#define MISC_CLK_DIV_WIDTH 7 #define MISC_B_CLK_DIV_SHIFT 16 #define MISC_A_CLK_DIV_SHIFT 8 #define MISC_B_CLK_SEL_SHIFT 6 @@ -67,32 +67,33 @@ static struct meson_pwm_channel_data { u8 reg_offset; u8 clk_sel_shift; u8 clk_div_shift; - u32 clk_en_mask; + u8 clk_en_shift; u32 pwm_en_mask; } meson_pwm_per_channel_data[MESON_NUM_PWMS] = { { .reg_offset = REG_PWM_A, .clk_sel_shift = MISC_A_CLK_SEL_SHIFT, .clk_div_shift = MISC_A_CLK_DIV_SHIFT, - .clk_en_mask = MISC_A_CLK_EN, + .clk_en_shift = MISC_A_CLK_EN_SHIFT, .pwm_en_mask = MISC_A_EN, }, { .reg_offset = REG_PWM_B, .clk_sel_shift = MISC_B_CLK_SEL_SHIFT, .clk_div_shift = MISC_B_CLK_DIV_SHIFT, - .clk_en_mask = MISC_B_CLK_EN, + .clk_en_shift = MISC_B_CLK_EN_SHIFT, .pwm_en_mask = MISC_B_EN, } }; struct meson_pwm_channel { + unsigned long rate; unsigned int hi; unsigned int lo; - u8 pre_div; - struct clk *clk_parent; struct clk_mux mux; + struct clk_divider div; + struct clk_gate gate; struct clk *clk; }; @@ -125,16 +126,6 @@ static int meson_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm) struct device *dev = chip->dev; int err; - if (channel->clk_parent) { - err = clk_set_parent(channel->clk, channel->clk_parent); - if (err < 0) { - dev_err(dev, "failed to set parent %s for %s: %d\n", - __clk_get_name(channel->clk_parent), - __clk_get_name(channel->clk), err); - return err; - } - } - err = clk_prepare_enable(channel->clk); if (err < 0) { dev_err(dev, "failed to enable clock %s: %d\n", @@ -157,9 +148,9 @@ static int meson_pwm_calc(struct meson_pwm *meson, struct pwm_device *pwm, const struct pwm_state *state) { struct meson_pwm_channel *channel = &meson->channels[pwm->hwpwm]; - unsigned int pre_div, cnt, duty_cnt; + unsigned int cnt, duty_cnt; unsigned long fin_freq; - u64 duty, period; + u64 duty, period, freq; duty = state->duty_cycle; period = state->period; @@ -173,7 +164,11 @@ static int meson_pwm_calc(struct meson_pwm *meson, struct pwm_device *pwm, if (state->polarity == PWM_POLARITY_INVERSED) duty = period - duty; - fin_freq = clk_get_rate(channel->clk); + freq = div64_u64(NSEC_PER_SEC * 0xffffULL, period); + if (freq > ULONG_MAX) + freq = ULONG_MAX; + + fin_freq = clk_round_rate(channel->clk, freq); if (fin_freq == 0) { dev_err(meson->chip.dev, "invalid source clock frequency\n"); return -EINVAL; @@ -181,40 +176,31 @@ static int meson_pwm_calc(struct meson_pwm *meson, struct pwm_device *pwm, dev_dbg(meson->chip.dev, "fin_freq: %lu Hz\n", fin_freq); - pre_div = div64_u64(fin_freq * period, NSEC_PER_SEC * 0xffffLL); - if (pre_div > MISC_CLK_DIV_MASK) { - dev_err(meson->chip.dev, "unable to get period pre_div\n"); - return -EINVAL; - } - - cnt = div64_u64(fin_freq * period, NSEC_PER_SEC * (pre_div + 1)); + cnt = div_u64(fin_freq * period, NSEC_PER_SEC); if (cnt > 0xffff) { dev_err(meson->chip.dev, "unable to get period cnt\n"); return -EINVAL; } - dev_dbg(meson->chip.dev, "period=%llu pre_div=%u cnt=%u\n", period, - pre_div, cnt); + dev_dbg(meson->chip.dev, "period=%llu cnt=%u\n", period, cnt); if (duty == period) { - channel->pre_div = pre_div; channel->hi = cnt; channel->lo = 0; } else if (duty == 0) { - channel->pre_div = pre_div; channel->hi = 0; channel->lo = cnt; } else { - duty_cnt = div64_u64(fin_freq * duty, NSEC_PER_SEC * (pre_div + 1)); + duty_cnt = div_u64(fin_freq * duty, NSEC_PER_SEC); - dev_dbg(meson->chip.dev, "duty=%llu pre_div=%u duty_cnt=%u\n", - duty, pre_div, duty_cnt); + dev_dbg(meson->chip.dev, "duty=%llu duty_cnt=%u\n", duty, duty_cnt); - channel->pre_div = pre_div; channel->hi = duty_cnt; channel->lo = cnt - duty_cnt; } + channel->rate = fin_freq; + return 0; } @@ -224,16 +210,15 @@ static void meson_pwm_enable(struct meson_pwm *meson, struct pwm_device *pwm) struct meson_pwm_channel_data *channel_data; unsigned long flags; u32 value; + int err; channel_data = &meson_pwm_per_channel_data[pwm->hwpwm]; - spin_lock_irqsave(&meson->lock, flags); + err = clk_set_rate(channel->clk, channel->rate); + if (err) + dev_err(meson->chip.dev, "setting clock rate failed\n"); - value = readl(meson->base + REG_MISC_AB); - value &= ~(MISC_CLK_DIV_MASK << channel_data->clk_div_shift); - value |= channel->pre_div << channel_data->clk_div_shift; - value |= channel_data->clk_en_mask; - writel(value, meson->base + REG_MISC_AB); + spin_lock_irqsave(&meson->lock, flags); value = FIELD_PREP(PWM_HIGH_MASK, channel->hi) | FIELD_PREP(PWM_LOW_MASK, channel->lo); @@ -272,16 +257,16 @@ static int meson_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, /* * This IP block revision doesn't have an "always high" * setting which we can use for "inverted disabled". - * Instead we achieve this using the same settings - * that we use a pre_div of 0 (to get the shortest - * possible duration for one "count") and - * "period == duty_cycle". This results in a signal + * Instead we achieve this by setting mux parent with + * highest rate and minimum divider value, resulting + * in the shortest possible duration for one "count" + * and "period == duty_cycle". This results in a signal * which is LOW for one "count", while being HIGH for * the rest of the (so the signal is HIGH for slightly * less than 100% of the period, but this is the best * we can achieve). */ - channel->pre_div = 0; + channel->rate = ULONG_MAX; channel->hi = ~0; channel->lo = 0; @@ -300,13 +285,12 @@ static int meson_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, return 0; } -static unsigned int meson_pwm_cnt_to_ns(struct pwm_chip *chip, - struct pwm_device *pwm, u32 cnt) +static u64 meson_pwm_cnt_to_ns(struct pwm_chip *chip, struct pwm_device *pwm, + u32 cnt) { struct meson_pwm *meson = to_meson_pwm(chip); struct meson_pwm_channel *channel; unsigned long fin_freq; - u32 fin_ns; /* to_meson_pwm() can only be used after .get_state() is called */ channel = &meson->channels[pwm->hwpwm]; @@ -315,9 +299,7 @@ static unsigned int meson_pwm_cnt_to_ns(struct pwm_chip *chip, if (fin_freq == 0) return 0; - fin_ns = div_u64(NSEC_PER_SEC, fin_freq); - - return cnt * fin_ns * (channel->pre_div + 1); + return div64_ul(NSEC_PER_SEC * (u64)cnt, fin_freq); } static int meson_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm, @@ -326,7 +308,7 @@ static int meson_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm, struct meson_pwm *meson = to_meson_pwm(chip); struct meson_pwm_channel_data *channel_data; struct meson_pwm_channel *channel; - u32 value, tmp; + u32 value; if (!state) return 0; @@ -335,15 +317,9 @@ static int meson_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm, channel_data = &meson_pwm_per_channel_data[pwm->hwpwm]; value = readl(meson->base + REG_MISC_AB); - - tmp = channel_data->pwm_en_mask | channel_data->clk_en_mask; - state->enabled = (value & tmp) == tmp; - - tmp = value >> channel_data->clk_div_shift; - channel->pre_div = FIELD_GET(MISC_CLK_DIV_MASK, tmp); + state->enabled = value & channel_data->pwm_en_mask; value = readl(meson->base + channel_data->reg_offset); - channel->lo = FIELD_GET(PWM_LOW_MASK, value); channel->hi = FIELD_GET(PWM_HIGH_MASK, value); @@ -473,6 +449,7 @@ static int meson_pwm_init_channels(struct meson_pwm *meson) for (i = 0; i < meson->chip.npwm; i++) { struct meson_pwm_channel *channel = &meson->channels[i]; + struct clk_parent_data div_parent = {}, gate_parent = {}; struct clk_init_data init = {}; snprintf(name, sizeof(name), "%s#mux%u", dev_name(dev), i); @@ -492,18 +469,63 @@ static int meson_pwm_init_channels(struct meson_pwm *meson) channel->mux.table = NULL; channel->mux.hw.init = &init; - channel->clk = devm_clk_register(dev, &channel->mux.hw); - if (IS_ERR(channel->clk)) { - err = PTR_ERR(channel->clk); + err = devm_clk_hw_register(dev, &channel->mux.hw); + if (err) { + dev_err(dev, "failed to register %s: %d\n", name, err); + return err; + } + + snprintf(name, sizeof(name), "%s#div%u", dev_name(dev), i); + + init.name = name; + init.ops = &clk_divider_ops; + init.flags = CLK_SET_RATE_PARENT; + div_parent.index = -1; + div_parent.hw = &channel->mux.hw; + init.parent_data = &div_parent; + init.num_parents = 1; + + channel->div.reg = meson->base + REG_MISC_AB; + channel->div.shift = meson_pwm_per_channel_data[i].clk_div_shift; + channel->div.width = MISC_CLK_DIV_WIDTH; + channel->div.hw.init = &init; + channel->div.flags = 0; + channel->div.lock = &meson->lock; + + err = devm_clk_hw_register(dev, &channel->div.hw); + if (err) { dev_err(dev, "failed to register %s: %d\n", name, err); return err; } - snprintf(name, sizeof(name), "clkin%u", i); + snprintf(name, sizeof(name), "%s#gate%u", dev_name(dev), i); - channel->clk_parent = devm_clk_get_optional(dev, name); - if (IS_ERR(channel->clk_parent)) - return PTR_ERR(channel->clk_parent); + init.name = name; + init.ops = &clk_gate_ops; + init.flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED; + gate_parent.index = -1; + gate_parent.hw = &channel->div.hw; + init.parent_data = &gate_parent; + init.num_parents = 1; + + channel->gate.reg = meson->base + REG_MISC_AB; + channel->gate.bit_idx = meson_pwm_per_channel_data[i].clk_en_shift; + channel->gate.hw.init = &init; + channel->gate.flags = 0; + channel->gate.lock = &meson->lock; + + err = devm_clk_hw_register(dev, &channel->gate.hw); + if (err) { + dev_err(dev, "failed to register %s: %d\n", name, err); + return err; + } + + channel->clk = devm_clk_hw_get_clk(dev, &channel->gate.hw, NULL); + if (IS_ERR(channel->clk)) { + err = PTR_ERR(channel->clk); + dev_err(dev, "failed to register %s: %d\n", name, err); + return err; + } } return 0;