All of lore.kernel.org
 help / color / mirror / Atom feed
From: JunYi Zhao <junyi.zhao@amlogic.com>
To: <thierry.reding@gmail.com>, <u.kleine-koenig@pengutronix.de>,
	<neil.armstrong@linaro.org>, <khilman@baylibre.com>,
	<jbrunet@baylibre.com>, <martin.blumenstingl@googlemail.com>,
	<linux-pwm@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-amlogic@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>
Cc: junyi.zhao <junyi.zhao@amlogic.com>
Subject: [PATCH V3 RESEND] pwm: meson: add pwm support for S4
Date: Mon, 16 Oct 2023 13:24:57 +0800	[thread overview]
Message-ID: <20231016052457.1191838-1-junyi.zhao@amlogic.com> (raw)

From: "junyi.zhao" <junyi.zhao@amlogic.com>

Support PWM for S4 soc.
Now the PWM clock input is done in independent CLKCTRL registers.
And no more in the PWM registers.
PWM needs to obtain an external clock source.

Signed-off-by: junyi.zhao <junyi.zhao@amlogic.com>
---
V2 -> V3: 
Rebase and Review the latest upstream code again.
After reconstruction, stick to the previous code as much as possible.
 drivers/pwm/pwm-meson.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c
index 25519cddc2a9..fe9fd75747c4 100644
--- a/drivers/pwm/pwm-meson.c
+++ b/drivers/pwm/pwm-meson.c
@@ -99,6 +99,7 @@ struct meson_pwm_channel {
 struct meson_pwm_data {
 	const char * const *parent_names;
 	unsigned int num_parents;
+	unsigned int extern_clk;
 };
 
 struct meson_pwm {
@@ -396,6 +397,10 @@ static const struct meson_pwm_data pwm_g12a_ao_cd_data = {
 	.num_parents = ARRAY_SIZE(pwm_g12a_ao_cd_parent_names),
 };
 
+static const struct meson_pwm_data pwm_s4_data = {
+	.extern_clk = true,
+};
+
 static const struct of_device_id meson_pwm_matches[] = {
 	{
 		.compatible = "amlogic,meson8b-pwm",
@@ -429,6 +434,10 @@ static const struct of_device_id meson_pwm_matches[] = {
 		.compatible = "amlogic,meson-g12a-ao-pwm-cd",
 		.data = &pwm_g12a_ao_cd_data
 	},
+	{
+		.compatible = "amlogic,s4-pwm",
+		.data = &pwm_s4_data,
+	},
 	{},
 };
 MODULE_DEVICE_TABLE(of, meson_pwm_matches);
@@ -451,6 +460,16 @@ static int meson_pwm_init_channels(struct meson_pwm *meson)
 		struct clk_parent_data div_parent = {}, gate_parent = {};
 		struct clk_init_data init = {};
 
+		if (meson->data->extern_clk) {
+			snprintf(name, sizeof(name), "clkin%u", i);
+			channel->clk = devm_clk_get(dev, name);
+			if (IS_ERR(channel->clk)) {
+				dev_err(meson->chip.dev, "can't get device clock\n");
+				return PTR_ERR(channel->clk);
+			}
+			continue;
+		}
+
 		snprintf(name, sizeof(name), "%s#mux%u", dev_name(dev), i);
 
 		init.name = name;

base-commit: 4d2c646ac07cf4a35ef1c4a935a1a4fd6c6b1a36
-- 
2.41.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: JunYi Zhao <junyi.zhao@amlogic.com>
To: <thierry.reding@gmail.com>, <u.kleine-koenig@pengutronix.de>,
	<neil.armstrong@linaro.org>, <khilman@baylibre.com>,
	<jbrunet@baylibre.com>, <martin.blumenstingl@googlemail.com>,
	<linux-pwm@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-amlogic@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>
Cc: junyi.zhao <junyi.zhao@amlogic.com>
Subject: [PATCH V3 RESEND] pwm: meson: add pwm support for S4
Date: Mon, 16 Oct 2023 13:24:57 +0800	[thread overview]
Message-ID: <20231016052457.1191838-1-junyi.zhao@amlogic.com> (raw)

From: "junyi.zhao" <junyi.zhao@amlogic.com>

Support PWM for S4 soc.
Now the PWM clock input is done in independent CLKCTRL registers.
And no more in the PWM registers.
PWM needs to obtain an external clock source.

Signed-off-by: junyi.zhao <junyi.zhao@amlogic.com>
---
V2 -> V3: 
Rebase and Review the latest upstream code again.
After reconstruction, stick to the previous code as much as possible.
 drivers/pwm/pwm-meson.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c
index 25519cddc2a9..fe9fd75747c4 100644
--- a/drivers/pwm/pwm-meson.c
+++ b/drivers/pwm/pwm-meson.c
@@ -99,6 +99,7 @@ struct meson_pwm_channel {
 struct meson_pwm_data {
 	const char * const *parent_names;
 	unsigned int num_parents;
+	unsigned int extern_clk;
 };
 
 struct meson_pwm {
@@ -396,6 +397,10 @@ static const struct meson_pwm_data pwm_g12a_ao_cd_data = {
 	.num_parents = ARRAY_SIZE(pwm_g12a_ao_cd_parent_names),
 };
 
+static const struct meson_pwm_data pwm_s4_data = {
+	.extern_clk = true,
+};
+
 static const struct of_device_id meson_pwm_matches[] = {
 	{
 		.compatible = "amlogic,meson8b-pwm",
@@ -429,6 +434,10 @@ static const struct of_device_id meson_pwm_matches[] = {
 		.compatible = "amlogic,meson-g12a-ao-pwm-cd",
 		.data = &pwm_g12a_ao_cd_data
 	},
+	{
+		.compatible = "amlogic,s4-pwm",
+		.data = &pwm_s4_data,
+	},
 	{},
 };
 MODULE_DEVICE_TABLE(of, meson_pwm_matches);
@@ -451,6 +460,16 @@ static int meson_pwm_init_channels(struct meson_pwm *meson)
 		struct clk_parent_data div_parent = {}, gate_parent = {};
 		struct clk_init_data init = {};
 
+		if (meson->data->extern_clk) {
+			snprintf(name, sizeof(name), "clkin%u", i);
+			channel->clk = devm_clk_get(dev, name);
+			if (IS_ERR(channel->clk)) {
+				dev_err(meson->chip.dev, "can't get device clock\n");
+				return PTR_ERR(channel->clk);
+			}
+			continue;
+		}
+
 		snprintf(name, sizeof(name), "%s#mux%u", dev_name(dev), i);
 
 		init.name = name;

base-commit: 4d2c646ac07cf4a35ef1c4a935a1a4fd6c6b1a36
-- 
2.41.0


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

             reply	other threads:[~2023-10-16  5:25 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-16  5:24 JunYi Zhao [this message]
2023-10-16  5:24 ` [PATCH V3 RESEND] pwm: meson: add pwm support for S4 JunYi Zhao
2023-10-16 22:37 ` Yixun Lan
2023-10-16 22:37   ` Yixun Lan
2023-10-16 22:37   ` Yixun Lan
2023-10-23 19:40   ` George Stark
2023-10-23 19:40     ` George Stark
2023-10-23 19:40     ` George Stark
2023-10-27  9:22     ` Junyi Zhao
2023-10-27  9:22       ` Junyi Zhao
2023-10-27  9:22       ` Junyi Zhao
2023-10-23 20:07 ` George Stark
2023-10-23 20:07   ` George Stark
2023-10-23 20:07   ` George Stark
2023-10-27  9:34   ` Junyi Zhao
2023-10-27  9:34     ` Junyi Zhao
2023-10-27  9:34     ` Junyi Zhao
2023-10-27 10:00   ` Jerome Brunet
2023-10-27 10:00     ` Jerome Brunet
2023-10-27 10:00     ` Jerome Brunet

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231016052457.1191838-1-junyi.zhao@amlogic.com \
    --to=junyi.zhao@amlogic.com \
    --cc=jbrunet@baylibre.com \
    --cc=khilman@baylibre.com \
    --cc=linux-amlogic@lists.infradead.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pwm@vger.kernel.org \
    --cc=martin.blumenstingl@googlemail.com \
    --cc=neil.armstrong@linaro.org \
    --cc=thierry.reding@gmail.com \
    --cc=u.kleine-koenig@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.