Skip to contentSkip to conversation

PWM: PXA: add device tree support to PWM driver

PATCH RESEND New Mike Dunn 3 participants 12 messages Sep 21, 2013 – Dec 4, 2013

Subsystems (2)
lore
Share & tools
lore

Mike Dunn

author
#0 lore raw

v5 cover PWM: PXA: add device tree support to PWM driver

Dang! Sorry, please disregard previous patch set. RESENDing because previous set did not include the file Documentation/devicetree/bindings/pwm/pxa-pwm.txt

This is now a patch set because the changes to pxa27x.dtsi have been moved to a separate patch. This was done so that it can go through the arm-soc tree.

Changle log:
v5:
- changes to pxa27x.dtsi moved to a separate patch
- minor changes in phrasing made to bindings documentation
- cast removed from void *
- dummy functions for !CONFIG_OF removed; called only if (IS_ENABLED(CONFIG_OF)
- if-else block in pxa_pwm_get_id_dt() replaced with ternary operator

v4:
- add second "compatible" string to pxa27x.dtsi
- change phrasing in binding doc pxa-pwm.txt to "one or more of"

v3:
- remove support for the polarity flag
- remove per-chip pwm index cell; define custom of_xlate() (now #pwm-cells = <1>)
- "compatible" strings for all devices added to OF match table
- various stylistic changes recommended by reviewers

v2:
- of_match_table contains only the "pxa250-pwm" compatible string; require one device instance per pwm
- add Documentation/devicetree/bindings/pwm/pxa-pwm.txt
- add support for polarity flag in DT and implement set_polarity() method (the treo 680 inverts the signal between pwm out and backlight)
- return -EINVAL instead of -ENODEV if platform data or DT node not found
- output dev_info string if platform data missing
- expanded CC list of patch

Mike Dunn (2):
PWM: PXA: add device tree support to PWM driver
PXA: add PWM nodes to pxa27x.dtsi

 Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 30 +++++++++++++
 arch/arm/boot/dts/pxa27x.dtsi                     | 24 +++++++++++
 drivers/pwm/pwm-pxa.c                             | 52 ++++++++++++++++++++++-
 3 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt
Signature · 1 line
1.8.1.5
author
#1 lore raw

PATCH RESEND v5 1/2 PWM: PXA: add device tree support to PWM driver

This patch adds device tree support to the PXA's PWM driver. Nothing needs to be extracted from the device tree node by the PWM device. Client devices need only specify the period; the per-chip index is implicitly zero because one device node must be present for each PWM output in use. This approach is more convenient due to the wide variability in the number of PWM channels present across the various PXA variants, and is made possible by the fact that the register sets for each PWM channel are segregated from each other. An of_xlate() method is added to parse this single-cell node. The existing ID table is reused for the match table data.

Tested on a Palm Treo 680 (both platform data and DT cases).

---
 Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 30 +++++++++++++
 drivers/pwm/pwm-pxa.c                             | 52 ++++++++++++++++++++++-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt
Documentation/devicetree/bindings/pwm/pxa-pwm.txt new file +30 -0
new file mode 100644
index 0000000..5ae9f1e
@@ -0,0 +1,30 @@
+Marvell PWM controller
+
+Required properties:
+- compatible: should be one or more of:
+  - "marvell,pxa250-pwm"
+  - "marvell,pxa270-pwm"
+  - "marvell,pxa168-pwm"
+  - "marvell,pxa910-pwm"
+- reg: Physical base address and length of the registers used by the PWM channel
+  Note that one device instance must be created for each PWM that is used, so the
+  length covers only the register window for one PWM output, not that of the
+  entire PWM controller.  Currently length is 0x10 for all supported devices.
+- #pwm-cells: Should be 1.  This cell is used to specify the period in
+  nanoseconds.
+
+Example PWM device node:
+
+pwm0: pwm at 40b00000 {
+	compatible = "marvell,pxa250-pwm";
+	reg = <0x40b00000 0x10>;
+	#pwm-cells = <1>;
+};
+
+Example PWM client node:
+
+backlight {
+	compatible = "pwm-backlight";
+	pwms = <&pwm0 5000000>;
+	...
+}
drivers/pwm/pwm-pxa.c +51 -1

82 lines not on this page · raw message

Signature · 1 line
1.8.1.5
#2 lore raw

PATCH RESEND v5 1/2 PWM: PXA: add device tree support to PWM driver

Quoted 11 lines · Mike Dunn

This patch adds device tree support to the PXA's PWM driver. Nothing needs to be extracted from the device tree node by the PWM device. Client devices need only specify the period; the per-chip index is implicitly zero because one device node must be present for each PWM output in use. This approach is more convenient due to the wide variability in the number of PWM channels present across the various PXA variants, and is made possible by the fact that the register sets for each PWM channel are segregated from each other. An of_xlate() method is added to parse this single-cell node. The existing ID table is reused for the match table data.

Quoted 8 lines

Tested on a Palm Treo 680 (both platform data and DT cases).

---
 Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 30 +++++++++++++
 drivers/pwm/pwm-pxa.c                             | 52 ++++++++++++++++++++++-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt

This looks good to me, but I'd like to get an Acked-by: from one of the device tree bindings maintainers.

Thierry

Quoted 131 lines
Documentation/devicetree/bindings/pwm/pxa-pwm.txt new file +30 -0
new file mode 100644
index 0000000..5ae9f1e
@@ -0,0 +1,30 @@
+Marvell PWM controller
+
+Required properties:
+- compatible: should be one or more of:
+  - "marvell,pxa250-pwm"
+  - "marvell,pxa270-pwm"
+  - "marvell,pxa168-pwm"
+  - "marvell,pxa910-pwm"
+- reg: Physical base address and length of the registers used by the PWM channel
+  Note that one device instance must be created for each PWM that is used, so the
+  length covers only the register window for one PWM output, not that of the
+  entire PWM controller.  Currently length is 0x10 for all supported devices.
+- #pwm-cells: Should be 1.  This cell is used to specify the period in
+  nanoseconds.
+
+Example PWM device node:
+
+pwm0: pwm at 40b00000 {
+	compatible = "marvell,pxa250-pwm";
+	reg = <0x40b00000 0x10>;
+	#pwm-cells = <1>;
+};
+
+Example PWM client node:
+
+backlight {
+	compatible = "pwm-backlight";
+	pwms = <&pwm0 5000000>;
+	...
+}
drivers/pwm/pwm-pxa.c +51 -1
index a4d2164..e928cc8 100644
@@ -19,6 +19,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/pwm.h>
+#include <linux/of_device.h>
 
 #include <asm/div64.h>
 
@@ -124,6 +125,45 @@ static struct pwm_ops pxa_pwm_ops = {
 	.owner = THIS_MODULE,
 };
 
+#ifdef CONFIG_OF
+/*
+ * Device tree users must create one device instance for each pwm channel.
+ * Hence we dispense with the HAS_SECONDARY_PWM and "tell" the original driver
+ * code that this is a single channel pxa25x-pwm.  Currently all devices are
+ * supported identically.
+ */
+static struct of_device_id pwm_of_match[] = {
+	{ .compatible = "marvell,pxa250-pwm", .data = &pwm_id_table[0]},
+	{ .compatible = "marvell,pxa270-pwm", .data = &pwm_id_table[0]},
+	{ .compatible = "marvell,pxa168-pwm", .data = &pwm_id_table[0]},
+	{ .compatible = "marvell,pxa910-pwm", .data = &pwm_id_table[0]},
+	{ }
+};
+MODULE_DEVICE_TABLE(of, pwm_of_match);
+#else
+static struct of_device_id *pwm_of_match;
+#endif
+
+static const struct platform_device_id *pxa_pwm_get_id_dt(struct device *dev)
+{
+	const struct of_device_id *id = of_match_device(pwm_of_match, dev);
+	return id ? id->data : NULL;
+}
+
+static struct pwm_device *
+pxa_pwm_of_xlate(struct pwm_chip *pc, const struct of_phandle_args *args)
+{
+	struct pwm_device *pwm;
+
+	pwm = pwm_request_from_chip(pc, 0, NULL);
+	if (IS_ERR(pwm))
+		return pwm;
+
+	pwm_set_period(pwm, args->args[0]);
+
+	return pwm;
+}
+
 static int pwm_probe(struct platform_device *pdev)
 {
 	const struct platform_device_id *id = platform_get_device_id(pdev);
@@ -131,6 +171,12 @@ static int pwm_probe(struct platform_device *pdev)
 	struct resource *r;
 	int ret = 0;
 
+	if (IS_ENABLED(CONFIG_OF) && id == NULL)
+		id = pxa_pwm_get_id_dt(&pdev->dev);
+
+	if (id == NULL)
+		return -EINVAL;
+
 	pwm = devm_kzalloc(&pdev->dev, sizeof(*pwm), GFP_KERNEL);
 	if (pwm == NULL) {
 		dev_err(&pdev->dev, "failed to allocate memory\n");
@@ -145,7 +191,10 @@ static int pwm_probe(struct platform_device *pdev)
 	pwm->chip.ops = &pxa_pwm_ops;
 	pwm->chip.base = -1;
 	pwm->chip.npwm = (id->driver_data & HAS_SECONDARY_PWM) ? 2 : 1;
-
+	if (IS_ENABLED(CONFIG_OF)) {
+		pwm->chip.of_xlate = pxa_pwm_of_xlate;
+		pwm->chip.of_pwm_n_cells = 1;
+	}
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	pwm->mmio_base = devm_ioremap_resource(&pdev->dev, r);
 	if (IS_ERR(pwm->mmio_base))
@@ -176,6 +225,7 @@ static struct platform_driver pwm_driver = {
 	.driver		= {
 		.name	= "pxa25x-pwm",
 		.owner	= THIS_MODULE,
+		.of_match_table	= of_match_ptr(pwm_of_match),
 	},
 	.probe		= pwm_probe,
 	.remove		= pwm_remove,
Signature · 1 line
1.8.1.5

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131008/cd5f6b92/attachment.sig>

author
#3 lore raw

PATCH RESEND v5 1/2 PWM: PXA: add device tree support to PWM driver

Quoted 21 lines · Thierry Reding
Quoted 11 lines · Mike Dunn

This patch adds device tree support to the PXA's PWM driver. Nothing needs to be extracted from the device tree node by the PWM device. Client devices need only specify the period; the per-chip index is implicitly zero because one device node must be present for each PWM output in use. This approach is more convenient due to the wide variability in the number of PWM channels present across the various PXA variants, and is made possible by the fact that the register sets for each PWM channel are segregated from each other. An of_xlate() method is added to parse this single-cell node. The existing ID table is reused for the match table data.

Quoted 8 lines

Tested on a Palm Treo 680 (both platform data and DT cases).

---
 Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 30 +++++++++++++
 drivers/pwm/pwm-pxa.c                             | 52 ++++++++++++++++++++++-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt
Quoted 4 lines

This looks good to me, but I'd like to get an Acked-by: from one of the device tree bindings maintainers.

Thierry

Thanks much Thierry and Stephen for the reviews and advice. Stephen, are there any remaining issues with the bindings below?

Thanks again,
Mike

Quoted 132 lines
Quoted 132 lines
Documentation/devicetree/bindings/pwm/pxa-pwm.txt new file +30 -0
new file mode 100644
index 0000000..5ae9f1e
@@ -0,0 +1,30 @@
+Marvell PWM controller
+
+Required properties:
+- compatible: should be one or more of:
+  - "marvell,pxa250-pwm"
+  - "marvell,pxa270-pwm"
+  - "marvell,pxa168-pwm"
+  - "marvell,pxa910-pwm"
+- reg: Physical base address and length of the registers used by the PWM channel
+  Note that one device instance must be created for each PWM that is used, so the
+  length covers only the register window for one PWM output, not that of the
+  entire PWM controller.  Currently length is 0x10 for all supported devices.
+- #pwm-cells: Should be 1.  This cell is used to specify the period in
+  nanoseconds.
+
+Example PWM device node:
+
+pwm0: pwm at 40b00000 {
+	compatible = "marvell,pxa250-pwm";
+	reg = <0x40b00000 0x10>;
+	#pwm-cells = <1>;
+};
+
+Example PWM client node:
+
+backlight {
+	compatible = "pwm-backlight";
+	pwms = <&pwm0 5000000>;
+	...
+}
drivers/pwm/pwm-pxa.c +51 -1
index a4d2164..e928cc8 100644
@@ -19,6 +19,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/pwm.h>
+#include <linux/of_device.h>
 
 #include <asm/div64.h>
 
@@ -124,6 +125,45 @@ static struct pwm_ops pxa_pwm_ops = {
 	.owner = THIS_MODULE,
 };
 
+#ifdef CONFIG_OF
+/*
+ * Device tree users must create one device instance for each pwm channel.
+ * Hence we dispense with the HAS_SECONDARY_PWM and "tell" the original driver
+ * code that this is a single channel pxa25x-pwm.  Currently all devices are
+ * supported identically.
+ */
+static struct of_device_id pwm_of_match[] = {
+	{ .compatible = "marvell,pxa250-pwm", .data = &pwm_id_table[0]},
+	{ .compatible = "marvell,pxa270-pwm", .data = &pwm_id_table[0]},
+	{ .compatible = "marvell,pxa168-pwm", .data = &pwm_id_table[0]},
+	{ .compatible = "marvell,pxa910-pwm", .data = &pwm_id_table[0]},
+	{ }
+};
+MODULE_DEVICE_TABLE(of, pwm_of_match);
+#else
+static struct of_device_id *pwm_of_match;
+#endif
+
+static const struct platform_device_id *pxa_pwm_get_id_dt(struct device *dev)
+{
+	const struct of_device_id *id = of_match_device(pwm_of_match, dev);
+	return id ? id->data : NULL;
+}
+
+static struct pwm_device *
+pxa_pwm_of_xlate(struct pwm_chip *pc, const struct of_phandle_args *args)
+{
+	struct pwm_device *pwm;
+
+	pwm = pwm_request_from_chip(pc, 0, NULL);
+	if (IS_ERR(pwm))
+		return pwm;
+
+	pwm_set_period(pwm, args->args[0]);
+
+	return pwm;
+}
+
 static int pwm_probe(struct platform_device *pdev)
 {
 	const struct platform_device_id *id = platform_get_device_id(pdev);
@@ -131,6 +171,12 @@ static int pwm_probe(struct platform_device *pdev)
 	struct resource *r;
 	int ret = 0;
 
+	if (IS_ENABLED(CONFIG_OF) && id == NULL)
+		id = pxa_pwm_get_id_dt(&pdev->dev);
+
+	if (id == NULL)
+		return -EINVAL;
+
 	pwm = devm_kzalloc(&pdev->dev, sizeof(*pwm), GFP_KERNEL);
 	if (pwm == NULL) {
 		dev_err(&pdev->dev, "failed to allocate memory\n");
@@ -145,7 +191,10 @@ static int pwm_probe(struct platform_device *pdev)
 	pwm->chip.ops = &pxa_pwm_ops;
 	pwm->chip.base = -1;
 	pwm->chip.npwm = (id->driver_data & HAS_SECONDARY_PWM) ? 2 : 1;
-
+	if (IS_ENABLED(CONFIG_OF)) {
+		pwm->chip.of_xlate = pxa_pwm_of_xlate;
+		pwm->chip.of_pwm_n_cells = 1;
+	}
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	pwm->mmio_base = devm_ioremap_resource(&pdev->dev, r);
 	if (IS_ERR(pwm->mmio_base))
@@ -176,6 +225,7 @@ static struct platform_driver pwm_driver = {
 	.driver		= {
 		.name	= "pxa25x-pwm",
 		.owner	= THIS_MODULE,
+		.of_match_table	= of_match_ptr(pwm_of_match),
 	},
 	.probe		= pwm_probe,
 	.remove		= pwm_remove,
Signature · 1 line
1.8.1.5
#4 lore raw

PATCH RESEND v5 1/2 PWM: PXA: add device tree support to PWM driver

In reply to Mike Dunn
Quoted 11 lines · Mike Dunn

This patch adds device tree support to the PXA's PWM driver. Nothing needs to be extracted from the device tree node by the PWM device. Client devices need only specify the period; the per-chip index is implicitly zero because one device node must be present for each PWM output in use. This approach is more convenient due to the wide variability in the number of PWM channels present across the various PXA variants, and is made possible by the fact that the register sets for each PWM channel are segregated from each other. An of_xlate() method is added to parse this single-cell node. The existing ID table is reused for the match table data.

Quoted 8 lines

Tested on a Palm Treo 680 (both platform data and DT cases).

---
 Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 30 +++++++++++++
 drivers/pwm/pwm-pxa.c                             | 52 ++++++++++++++++++++++-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt

Hi Mike,

It looks like this fell through the cracks. Is this patch still the latest one you have? Should it still be applied?

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131203/ecdf98b7/attachment.sig>

author
#5 lore raw

PATCH RESEND v5 1/2 PWM: PXA: add device tree support to PWM driver

Quoted 21 lines · Thierry Reding
Quoted 11 lines · Mike Dunn

This patch adds device tree support to the PXA's PWM driver. Nothing needs to be extracted from the device tree node by the PWM device. Client devices need only specify the period; the per-chip index is implicitly zero because one device node must be present for each PWM output in use. This approach is more convenient due to the wide variability in the number of PWM channels present across the various PXA variants, and is made possible by the fact that the register sets for each PWM channel are segregated from each other. An of_xlate() method is added to parse this single-cell node. The existing ID table is reused for the match table data.

Quoted 8 lines

Tested on a Palm Treo 680 (both platform data and DT cases).

---
 Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 30 +++++++++++++
 drivers/pwm/pwm-pxa.c                             | 52 ++++++++++++++++++++++-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt
Quoted 7 lines

Hi Mike,

It looks like this fell through the cracks. Is this patch still the latest one you have? Should it still be applied?

Thierry

Hi Thierry,

Funny I should hear from you about this today.... I just turned my attention back to this today and noticed that it never made it into your for-next branch.
Yes, it is the latest. If the patch still applies cleanly, please feel free.
Otherwise, I'd be glad to rework it against something more recent.

Also, we never got any ACKs for patch 2/2, which just adds the nodes to arch/arm/boot/dts/pxa27x.dtsi
Any advice on whom to nudge?

Thanks much!
Mike

#6 lore raw

PATCH RESEND v5 1/2 PWM: PXA: add device tree support to PWM driver

Quoted 35 lines · Mike Dunn
Quoted 20 lines · Thierry Reding
Quoted 11 lines · Mike Dunn

This patch adds device tree support to the PXA's PWM driver. Nothing needs to be extracted from the device tree node by the PWM device. Client devices need only specify the period; the per-chip index is implicitly zero because one device node must be present for each PWM output in use. This approach is more convenient due to the wide variability in the number of PWM channels present across the various PXA variants, and is made possible by the fact that the register sets for each PWM channel are segregated from each other. An of_xlate() method is added to parse this single-cell node. The existing ID table is reused for the match table data.

Quoted 8 lines

Tested on a Palm Treo 680 (both platform data and DT cases).

---
  Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 30 +++++++++++++
  drivers/pwm/pwm-pxa.c                             | 52 ++++++++++++++++++++++-
  2 files changed, 81 insertions(+), 1 deletion(-)

create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt

Quoted 7 lines

Hi Mike,

It looks like this fell through the cracks. Is this patch still the latest one you have? Should it still be applied?

Thierry

Hi Thierry,

Funny I should hear from you about this today.... I just turned my attention back to this today and noticed that it never made it into your for-next branch.
Yes, it is the latest. If the patch still applies cleanly, please feel free.
Otherwise, I'd be glad to rework it against something more recent.

Quoted 7 lines

Also, we never got any ACKs for patch 2/2, which just adds the nodes to arch/arm/boot/dts/pxa27x.dtsi
Any advice on whom to nudge?

Thanks much!
Mike

It's fine to me.

Regards
Haojian

#7 lore raw

PATCH RESEND v5 1/2 PWM: PXA: add device tree support to PWM driver

Quoted 41 lines · Haojian Zhuang
Quoted 39 lines · Mike Dunn
Quoted 20 lines · Thierry Reding
Quoted 11 lines · Mike Dunn

This patch adds device tree support to the PXA's PWM driver. Nothing needs to be extracted from the device tree node by the PWM device. Client devices need only specify the period; the per-chip index is implicitly zero because one device node must be present for each PWM output in use. This approach is more convenient due to the wide variability in the number of PWM channels present across the various PXA variants, and is made possible by the fact that the register sets for each PWM channel are segregated from each other. An of_xlate() method is added to parse this single-cell node. The existing ID table is reused for the match table data.

Quoted 8 lines

Tested on a Palm Treo 680 (both platform data and DT cases).

---
 Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 30 +++++++++++++
 drivers/pwm/pwm-pxa.c                             | 52 ++++++++++++++++++++++-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt
Quoted 7 lines

Hi Mike,

It looks like this fell through the cracks. Is this patch still the latest one you have? Should it still be applied?

Thierry

Hi Thierry,

Funny I should hear from you about this today.... I just turned my attention back to this today and noticed that it never made it into your for-next branch.
Yes, it is the latest. If the patch still applies cleanly, please feel free.
Otherwise, I'd be glad to rework it against something more recent.

Also, we never got any ACKs for patch 2/2, which just adds the nodes to arch/arm/boot/dts/pxa27x.dtsi
Any advice on whom to nudge?

Quoted 7 lines
Quoted 3 lines

Thanks much!
Mike

It's fine to me.

I think it's customary to take DTS file updates through the architecture trees, so I think it'd be better if you took patch 2/2. There aren't any dependencies between both patches either.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131204/be4e15f2/attachment-0001.sig>

#8 lore raw

PATCH RESEND v5 1/2 PWM: PXA: add device tree support to PWM driver

Quoted 44 lines · Thierry Reding
Quoted 43 lines · Haojian Zhuang
Quoted 42 lines · Mike Dunn
Quoted 20 lines · Thierry Reding
Quoted 11 lines · Mike Dunn

This patch adds device tree support to the PXA's PWM driver. Nothing needs to be extracted from the device tree node by the PWM device. Client devices need only specify the period; the per-chip index is implicitly zero because one device node must be present for each PWM output in use. This approach is more convenient due to the wide variability in the number of PWM channels present across the various PXA variants, and is made possible by the fact that the register sets for each PWM channel are segregated from each other. An of_xlate() method is added to parse this single-cell node. The existing ID table is reused for the match table data.

Quoted 8 lines

Tested on a Palm Treo 680 (both platform data and DT cases).

---
  Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 30 +++++++++++++
  drivers/pwm/pwm-pxa.c                             | 52 ++++++++++++++++++++++-
  2 files changed, 81 insertions(+), 1 deletion(-)

create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt

Quoted 7 lines

Hi Mike,

It looks like this fell through the cracks. Is this patch still the latest one you have? Should it still be applied?

Thierry

Hi Thierry,

Funny I should hear from you about this today.... I just turned my attention back to this today and noticed that it never made it into your for-next branch.
Yes, it is the latest. If the patch still applies cleanly, please feel free.
Otherwise, I'd be glad to rework it against something more recent.

Also, we never got any ACKs for patch 2/2, which just adds the nodes to arch/arm/boot/dts/pxa27x.dtsi
Any advice on whom to nudge?

Thanks much!
Mike

Quoted 8 lines
Quoted 3 lines

It's fine to me.

I think it's customary to take DTS file updates through the architecture trees, so I think it'd be better if you took patch 2/2. There aren't any dependencies between both patches either.

Thierry

OK. Let me handle this.

Regards
Haojian

#9 lore raw

PATCH RESEND v5 1/2 PWM: PXA: add device tree support to PWM driver

In reply to Mike Dunn
Quoted 30 lines · Mike Dunn
Quoted 21 lines · Thierry Reding
Quoted 11 lines · Mike Dunn

This patch adds device tree support to the PXA's PWM driver. Nothing needs to be extracted from the device tree node by the PWM device. Client devices need only specify the period; the per-chip index is implicitly zero because one device node must be present for each PWM output in use. This approach is more convenient due to the wide variability in the number of PWM channels present across the various PXA variants, and is made possible by the fact that the register sets for each PWM channel are segregated from each other. An of_xlate() method is added to parse this single-cell node. The existing ID table is reused for the match table data.

Quoted 8 lines

Tested on a Palm Treo 680 (both platform data and DT cases).

---
 Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 30 +++++++++++++
 drivers/pwm/pwm-pxa.c                             | 52 ++++++++++++++++++++++-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt
Quoted 7 lines

Hi Mike,

It looks like this fell through the cracks. Is this patch still the latest one you have? Should it still be applied?

Thierry

Quoted 6 lines

Hi Thierry,

Funny I should hear from you about this today.... I just turned my attention back to this today and noticed that it never made it into your for-next branch.
Yes, it is the latest. If the patch still applies cleanly, please feel free.
Otherwise, I'd be glad to rework it against something more recent.

I've applied it to my for-next branch (with some minor whitespace fixups and some tuning to how the OF match table is defined). I don't consider any of the changes risky, but it'd be great if you could still test the version that I pushed.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131204/08ffaefe/attachment-0001.sig>

author
#10 lore raw

PATCH RESEND v5 1/2 PWM: PXA: add device tree support to PWM driver

Quoted 38 lines · Thierry Reding
Quoted 30 lines · Mike Dunn
Quoted 21 lines · Thierry Reding
Quoted 11 lines · Mike Dunn

This patch adds device tree support to the PXA's PWM driver. Nothing needs to be extracted from the device tree node by the PWM device. Client devices need only specify the period; the per-chip index is implicitly zero because one device node must be present for each PWM output in use. This approach is more convenient due to the wide variability in the number of PWM channels present across the various PXA variants, and is made possible by the fact that the register sets for each PWM channel are segregated from each other. An of_xlate() method is added to parse this single-cell node. The existing ID table is reused for the match table data.

Quoted 8 lines

Tested on a Palm Treo 680 (both platform data and DT cases).

---
 Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 30 +++++++++++++
 drivers/pwm/pwm-pxa.c                             | 52 ++++++++++++++++++++++-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt
Quoted 7 lines

Hi Mike,

It looks like this fell through the cracks. Is this patch still the latest one you have? Should it still be applied?

Thierry

Quoted 6 lines

Hi Thierry,

Funny I should hear from you about this today.... I just turned my attention back to this today and noticed that it never made it into your for-next branch.
Yes, it is the latest. If the patch still applies cleanly, please feel free.
Otherwise, I'd be glad to rework it against something more recent.

Quoted 4 lines

I've applied it to my for-next branch (with some minor whitespace fixups and some tuning to how the OF match table is defined). I don't consider any of the changes risky, but it'd be great if you could still test the version that I pushed.

I just tested it... looks good. Thanks again Thierry. Thanks also Haojian.

Mike

author
#11 lore raw

PATCH RESEND v5 2/2 PXA: add PWM nodes to pxa27x.dtsi

In reply to Mike Dunn

This patch adds PWM nodes for each of the four channels present on the pxa270.

---
 arch/arm/boot/dts/pxa27x.dtsi | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
arch/arm/boot/dts/pxa27x.dtsi +24 -0
index d7c5d72..a705469 100644
@@ -10,5 +10,29 @@
 			marvell,intc-priority;
 			marvell,intc-nr-irqs = <34>;
 		};
+
+		pwm0: pwm at 40b00000 {
+			compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm";
+			reg = <0x40b00000 0x10>;
+			#pwm-cells = <1>;
+		};
+
+		pwm1: pwm at 40b00010 {
+			compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm";
+			reg = <0x40b00010 0x10>;
+			#pwm-cells = <1>;
+		};
+
+		pwm2: pwm at 40c00000 {
+			compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm";
+			reg = <0x40c00000 0x10>;
+			#pwm-cells = <1>;
+		};
+
+		pwm3: pwm at 40c00010 {
+			compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm";
+			reg = <0x40c00010 0x10>;
+			#pwm-cells = <1>;
+		};
 	};
 };
Signature · 1 line
1.8.1.5