From nobody Sat Nov 23 15:34:34 2024 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 68E8F14E2E2; Tue, 19 Nov 2024 12:53:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=37.18.73.165 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732020810; cv=none; b=DpNkb3TVwCdE9XfRarRP0ZN6Fv0VPW3W97MPx9uCymFbziu7dXWYc1h+O8RaR1G/cJQi5V1A+2Snw/61dsEzDb39ZhOb5at8v/Ew22RVOL5JiBc2mj5MpRWVxDR1TaCEV9KtoaydiPaSN9dJGcfPqBvp1sf9afvk8wJvMIDi0vY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732020810; c=relaxed/simple; bh=9pwhsAOdX77X/LilUWMR1xrvHAySdz8MW6g7a0vVS1M=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fGSGU8+NYCdexuJQo10Pt8SJF13xvIa5nIQ+qdlENvumcc9otqdPTlGUjQf0LKDV+YJ/omZb4cQX4LhPiZnwK3laeOG+Sclyc0Ztsi69geuDbU4PjFEhJD4sA/vBOK8g53B0dYvFbatDBJkR7iGGZmVi0Gdx68IzKYL8/QG/vs0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com; spf=pass smtp.mailfrom=salutedevices.com; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b=keb1McVj; arc=none smtp.client-ip=37.18.73.165 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b="keb1McVj" Received: from p-infra-ksmg-sc-msk01.sberdevices.ru (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 2FB1A10000A; Tue, 19 Nov 2024 15:53:26 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 2FB1A10000A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1732020806; bh=e4s53L2k5iK23hNWZ8+0hrRU9tNwL4Gmep/nSlXigqI=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=keb1McVjYq5jn6y4fP69ixHEzgWpB64wdCFPO3w/uJR0IDd3zGhOeipCTFbyUfn5n LEJBSuvL3+RwdS2GcFRVeDYlKp9GhoU2PXWAXuh31Pkb3SeoOJL3Bh+nP9trcc5xJ7 AVgkCKq21OdWRcu1urBJls2YHLy9OAgn28krh+1mXlX4JWaM90NbUAlQ2fxi/m/uME VuY375fMYTUjiEG8NTE/Gn1GotqRRPCbWAV3n5Afqw5eIkN3EctaQfQkFmplMlqDla TECyk6ylQTeEmO2+7ixX8pXuWunyi9Q1O6Qm6qSnlQ2aWdqYzfIZcYXC0EyNNb28sV SNS/MaIGBqG+w== Received: from smtp.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Tue, 19 Nov 2024 15:53:25 +0300 (MSK) From: George Stark To: , , , , CC: , , , , , George Stark Subject: [PATCH v3 1/4] pwm: meson: Simplify get_state() callback Date: Tue, 19 Nov 2024 15:53:15 +0300 Message-ID: <20241119125318.3492261-2-gnstark@salutedevices.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241119125318.3492261-1-gnstark@salutedevices.com> References: <20241119125318.3492261-1-gnstark@salutedevices.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: p-i-exch-a-m2.sberdevices.ru (172.24.196.120) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 189267 [Nov 19 2024] X-KSMG-AntiSpam-Version: 6.1.1.7 X-KSMG-AntiSpam-Envelope-From: gnstark@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 41 0.3.41 623e98d5198769c015c72f45fabbb9f77bdb702b, {Tracking_from_domain_doesnt_match_to}, d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;smtp.sberdevices.ru:7.1.1,5.0.1;127.0.0.199:7.1.2;salutedevices.com:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2024/11/19 08:41:00 #26886618 X-KSMG-AntiVirus-Status: Clean, skipped Content-Type: text/plain; charset="utf-8" In .get_state() callback meson_pwm_channel struct are used to store lo and hi reg values but they are never reused after that so for clearness use local variable instead. Signed-off-by: George Stark --- drivers/pwm/pwm-meson.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index 98e6c1533312..c4ee019ce577 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -309,21 +309,20 @@ static int meson_pwm_get_state(struct pwm_chip *chip,= struct pwm_device *pwm, { struct meson_pwm *meson =3D to_meson_pwm(chip); struct meson_pwm_channel_data *channel_data; - struct meson_pwm_channel *channel; + unsigned int hi, lo; u32 value; =20 - channel =3D &meson->channels[pwm->hwpwm]; channel_data =3D &meson_pwm_per_channel_data[pwm->hwpwm]; =20 value =3D readl(meson->base + REG_MISC_AB); state->enabled =3D value & channel_data->pwm_en_mask; =20 value =3D readl(meson->base + channel_data->reg_offset); - channel->lo =3D FIELD_GET(PWM_LOW_MASK, value); - channel->hi =3D FIELD_GET(PWM_HIGH_MASK, value); + lo =3D FIELD_GET(PWM_LOW_MASK, value); + hi =3D FIELD_GET(PWM_HIGH_MASK, value); =20 - state->period =3D meson_pwm_cnt_to_ns(chip, pwm, channel->lo + channel->h= i); - state->duty_cycle =3D meson_pwm_cnt_to_ns(chip, pwm, channel->hi); + state->period =3D meson_pwm_cnt_to_ns(chip, pwm, lo + hi); + state->duty_cycle =3D meson_pwm_cnt_to_ns(chip, pwm, hi); =20 state->polarity =3D PWM_POLARITY_NORMAL; =20 --=20 2.25.1 From nobody Sat Nov 23 15:34:34 2024 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 68E411384BF; Tue, 19 Nov 2024 12:53:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=37.18.73.165 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732020810; cv=none; b=ZQF4ZcLQGJCKzEOK/XoyAsdLUNOq2Rs2vLyNFNvppx36QKXpwN8TQ8DQknlP98lAaB0WPa5hFxEXyq0x5bZhBV0LDNh+5oGwkLiB5EeM2h0VzRcTQRZdYPxWS4MbuUeKpX9g9tZnWoB3N4peDhffoDdfhyYUWy9C5VBA2zyFtJ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732020810; c=relaxed/simple; bh=HGVc0BSZb/iEX/jxb8xKy3ph8RAoQfK6m2PObgvtDEw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=thVqV9GWMsYC4whKtAT7gXDhgTZUKKrDjeLN2rtm7B3mLCNdGC2Yk9Yz7nb+oezyasmtFiYG60Q3aap6/czF6evkk//kbEFANGqpaTnFRMSYlclYwLLMxtBoQq11YXIN0qp3y5eSReYeVrHE+VqecbvMNeoD8kAqsg84kq8dNbM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com; spf=pass smtp.mailfrom=salutedevices.com; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b=R5PSAdov; arc=none smtp.client-ip=37.18.73.165 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b="R5PSAdov" Received: from p-infra-ksmg-sc-msk01.sberdevices.ru (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id A21A810000C; Tue, 19 Nov 2024 15:53:26 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru A21A810000C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1732020806; bh=1R5Vb+1wmqkDhu3Kp45r3skkS1SI4xzSwU+hBpSaVk4=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=R5PSAdovCbpFfnssn2pjZNSC2evkp9fVEwuOQ467iguUUo4CE1jC6UgcQGHqTOuUp Jc+d4e/4gRB2bzLz/sF5Q35lUnor0NDEJYs48VGHpdSCo5KyPnAdyrhmtHfXrwgqBE Vx9i79YAG7uYoZPOsqU8FOhhbXTM4kflLT7seWz4+e2WJW316rgHp5mthLPcoTOpco j24xwdkfQcYbKPzAtvBvgnSqMZH+5W9UIaWc89w1TQsRLVqj7ncIvzI0jw9vhvhvjX AZGdPtfMiiPmQWYrOB7EWVwPd9m5vyJMOROuvzprpVP/5xVUO29vAJm8CfxYgr6qer OLqH6SUigiCdw== Received: from smtp.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Tue, 19 Nov 2024 15:53:26 +0300 (MSK) From: George Stark To: , , , , CC: , , , , , George Stark Subject: [PATCH v3 2/4] pwm: meson: Support constant and polarity bits Date: Tue, 19 Nov 2024 15:53:16 +0300 Message-ID: <20241119125318.3492261-3-gnstark@salutedevices.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241119125318.3492261-1-gnstark@salutedevices.com> References: <20241119125318.3492261-1-gnstark@salutedevices.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: p-i-exch-a-m2.sberdevices.ru (172.24.196.120) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 189267 [Nov 19 2024] X-KSMG-AntiSpam-Version: 6.1.1.7 X-KSMG-AntiSpam-Envelope-From: gnstark@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 41 0.3.41 623e98d5198769c015c72f45fabbb9f77bdb702b, {Tracking_from_domain_doesnt_match_to}, d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;smtp.sberdevices.ru:7.1.1,5.0.1;127.0.0.199:7.1.2;salutedevices.com:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2024/11/19 08:41:00 #26886618 X-KSMG-AntiVirus-Status: Clean, skipped Content-Type: text/plain; charset="utf-8" Newer meson PWM IPs support constant and polarity bits. Support them to correctly implement constant and inverted output levels. Using constant bit allows to have truly stable low or high output level. Since hi and low regs internally increment its values by 1 just writing zero to any of them gives 1 clock count impulse. If constant bit is set zero value in hi and low regs is not incremented. Using polarity bit instead of swapping hi and low reg values allows to correctly identify inversion in .get_state(). Signed-off-by: George Stark --- drivers/pwm/pwm-meson.c | 61 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 7 deletions(-) diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index c4ee019ce577..d7335efa3db7 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -6,7 +6,7 @@ * PWM output is achieved by calculating a clock that permits calculating * two periods (low and high). The counter then has to be set to switch af= ter * N cycles for the first half period. - * The hardware has no "polarity" setting. This driver reverses the period + * Partly the hardware has no "polarity" setting. This driver reverses the= period * cycles (the low length is inverted with the high length) for * PWM_POLARITY_INVERSED. This means that .get_state cannot read the polar= ity * from the hardware. @@ -56,6 +56,10 @@ #define MISC_B_CLK_SEL_SHIFT 6 #define MISC_A_CLK_SEL_SHIFT 4 #define MISC_CLK_SEL_MASK 0x3 +#define MISC_B_CONSTANT_EN BIT(29) +#define MISC_A_CONSTANT_EN BIT(28) +#define MISC_B_INVERT_EN BIT(27) +#define MISC_A_INVERT_EN BIT(26) #define MISC_B_EN BIT(1) #define MISC_A_EN BIT(0) =20 @@ -68,6 +72,8 @@ static struct meson_pwm_channel_data { u8 clk_div_shift; u8 clk_en_shift; u32 pwm_en_mask; + u32 const_en_mask; + u32 inv_en_mask; } meson_pwm_per_channel_data[MESON_NUM_PWMS] =3D { { .reg_offset =3D REG_PWM_A, @@ -75,6 +81,8 @@ static struct meson_pwm_channel_data { .clk_div_shift =3D MISC_A_CLK_DIV_SHIFT, .clk_en_shift =3D MISC_A_CLK_EN_SHIFT, .pwm_en_mask =3D MISC_A_EN, + .const_en_mask =3D MISC_A_CONSTANT_EN, + .inv_en_mask =3D MISC_A_INVERT_EN, }, { .reg_offset =3D REG_PWM_B, @@ -82,6 +90,8 @@ static struct meson_pwm_channel_data { .clk_div_shift =3D MISC_B_CLK_DIV_SHIFT, .clk_en_shift =3D MISC_B_CLK_EN_SHIFT, .pwm_en_mask =3D MISC_B_EN, + .const_en_mask =3D MISC_B_CONSTANT_EN, + .inv_en_mask =3D MISC_B_INVERT_EN, } }; =20 @@ -89,6 +99,8 @@ struct meson_pwm_channel { unsigned long rate; unsigned int hi; unsigned int lo; + bool constant; + bool inverted; =20 struct clk_mux mux; struct clk_divider div; @@ -99,6 +111,8 @@ struct meson_pwm_channel { struct meson_pwm_data { const char *const parent_names[MESON_NUM_MUX_PARENTS]; int (*channels_init)(struct pwm_chip *chip); + bool has_constant; + bool has_polarity; }; =20 struct meson_pwm { @@ -160,7 +174,7 @@ static int meson_pwm_calc(struct pwm_chip *chip, struct= pwm_device *pwm, * Fixing this needs some care however as some machines might rely on * this. */ - if (state->polarity =3D=3D PWM_POLARITY_INVERSED) + if (state->polarity =3D=3D PWM_POLARITY_INVERSED && !meson->data->has_pol= arity) duty =3D period - duty; =20 freq =3D div64_u64(NSEC_PER_SEC * 0xffffULL, period); @@ -187,9 +201,11 @@ static int meson_pwm_calc(struct pwm_chip *chip, struc= t pwm_device *pwm, if (duty =3D=3D period) { channel->hi =3D cnt; channel->lo =3D 0; + channel->constant =3D true; } else if (duty =3D=3D 0) { channel->hi =3D 0; channel->lo =3D cnt; + channel->constant =3D true; } else { duty_cnt =3D mul_u64_u64_div_u64(fin_freq, duty, NSEC_PER_SEC); =20 @@ -197,6 +213,7 @@ static int meson_pwm_calc(struct pwm_chip *chip, struct= pwm_device *pwm, =20 channel->hi =3D duty_cnt; channel->lo =3D cnt - duty_cnt; + channel->constant =3D false; } =20 channel->rate =3D fin_freq; @@ -227,6 +244,19 @@ static void meson_pwm_enable(struct pwm_chip *chip, st= ruct pwm_device *pwm) =20 value =3D readl(meson->base + REG_MISC_AB); value |=3D channel_data->pwm_en_mask; + + if (meson->data->has_constant) { + value &=3D ~channel_data->const_en_mask; + if (channel->constant) + value |=3D channel_data->const_en_mask; + } + + if (meson->data->has_polarity) { + value &=3D ~channel_data->inv_en_mask; + if (channel->inverted) + value |=3D channel_data->inv_en_mask; + } + writel(value, meson->base + REG_MISC_AB); =20 spin_unlock_irqrestore(&meson->lock, flags); @@ -235,13 +265,24 @@ static void meson_pwm_enable(struct pwm_chip *chip, s= truct pwm_device *pwm) static void meson_pwm_disable(struct pwm_chip *chip, struct pwm_device *pw= m) { struct meson_pwm *meson =3D to_meson_pwm(chip); + struct meson_pwm_channel *channel =3D &meson->channels[pwm->hwpwm]; + struct meson_pwm_channel_data *channel_data; unsigned long flags; u32 value; =20 + channel_data =3D &meson_pwm_per_channel_data[pwm->hwpwm]; + spin_lock_irqsave(&meson->lock, flags); =20 value =3D readl(meson->base + REG_MISC_AB); - value &=3D ~meson_pwm_per_channel_data[pwm->hwpwm].pwm_en_mask; + value &=3D ~channel_data->pwm_en_mask; + + if (meson->data->has_polarity) { + value &=3D ~channel_data->inv_en_mask; + if (channel->inverted) + value |=3D channel_data->inv_en_mask; + } + writel(value, meson->base + REG_MISC_AB); =20 spin_unlock_irqrestore(&meson->lock, flags); @@ -254,10 +295,12 @@ static int meson_pwm_apply(struct pwm_chip *chip, str= uct pwm_device *pwm, struct meson_pwm_channel *channel =3D &meson->channels[pwm->hwpwm]; int err =3D 0; =20 + channel->inverted =3D (state->polarity =3D=3D PWM_POLARITY_INVERSED); + if (!state->enabled) { - if (state->polarity =3D=3D PWM_POLARITY_INVERSED) { + if (channel->inverted && !meson->data->has_polarity) { /* - * This IP block revision doesn't have an "always high" + * Some of IP block revisions don't have an "always high" * setting which we can use for "inverted disabled". * Instead we achieve this by setting mux parent with * highest rate and minimum divider value, resulting @@ -271,6 +314,7 @@ static int meson_pwm_apply(struct pwm_chip *chip, struc= t pwm_device *pwm, channel->rate =3D ULONG_MAX; channel->hi =3D ~0; channel->lo =3D 0; + channel->constant =3D true; =20 meson_pwm_enable(chip, pwm); } else { @@ -317,6 +361,11 @@ static int meson_pwm_get_state(struct pwm_chip *chip, = struct pwm_device *pwm, value =3D readl(meson->base + REG_MISC_AB); state->enabled =3D value & channel_data->pwm_en_mask; =20 + if (meson->data->has_polarity && (value & channel_data->inv_en_mask)) + state->polarity =3D PWM_POLARITY_INVERSED; + else + state->polarity =3D PWM_POLARITY_NORMAL; + value =3D readl(meson->base + channel_data->reg_offset); lo =3D FIELD_GET(PWM_LOW_MASK, value); hi =3D FIELD_GET(PWM_HIGH_MASK, value); @@ -324,8 +373,6 @@ static int meson_pwm_get_state(struct pwm_chip *chip, s= truct pwm_device *pwm, state->period =3D meson_pwm_cnt_to_ns(chip, pwm, lo + hi); state->duty_cycle =3D meson_pwm_cnt_to_ns(chip, pwm, hi); =20 - state->polarity =3D PWM_POLARITY_NORMAL; - return 0; } =20 --=20 2.25.1 From nobody Sat Nov 23 15:34:34 2024 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 68F4B1CBE98; Tue, 19 Nov 2024 12:53:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=37.18.73.165 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732020810; cv=none; b=gJsthVtcHVfgUgFNcW61GF2qbCccnn15PQNK2lv9Us4lqzIUHajflCNvIdm3Otao21Ej90zZMFLaA0ANTJZ/j43nizvrXUJOogsW0rQ6tGkizyOE/XhxZq4Jf4BpKevIs+I+aL+v1QDsUFKv0FeFZZ3MLuUSjHjeTPu6ixe30rc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732020810; c=relaxed/simple; bh=Q1ilrJjWDJ4+Ex+VxLNUTo9k+NBDo1LseJpkC1syAZc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MqFNyhlMX2izgKZ20a4YxaKWdVHoBoE0UqOpz2GPSENq9bv3MIjzpwrr5aK+vghBKfLJFle8PJPZGaQbx89Ra4Bten0e8nkQrRFmn9uDhwn82wyYydWM5fjbT5N9p655pVlk8zZSUM7vvoMml7nSGTnKmhg+gdAh8y+1VVONwps= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com; spf=pass smtp.mailfrom=salutedevices.com; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b=J2QL3Mac; arc=none smtp.client-ip=37.18.73.165 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b="J2QL3Mac" Received: from p-infra-ksmg-sc-msk01.sberdevices.ru (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id CA5DF10000D; Tue, 19 Nov 2024 15:53:26 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru CA5DF10000D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1732020806; bh=059kkIYqpn0ehFSmAg/GBS0dpyJTqN0Io9RSk7P5TWk=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=J2QL3MacK0LO38lqp+Mn2nOqlMhnD3C5Jy3wWygH3YzHN+LdkY4ng5B6CcFHdTW8K 83SlWByFK9r9t2i/V/mDjXSlvMlApCd25GkRsM56zvM5lNaQACeKUYUExAF8k2E+xV 1kUuX6C6/mmNcI7F4lJnShg7tiVhpfhMtoOn6dmTWbDOQOTw8jYJ3CvBomCTwko48G PN5t1KtnArh+fYjgrAxqPUehQmSpy8I1+/bmRF6c4BoZXQ81osIg6zuUvsB5Ak2+Yg quWYJ3owHbkOpxpTC0X+cqh4UQQn7ApruiosqAJ5hMhAvtXO+wEfOXy4JpiZQ28InJ AFetk3gw5NdGg== Received: from smtp.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Tue, 19 Nov 2024 15:53:26 +0300 (MSK) From: George Stark To: , , , , CC: , , , , , George Stark Subject: [PATCH v3 3/4] pwm: meson: Use separate device id data for axg and g12 Date: Tue, 19 Nov 2024 15:53:17 +0300 Message-ID: <20241119125318.3492261-4-gnstark@salutedevices.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241119125318.3492261-1-gnstark@salutedevices.com> References: <20241119125318.3492261-1-gnstark@salutedevices.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: p-i-exch-a-m2.sberdevices.ru (172.24.196.120) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 189267 [Nov 19 2024] X-KSMG-AntiSpam-Version: 6.1.1.7 X-KSMG-AntiSpam-Envelope-From: gnstark@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 41 0.3.41 623e98d5198769c015c72f45fabbb9f77bdb702b, {Tracking_from_domain_doesnt_match_to}, d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;smtp.sberdevices.ru:7.1.1,5.0.1;127.0.0.199:7.1.2;salutedevices.com:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2024/11/19 08:41:00 #26886618 X-KSMG-AntiVirus-Status: Clean, skipped Content-Type: text/plain; charset="utf-8" Add separate devce id data for compatibles: amlogic,meson-g12a-ee-pwm, amlogic,meson-axg-pwm-v2, amlogic,meson-g12-pwm-v2 due to those PWM modules have different set of features than meson8. Signed-off-by: George Stark Reviewed-by: Neil Armstrong --- drivers/pwm/pwm-meson.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index d7335efa3db7..3cc48c3dde5e 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -561,6 +561,11 @@ static const struct meson_pwm_data pwm_axg_ao_data =3D= { .channels_init =3D meson_pwm_init_channels_meson8b_legacy, }; =20 +static const struct meson_pwm_data pwm_g12a_ee_data =3D { + .parent_names =3D { "xtal", NULL, "fclk_div4", "fclk_div3" }, + .channels_init =3D meson_pwm_init_channels_meson8b_legacy, +}; + static const struct meson_pwm_data pwm_g12a_ao_ab_data =3D { .parent_names =3D { "xtal", "g12a_ao_clk81", "fclk_div4", "fclk_div5" }, .channels_init =3D meson_pwm_init_channels_meson8b_legacy, @@ -575,6 +580,10 @@ static const struct meson_pwm_data pwm_meson8_v2_data = =3D { .channels_init =3D meson_pwm_init_channels_meson8b_v2, }; =20 +static const struct meson_pwm_data pwm_meson_axg_v2_data =3D { + .channels_init =3D meson_pwm_init_channels_meson8b_v2, +}; + static const struct meson_pwm_data pwm_s4_data =3D { .channels_init =3D meson_pwm_init_channels_s4, }; @@ -584,6 +593,14 @@ static const struct of_device_id meson_pwm_matches[] = =3D { .compatible =3D "amlogic,meson8-pwm-v2", .data =3D &pwm_meson8_v2_data }, + { + .compatible =3D "amlogic,meson-axg-pwm-v2", + .data =3D &pwm_meson_axg_v2_data + }, + { + .compatible =3D "amlogic,meson-g12-pwm-v2", + .data =3D &pwm_meson_axg_v2_data + }, /* The following compatibles are obsolete */ { .compatible =3D "amlogic,meson8b-pwm", @@ -607,7 +624,7 @@ static const struct of_device_id meson_pwm_matches[] = =3D { }, { .compatible =3D "amlogic,meson-g12a-ee-pwm", - .data =3D &pwm_meson8b_data + .data =3D &pwm_g12a_ee_data }, { .compatible =3D "amlogic,meson-g12a-ao-pwm-ab", --=20 2.25.1 From nobody Sat Nov 23 15:34:34 2024 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A79E81CBEBC; Tue, 19 Nov 2024 12:53:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=37.18.73.165 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732020811; cv=none; b=TbIfXgEw1cGfV5TfURtFbgAZbMRSWI9g4+YtB3k/DZs2rPgN3CQd3Z+Xe/1OY1bBEncJgDbpsWDK9khLWX62yd/aJqhjp285l1m9FvHNDXs8LxILN/BrT88qmc1NaAGdZIbfFI2WFos/TyIAAwhaZ0VlxQ8v2DGVSwTLanDrKew= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732020811; c=relaxed/simple; bh=z1qJmt+nNCOzp3ahO6UqRHWpOI8pCHCZDjYoNobDk74=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OXcB25j9wWL6kk6mQOm1ZMTAGfYcsYpCuSPsbGcBLF/V+NSfoPbZp8Hw37Duc8ehoF7zpB+phHniakGkdkOsIxp7umzQF+pD/QmKxhH+YMKCLJW5tKwcF0uoS8AlNzrqCGNar5ZhKv8fVsJWOBO+MPSSDs9h21ecJu/+f80iyvc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com; spf=pass smtp.mailfrom=salutedevices.com; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b=XfaAxOt8; arc=none smtp.client-ip=37.18.73.165 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b="XfaAxOt8" Received: from p-infra-ksmg-sc-msk01.sberdevices.ru (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 08FD610000E; Tue, 19 Nov 2024 15:53:27 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 08FD610000E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1732020807; bh=SlfMZQ4DgQrFKcas76Ke7AUU5dNNyOcvl5kzGZtWTCQ=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=XfaAxOt8xJL0o2bn3DElg0ZCWAij29HHkhbit0ttw7XFteLn4SLBOOabt9Utnrg9I mvmE3/7E5yo5OC+7Fjqf4udXGCU4t4iAzLaLeokoP9hMl68/eByu7jIa4Si4E/dUdY i2gkFFEWBUXx+o1Vu+bBxWr+5gaIOsM5huoaCx40/DohYEV6OrXAl1tQRgOMwij+Xx 9cSlxWWUKO1EgytpoeIzmSibeuvaJenxNFtz6XU35t02ZUZbbVDNC4OOiNKnazpJwa Hrot9p1bJZufuaXF7KW3w5Sfa2Bq7wm1P7g6gLaUeJBeJbPYzSP5g/DrV57BEeXa/2 QHNemeT/uGfDQ== Received: from smtp.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Tue, 19 Nov 2024 15:53:26 +0300 (MSK) From: George Stark To: , , , , CC: , , , , , George Stark Subject: [PATCH v3 4/4] pwm: meson: Enable constant and polarity features for g12, axg, s4 Date: Tue, 19 Nov 2024 15:53:18 +0300 Message-ID: <20241119125318.3492261-5-gnstark@salutedevices.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241119125318.3492261-1-gnstark@salutedevices.com> References: <20241119125318.3492261-1-gnstark@salutedevices.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: p-i-exch-a-m2.sberdevices.ru (172.24.196.120) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 189267 [Nov 19 2024] X-KSMG-AntiSpam-Version: 6.1.1.7 X-KSMG-AntiSpam-Envelope-From: gnstark@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 41 0.3.41 623e98d5198769c015c72f45fabbb9f77bdb702b, {Tracking_from_domain_doesnt_match_to}, d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;smtp.sberdevices.ru:7.1.1,5.0.1;127.0.0.199:7.1.2;salutedevices.com:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2024/11/19 08:41:00 #26886618 X-KSMG-AntiVirus-Status: Clean, skipped Content-Type: text/plain; charset="utf-8" g12, axg and s4 SoC families support constant and polarity bits so enable those features in corresponding chip data structs. Signed-off-by: George Stark Reviewed-by: Neil Armstrong --- drivers/pwm/pwm-meson.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index 3cc48c3dde5e..806e06c2b92e 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -554,26 +554,36 @@ static const struct meson_pwm_data pwm_gxbb_ao_data = =3D { static const struct meson_pwm_data pwm_axg_ee_data =3D { .parent_names =3D { "xtal", "fclk_div5", "fclk_div4", "fclk_div3" }, .channels_init =3D meson_pwm_init_channels_meson8b_legacy, + .has_constant =3D true, + .has_polarity =3D true, }; =20 static const struct meson_pwm_data pwm_axg_ao_data =3D { .parent_names =3D { "xtal", "axg_ao_clk81", "fclk_div4", "fclk_div5" }, .channels_init =3D meson_pwm_init_channels_meson8b_legacy, + .has_constant =3D true, + .has_polarity =3D true, }; =20 static const struct meson_pwm_data pwm_g12a_ee_data =3D { .parent_names =3D { "xtal", NULL, "fclk_div4", "fclk_div3" }, .channels_init =3D meson_pwm_init_channels_meson8b_legacy, + .has_constant =3D true, + .has_polarity =3D true, }; =20 static const struct meson_pwm_data pwm_g12a_ao_ab_data =3D { .parent_names =3D { "xtal", "g12a_ao_clk81", "fclk_div4", "fclk_div5" }, .channels_init =3D meson_pwm_init_channels_meson8b_legacy, + .has_constant =3D true, + .has_polarity =3D true, }; =20 static const struct meson_pwm_data pwm_g12a_ao_cd_data =3D { .parent_names =3D { "xtal", "g12a_ao_clk81", NULL, NULL }, .channels_init =3D meson_pwm_init_channels_meson8b_legacy, + .has_constant =3D true, + .has_polarity =3D true, }; =20 static const struct meson_pwm_data pwm_meson8_v2_data =3D { @@ -582,10 +592,14 @@ static const struct meson_pwm_data pwm_meson8_v2_data= =3D { =20 static const struct meson_pwm_data pwm_meson_axg_v2_data =3D { .channels_init =3D meson_pwm_init_channels_meson8b_v2, + .has_constant =3D true, + .has_polarity =3D true, }; =20 static const struct meson_pwm_data pwm_s4_data =3D { .channels_init =3D meson_pwm_init_channels_s4, + .has_constant =3D true, + .has_polarity =3D true, }; =20 static const struct of_device_id meson_pwm_matches[] =3D { --=20 2.25.1