From: Paul Cercueil <paul@crapouillou.net>
To: Thierry Reding <thierry.reding@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>,
Ralf Baechle <ralf@linux-mips.org>,
Paul Burton <paul.burton@mips.com>,
Jonathan Corbet <corbet@lwn.net>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>, Lee Jones <lee.jones@linaro.org>
Cc: Paul Cercueil <paul@crapouillou.net>,
linux-pwm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org,
linux-mips@linux-mips.org, linux-doc@vger.kernel.org,
linux-clk@vger.kernel.org
Subject: [PATCH v5 13/21] pwm: jz4740: Add support for the JZ4725B
Date: Wed, 25 Jul 2018 01:19:50 +0200 [thread overview]
Message-ID: <20180724231958.20659-14-paul@crapouillou.net> (raw)
In-Reply-To: <20180724231958.20659-1-paul@crapouillou.net>
The PWM in the JZ4725B works the same as in the JZ4740, except that it
only has 6 channels available instead of 8.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
drivers/pwm/pwm-jz4740.c | 34 +++++++++++++++++++++++++---------
1 file changed, 25 insertions(+), 9 deletions(-)
v5: New patch
diff --git a/drivers/pwm/pwm-jz4740.c b/drivers/pwm/pwm-jz4740.c
index e1cb618bb234..b19437c75232 100644
--- a/drivers/pwm/pwm-jz4740.c
+++ b/drivers/pwm/pwm-jz4740.c
@@ -26,6 +26,10 @@
#define NUM_PWM 8
+struct jz4740_soc_info {
+ unsigned int num_pwms;
+};
+
struct jz4740_pwm_chip {
struct pwm_chip chip;
struct clk *clks[NUM_PWM];
@@ -195,8 +199,26 @@ static const struct pwm_ops jz4740_pwm_ops = {
.owner = THIS_MODULE,
};
+static const struct jz4740_soc_info jz4740_soc_info = {
+ .num_pwms = 8,
+};
+
+static const struct jz4740_soc_info jz4725b_soc_info = {
+ .num_pwms = 6,
+};
+
+#ifdef CONFIG_OF
+static const struct of_device_id jz4740_pwm_dt_ids[] = {
+ { .compatible = "ingenic,jz4740-pwm", .data = &jz4740_soc_info },
+ { .compatible = "ingenic,jz4725b-pwm", .data = &jz4725b_soc_info },
+ {},
+};
+MODULE_DEVICE_TABLE(of, jz4740_pwm_dt_ids);
+#endif
+
static int jz4740_pwm_probe(struct platform_device *pdev)
{
+ const struct jz4740_soc_info *soc_info;
struct jz4740_pwm_chip *jz4740;
struct device *dev = &pdev->dev;
@@ -213,9 +235,11 @@ static int jz4740_pwm_probe(struct platform_device *pdev)
if (IS_ERR(jz4740->map))
return PTR_ERR(jz4740->map);
+ soc_info = of_device_get_match_data(dev);
+
jz4740->chip.dev = dev;
jz4740->chip.ops = &jz4740_pwm_ops;
- jz4740->chip.npwm = NUM_PWM;
+ jz4740->chip.npwm = soc_info->num_pwms;
jz4740->chip.base = -1;
jz4740->chip.of_xlate = of_pwm_xlate_with_flags;
jz4740->chip.of_pwm_n_cells = 3;
@@ -232,14 +256,6 @@ static int jz4740_pwm_remove(struct platform_device *pdev)
return pwmchip_remove(&jz4740->chip);
}
-#ifdef CONFIG_OF
-static const struct of_device_id jz4740_pwm_dt_ids[] = {
- { .compatible = "ingenic,jz4740-pwm", },
- {},
-};
-MODULE_DEVICE_TABLE(of, jz4740_pwm_dt_ids);
-#endif
-
static struct platform_driver jz4740_pwm_driver = {
.driver = {
.name = "jz4740-pwm",
--
2.11.0
next prev parent reply other threads:[~2018-07-25 0:36 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-24 23:19 [PATCH v5 00/21] Ingenic JZ47xx TCU patchset v5 Paul Cercueil
2018-07-24 23:19 ` [PATCH v5 01/21] mfd: Add ingenic-tcu.h header Paul Cercueil
2018-07-24 23:19 ` [PATCH v5 02/21] dt-bindings: ingenic: Add DT bindings for TCU clocks Paul Cercueil
2018-07-24 23:19 ` [PATCH v5 03/21] doc: Add doc for the Ingenic TCU hardware Paul Cercueil
2018-07-24 23:19 ` [PATCH v5 04/21] dt-bindings: Add doc for the Ingenic TCU drivers Paul Cercueil
2018-07-25 15:21 ` Rob Herring
2018-07-30 22:01 ` Paul Cercueil
2018-10-01 8:48 ` Daniel Lezcano
2018-07-24 23:19 ` [PATCH v5 05/21] clocksource: Add a new timer-ingenic driver Paul Cercueil
2018-07-24 23:19 ` [PATCH v5 06/21] clocksource: Add driver for the Ingenic JZ47xx OST Paul Cercueil
2018-07-24 23:19 ` [PATCH v5 07/21] MAINTAINERS: Add myself as maintainer for Ingenic TCU drivers Paul Cercueil
2018-07-24 23:19 ` [PATCH v5 08/21] watchdog: jz4740: Use regmap and WDT clock provided by TCU driver Paul Cercueil
2018-07-25 1:14 ` Guenter Roeck
2018-07-30 21:27 ` Paul Cercueil
2018-07-24 23:19 ` [PATCH v5 09/21] watchdog: jz4740: Drop dependency on MACH_JZ47xx, use COMPILE_TEST Paul Cercueil
2018-07-24 23:19 ` [PATCH v5 10/21] pwm: jz4740: Use regmap and clocks from TCU driver Paul Cercueil
2018-07-24 23:19 ` [PATCH v5 11/21] pwm: jz4740: Drop dependency on MACH_INGENIC, use COMPILE_TEST Paul Cercueil
2018-07-24 23:19 ` [PATCH v5 12/21] pwm: jz4740: Remove unused devicetree compatible strings Paul Cercueil
2018-07-24 23:19 ` Paul Cercueil [this message]
2018-07-24 23:19 ` [PATCH v5 14/21] clk: jz4740: Add TCU clock Paul Cercueil
2018-07-25 15:22 ` Rob Herring
2018-07-25 23:30 ` Stephen Boyd
2018-07-24 23:19 ` [PATCH v5 15/21] MIPS: Kconfig: Select TCU timer driver when MACH_INGENIC is set Paul Cercueil
2018-07-24 23:19 ` [PATCH v5 16/21] MIPS: jz4740: Add DTS nodes for the TCU drivers Paul Cercueil
2018-07-24 23:19 ` [PATCH v5 17/21] MIPS: qi_lb60: Move PWM devices to devicetree Paul Cercueil
2018-07-24 23:19 ` [PATCH v5 18/21] MIPS: qi_lb60: Use 750 kHz system timer & enable clocksource Paul Cercueil
2018-07-24 23:19 ` [PATCH v5 19/21] MIPS: CI20: Reduce system timer clock to 3 MHz Paul Cercueil
2018-07-24 23:19 ` [PATCH v5 20/21] MIPS: CI20: defconfig: enable OST driver Paul Cercueil
2018-07-24 23:22 ` [PATCH v5 21/21] MIPS: jz4740: Drop obsolete code Paul Cercueil
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=20180724231958.20659-14-paul@crapouillou.net \
--to=paul@crapouillou.net \
--cc=corbet@lwn.net \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-pwm@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mark.rutland@arm.com \
--cc=mturquette@baylibre.com \
--cc=paul.burton@mips.com \
--cc=ralf@linux-mips.org \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
--cc=tglx@linutronix.de \
--cc=thierry.reding@gmail.com \
--cc=wim@linux-watchdog.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).