Skip to contentSkip to conversation

pwm: pxa: add device tree support to pwm driver

PATCH New Mike Dunn 3 participants 11 messages Sep 3, 2013 – Sep 5, 2013

Subsystems (2)
lore
Share & tools
lore

Mike Dunn

author
#0 lore raw

PATCH 1/1 pwm: pxa: add device tree support to pwm driver

This patch adds device tree support to the pxa's pwm driver. Only an OF match table is added; nothing needs to be extracted from the device tree node. The existing platform_device id table is reused for the match table data.

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

---

I don't have data sheets handy for the newer Marvell pxa's (and I'm confused about the presence of a pwm unit on pxa25x), so only pxa27x.dtsi was updated. Thanks for looking!

 arch/arm/boot/dts/pxa27x.dtsi | 12 ++++++++++++
 drivers/pwm/pwm-pxa.c         | 31 +++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
arch/arm/boot/dts/pxa27x.dtsi +12 -0
index d7c5d72..4031dce 100644
@@ -10,5 +10,17 @@
 			marvell,intc-priority;
 			marvell,intc-nr-irqs = <34>;
 		};
+
+		pwm0: pwm at 40b00000 {
+			compatible = "marvell,pxa27x-pwm";
+			reg = <0x40b00000 0x100000>;
+			#pwm-cells = <2>;
+		};
+
+		pwm1: pwm at 40c00000 {
+			compatible = "marvell,pxa27x-pwm";
+			reg = <0x40c00000 0x100000>;
+			#pwm-cells = <2>;
+		};
 	};
 };
drivers/pwm/pwm-pxa.c +31 -0
index a4d2164..be5f914 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,30 @@ static struct pwm_ops pxa_pwm_ops = {
 	.owner = THIS_MODULE,
 };
 
+#ifdef CONFIG_OF
+/* use the platform_device id table for OF match table data */
+static struct of_device_id pwm_of_match[] = {
+	{ .compatible = "marvell,pxa25x-pwm", .data = &pwm_id_table[0] },
+	{ .compatible = "marvell,pxa27x-pwm", .data = &pwm_id_table[1] },
+	{ .compatible = "marvell,pxa168-pwm", .data = &pwm_id_table[2] },
+	{ .compatible = "marvell,pxa910-pwm", .data = &pwm_id_table[3] },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, pwm_of_match);
+
+static const struct platform_device_id *pxa_pwm_get_id_dt(struct device *dev)
+{
+	const struct of_device_id *pwm_pxa_devid =
+		of_match_device(pwm_of_match, dev);
+	if (pwm_pxa_devid)
+		return (const struct platform_device_id *)pwm_pxa_devid->data;
+	else
+		return NULL;
+}
+#else  /* !CONFIG_OF */
+#define pxa_pwm_get_id_dt(dev) ((const struct platform_device_id *)NULL)
+#endif
+
 static int pwm_probe(struct platform_device *pdev)
 {
 	const struct platform_device_id *id = platform_get_device_id(pdev);
@@ -131,6 +156,11 @@ static int pwm_probe(struct platform_device *pdev)
 	struct resource *r;
 	int ret = 0;
 
+	if (id == NULL)		/* using device tree */
+		id = pxa_pwm_get_id_dt(&pdev->dev);
+	if (id == NULL)
+		return -ENODEV;
+
 	pwm = devm_kzalloc(&pdev->dev, sizeof(*pwm), GFP_KERNEL);
 	if (pwm == NULL) {
 		dev_err(&pdev->dev, "failed to allocate memory\n");
@@ -176,6 +206,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
#1 lore raw

PATCH 1/1 pwm: pxa: add device tree support to pwm driver

Dear Mike Dunn,

Quoted 56 lines

This patch adds device tree support to the pxa's pwm driver. Only an OF match table is added; nothing needs to be extracted from the device tree node. The existing platform_device id table is reused for the match table data.

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

---

I don't have data sheets handy for the newer Marvell pxa's (and I'm confused about the presence of a pwm unit on pxa25x), so only pxa27x.dtsi was updated. Thanks for looking!

 arch/arm/boot/dts/pxa27x.dtsi | 12 ++++++++++++
 drivers/pwm/pwm-pxa.c         | 31 +++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
arch/arm/boot/dts/pxa27x.dtsi +12 -0
index d7c5d72..4031dce 100644
@@ -10,5 +10,17 @@
 			marvell,intc-priority;
 			marvell,intc-nr-irqs = <34>;
 		};
+
+		pwm0: pwm at 40b00000 {
+			compatible = "marvell,pxa27x-pwm";
+			reg = <0x40b00000 0x100000>;
+			#pwm-cells = <2>;
+		};
+
+		pwm1: pwm at 40c00000 {
+			compatible = "marvell,pxa27x-pwm";
+			reg = <0x40c00000 0x100000>;
+			#pwm-cells = <2>;
+		};
 	};
 };
drivers/pwm/pwm-pxa.c +1 -0
index a4d2164..be5f914 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,30 @@ static struct pwm_ops pxa_pwm_ops = {
 	.owner = THIS_MODULE,
 };
 

drivers/pwm/pwm-pxa.c static struct pwm_ops pxa_pwm_ops = { · line 137

Quoted 10 lines
drivers/pwm/pwm-pxa.c +10 -0
+#ifdef CONFIG_OF
+/* use the platform_device id table for OF match table data */
+static struct of_device_id pwm_of_match[] = {
+	{ .compatible = "marvell,pxa25x-pwm", .data = &pwm_id_table[0] },
+	{ .compatible = "marvell,pxa27x-pwm", .data = &pwm_id_table[1] },
+	{ .compatible = "marvell,pxa168-pwm", .data = &pwm_id_table[2] },
+	{ .compatible = "marvell,pxa910-pwm", .data = &pwm_id_table[3] },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, pwm_of_match);

Are PXA2xx and PXA3xx PWM impleemntations not all the same ? If so, why not just stick with pxa25x-pwm only for all of the CPUs (aka. the lowest CPU model). Then the table would have but a single entry.

[...]

Best regards,
Marek Vasut

author
#2 lore raw

PATCH 1/1 pwm: pxa: add device tree support to pwm driver

On 09/03/2013 03:20 PM, Marek Vasut wrote:

[...]

Quoted 15 lines

drivers/pwm/pwm-pxa.c static struct pwm_ops pxa_pwm_ops = { · line 137

Quoted 11 lines
drivers/pwm/pwm-pxa.c +10 -0
+#ifdef CONFIG_OF
+/* use the platform_device id table for OF match table data */
+static struct of_device_id pwm_of_match[] = {
+	{ .compatible = "marvell,pxa25x-pwm", .data = &pwm_id_table[0] },
+	{ .compatible = "marvell,pxa27x-pwm", .data = &pwm_id_table[1] },
+	{ .compatible = "marvell,pxa168-pwm", .data = &pwm_id_table[2] },
+	{ .compatible = "marvell,pxa910-pwm", .data = &pwm_id_table[3] },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, pwm_of_match);

Are PXA2xx and PXA3xx PWM impleemntations not all the same ? If so, why not just stick with pxa25x-pwm only for all of the CPUs (aka. the lowest CPU model). Then the table would have but a single entry.

I'm just echoing the existing platform_device_id table...

static const struct platform_device_id pwm_id_table[] = {
	/*   PWM    has_secondary_pwm? */
	{ "pxa25x-pwm", 0 },
	{ "pxa27x-pwm", HAS_SECONDARY_PWM },
	{ "pxa168-pwm", 0 },
	{ "pxa910-pwm", 0 },
	{ },
};

MODULE_DEVICE_TABLE(platform, pwm_id_table);

... so that my changes to the driver are minimal. Yes, apparently the only difference is the existance of a "secondary" pwm for pxa27x.

BTW, the pxa27x actually has four pwms, which is why the addition I made to pxa27x.dtsi has two nodes (the driver handles two pwms for each device instance in the pxa27x case).

Thanks Marek.

Mike

#3 lore raw

PATCH 1/1 pwm: pxa: add device tree support to pwm driver

Dear Mike Dunn,

Quoted 29 lines · Marek Vasut

[...]

Quoted 6 lines
Quoted 6 lines
drivers/pwm/pwm-pxa.c +6 -0
+#ifdef CONFIG_OF
+/* use the platform_device id table for OF match table data */
+static struct of_device_id pwm_of_match[] = {
+	{ .compatible = "marvell,pxa25x-pwm", .data = &pwm_id_table[0] },
+	{ .compatible = "marvell,pxa27x-pwm", .data = &pwm_id_table[1] },
+	{ .compatible = "marvell,pxa168-pwm", .data = &pwm_id_table[2] },
Quoted 8 lines

drivers/pwm/pwm-pxa.c static struct pwm_ops pxa_pwm_ops = { · line 137

Quoted 4 lines
drivers/pwm/pwm-pxa.c +4 -0
+	{ .compatible = "marvell,pxa910-pwm", .data = &pwm_id_table[3] },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, pwm_of_match);

Are PXA2xx and PXA3xx PWM impleemntations not all the same ? If so, why not just stick with pxa25x-pwm only for all of the CPUs (aka. the lowest CPU model). Then the table would have but a single entry.

I'm just echoing the existing platform_device_id table...

static const struct platform_device_id pwm_id_table[] = {
	/*   PWM    has_secondary_pwm? */
	{ "pxa25x-pwm", 0 },
	{ "pxa27x-pwm", HAS_SECONDARY_PWM },
	{ "pxa168-pwm", 0 },
	{ "pxa910-pwm", 0 },
	{ },
};
Quoted 9 lines

MODULE_DEVICE_TABLE(platform, pwm_id_table);

... so that my changes to the driver are minimal. Yes, apparently the only difference is the existance of a "secondary" pwm for pxa27x.

BTW, the pxa27x actually has four pwms, which is why the addition I made to pxa27x.dtsi has two nodes (the driver handles two pwms for each device instance in the pxa27x case).

What's that "secondary PWM" there? I no longer remember, sorry. The question remains still, we can have two entries there (pxa25x and pxa27x) ORR have one entry (pxa25x) + mrvl,has-secondary-pwm entry.

Best regards,
Marek Vasut

author
#4 lore raw

PATCH 1/1 pwm: pxa: add device tree support to pwm driver

Quoted 36 lines · Marek Vasut

Dear Mike Dunn,

Quoted 34 lines · Marek Vasut

[...]

Quoted 6 lines
Quoted 6 lines
drivers/pwm/pwm-pxa.c +6 -0
+#ifdef CONFIG_OF
+/* use the platform_device id table for OF match table data */
+static struct of_device_id pwm_of_match[] = {
+	{ .compatible = "marvell,pxa25x-pwm", .data = &pwm_id_table[0] },
+	{ .compatible = "marvell,pxa27x-pwm", .data = &pwm_id_table[1] },
+	{ .compatible = "marvell,pxa168-pwm", .data = &pwm_id_table[2] },
Quoted 8 lines

drivers/pwm/pwm-pxa.c static struct pwm_ops pxa_pwm_ops = { · line 137

Quoted 4 lines
drivers/pwm/pwm-pxa.c +4 -0
+	{ .compatible = "marvell,pxa910-pwm", .data = &pwm_id_table[3] },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, pwm_of_match);

Are PXA2xx and PXA3xx PWM impleemntations not all the same ? If so, why not just stick with pxa25x-pwm only for all of the CPUs (aka. the lowest CPU model). Then the table would have but a single entry.

I'm just echoing the existing platform_device_id table...

static const struct platform_device_id pwm_id_table[] = {
	/*   PWM    has_secondary_pwm? */
	{ "pxa25x-pwm", 0 },
	{ "pxa27x-pwm", HAS_SECONDARY_PWM },
	{ "pxa168-pwm", 0 },
	{ "pxa910-pwm", 0 },
	{ },
};

MODULE_DEVICE_TABLE(platform, pwm_id_table);

... so that my changes to the driver are minimal. Yes, apparently the only difference is the existance of a "secondary" pwm for pxa27x.

Quoted 6 lines
Quoted 4 lines

BTW, the pxa27x actually has four pwms, which is why the addition I made to pxa27x.dtsi has two nodes (the driver handles two pwms for each device instance in the pxa27x case).

What's that "secondary PWM" there? I no longer remember, sorry.

If pdev->id_entry->driver_data == HAS_SECONDARY_PWM, then pwm_chip->npwm=2 when pwmchip_add() is called. Otherwise pwm_chip->npwm=1. The driver knows that the second pwm's registers are at a fixed offset from the first. For compatibility, the pxa27x maps the registers for the third pwm at a distant offset, and makes the offset between 3 and 4 the same as between 1 and 2. Yes, the driver mkes this unnecessarily complicated. There should just be one device instance per pwm, and dispense with the whole driver_data thing. I guess there's some history there.

Quoted 3 lines

The question
remains still, we can have two entries there (pxa25x and pxa27x) ORR have one entry (pxa25x) + mrvl,has-secondary-pwm entry.

It looks like defining "compatible" properties that mirror the old platform_device_id names won't fly... wildcards are verboten (see Sergei's comment). So your inclination to use one value for the "compatible" property is correct. I think the way to go is to forget the whole HAS_SECONDARY_PWM in the DT case, have one device instance per pwm, and use "compatible=marvell,pwm". Other suggestions welcome.

Thanks,
Mike

#5 lore raw

PATCH 1/1 pwm: pxa: add device tree support to pwm driver

Dear Mike Dunn,

Quoted 11 lines · Marek Vasut
Quoted 10 lines

Dear Mike Dunn,

Quoted 8 lines · Marek Vasut

[...]

Quoted 4 lines

drivers/pwm/pwm-pxa.c static struct pwm_ops pxa_pwm_ops = {

Quoted 4 lines
drivers/pwm/pwm-pxa.c +4 -0
+#ifdef CONFIG_OF
+/* use the platform_device id table for OF match table data */
+static struct of_device_id pwm_of_match[] = {
+	{ .compatible = "marvell,pxa25x-pwm", .data = &pwm_id_table[0] 

},

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

Review

Quoted 1 line
(quoted diff) +1 -0
+	{ .compatible = "marvell,pxa27x-pwm", .data = &pwm_id_table[1] 

},

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

Review

Quoted 1 line
(quoted diff) +1 -0
+	{ .compatible = "marvell,pxa168-pwm", .data = &pwm_id_table[2] 

},

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

Review

Quoted 1 line
(quoted diff) +1 -0
+	{ .compatible = "marvell,pxa910-pwm", .data = &pwm_id_table[3] 

},

Quoted 31 lines
Quoted 22 lines
Quoted 22 lines
Quoted 7 lines

drivers/pwm/pwm-pxa.c static struct pwm_ops pxa_pwm_ops = { · line 137

Quoted 3 lines
drivers/pwm/pwm-pxa.c +3 -0
+	{ }
+};
+MODULE_DEVICE_TABLE(of, pwm_of_match);

Are PXA2xx and PXA3xx PWM impleemntations not all the same ? If so, why not just stick with pxa25x-pwm only for all of the CPUs (aka. the lowest CPU model). Then the table would have but a single entry.

I'm just echoing the existing platform_device_id table...

static const struct platform_device_id pwm_id_table[] = {

	/*   PWM    has_secondary_pwm? */
	{ "pxa25x-pwm", 0 },
	{ "pxa27x-pwm", HAS_SECONDARY_PWM },
	{ "pxa168-pwm", 0 },
	{ "pxa910-pwm", 0 },
	{ },

};
MODULE_DEVICE_TABLE(platform, pwm_id_table);

Quoted 8 lines
Quoted 6 lines

... so that my changes to the driver are minimal. Yes, apparently the only difference is the existance of a "secondary" pwm for pxa27x.

BTW, the pxa27x actually has four pwms, which is why the addition I made to pxa27x.dtsi has two nodes (the driver handles two pwms for each device instance in the pxa27x case).

What's that "secondary PWM" there? I no longer remember, sorry.

Quoted 8 lines

If pdev->id_entry->driver_data == HAS_SECONDARY_PWM, then pwm_chip->npwm=2 when pwmchip_add() is called. Otherwise pwm_chip->npwm=1. The driver knows that the second pwm's registers are at a fixed offset from the first. For compatibility, the pxa27x maps the registers for the third pwm at a distant offset, and makes the offset between 3 and 4 the same as between 1 and 2. Yes, the driver mkes this unnecessarily complicated. There should just be one device instance per pwm, and dispense with the whole driver_data thing. I guess there's some history there.

OK, I checked the datasheet. The register block for PWM<n + 2> is at offset of 0x10 from PWM<n> , for n in {0, 1} .

Why can we not just register four PWM blocks, each with 0x10 register window size then? I know there's history (maybe), but then, with DT, this might go away.

Quoted 6 lines
Quoted 3 lines

The question
remains still, we can have two entries there (pxa25x and pxa27x) ORR have one entry (pxa25x) + mrvl,has-secondary-pwm entry.

It looks like defining "compatible" properties that mirror the old platform_device_id names won't fly...

Yes of course, this won't work. I didn't know the layout exactly.

Quoted 5 lines

wildcards are verboten (see Sergei's
comment). So your inclination to use one value for the "compatible" property is correct. I think the way to go is to forget the whole HAS_SECONDARY_PWM in the DT case, have one device instance per pwm, and use "compatible=marvell,pwm". Other suggestions welcome.

compatbile=marvell,pxa25x-pwm , no ? The lowest CPU with the block.

Best regards,
Marek Vasut

author
#6 lore raw

PATCH 1/1 pwm: pxa: add device tree support to pwm driver

Quoted 1 line · Marek Vasut
Quoted 1 line
Quoted 1 line

[...]

Quoted 11 lines
Quoted 10 lines
Quoted 1 line

What's that "secondary PWM" there? I no longer remember, sorry.

If pdev->id_entry->driver_data == HAS_SECONDARY_PWM, then pwm_chip->npwm=2 when pwmchip_add() is called. Otherwise pwm_chip->npwm=1. The driver knows that the second pwm's registers are at a fixed offset from the first. For compatibility, the pxa27x maps the registers for the third pwm at a distant offset, and makes the offset between 3 and 4 the same as between 1 and 2. Yes, the driver mkes this unnecessarily complicated. There should just be one device instance per pwm, and dispense with the whole driver_data thing. I guess there's some history there.

Quoted 6 lines

OK, I checked the datasheet. The register block for PWM<n + 2> is at offset of 0x10 from PWM<n> , for n in {0, 1} .

Why can we not just register four PWM blocks, each with 0x10 register window size then? I know there's history (maybe), but then, with DT, this might go away.

Indeed. That is what I am also thinking.

Quoted 10 lines
Quoted 7 lines
Quoted 4 lines

The question
remains still, we can have two entries there (pxa25x and pxa27x) ORR have one entry (pxa25x) + mrvl,has-secondary-pwm entry.

It looks like defining "compatible" properties that mirror the old platform_device_id names won't fly...

Yes of course, this won't work. I didn't know the layout exactly.

Quoted 7 lines
Quoted 5 lines

wildcards are verboten (see Sergei's
comment). So your inclination to use one value for the "compatible" property is correct. I think the way to go is to forget the whole HAS_SECONDARY_PWM in the DT case, have one device instance per pwm, and use "compatible=marvell,pwm". Other suggestions welcome.

compatbile=marvell,pxa25x-pwm , no ? The lowest CPU with the block.

Unless I am missing something, the compatible string does not need to replicate any of the existing platform_device_id names, so wouldn't "marvell,pxa" be better? Except for register mapping and the number of units present on a particular pxa variant, the peripheral is software compatible across all pxa processors. Plus there is the problem of the 'x' wildcard in "pxa25x-pwm".

Thanks,
Mike

#7 lore raw

PATCH 1/1 pwm: pxa: add device tree support to pwm driver

Dear Mike Dunn,

Quoted 41 lines · Marek Vasut

[...]

Quoted 12 lines
Quoted 11 lines
Quoted 1 line

What's that "secondary PWM" there? I no longer remember, sorry.

If pdev->id_entry->driver_data == HAS_SECONDARY_PWM, then pwm_chip->npwm=2 when pwmchip_add() is called. Otherwise pwm_chip->npwm=1. The driver knows that the second pwm's registers are at a fixed offset from the first. For compatibility, the pxa27x maps the registers for the third pwm at a distant offset, and makes the offset between 3 and 4 the same as between 1 and 2. Yes, the driver mkes this unnecessarily complicated. There should just be one device instance per pwm, and dispense with the whole driver_data thing. I guess there's some history there.

Quoted 6 lines

OK, I checked the datasheet. The register block for PWM<n + 2> is at offset of 0x10 from PWM<n> , for n in {0, 1} .

Why can we not just register four PWM blocks, each with 0x10 register window size then? I know there's history (maybe), but then, with DT, this might go away.

Indeed. That is what I am also thinking.

Quoted 15 lines
Quoted 6 lines
Quoted 3 lines

The question
remains still, we can have two entries there (pxa25x and pxa27x) ORR have one entry (pxa25x) + mrvl,has-secondary-pwm entry.

It looks like defining "compatible" properties that mirror the old platform_device_id names won't fly...

Yes of course, this won't work. I didn't know the layout exactly.

Quoted 5 lines

wildcards are verboten (see Sergei's
comment). So your inclination to use one value for the "compatible" property is correct. I think the way to go is to forget the whole HAS_SECONDARY_PWM in the DT case, have one device instance per pwm, and use "compatible=marvell,pwm". Other suggestions welcome.

Quoted 8 lines
Quoted 1 line

compatbile=marvell,pxa25x-pwm , no ? The lowest CPU with the block.

Unless I am missing something, the compatible string does not need to replicate any of the existing platform_device_id names, so wouldn't "marvell,pxa" be better? Except for register mapping and the number of units present on a particular pxa variant, the peripheral is software compatible across all pxa processors. Plus there is the problem of the 'x' wildcard in "pxa25x-pwm".

So use pxa250 ?

My concern is once marvell comes up with PXA1048576 which will have a different PWM unit, then what will be the name for this new one?

Best regards,
Marek Vasut

author
#8 lore raw

PATCH 1/1 pwm: pxa: add device tree support to pwm driver

Quoted 1 line · Marek Vasut
Quoted 1 line
Quoted 1 line

[...]

Quoted 9 lines
Quoted 8 lines
Quoted 1 line

compatbile=marvell,pxa25x-pwm , no ? The lowest CPU with the block.

Unless I am missing something, the compatible string does not need to replicate any of the existing platform_device_id names, so wouldn't "marvell,pxa" be better? Except for register mapping and the number of units present on a particular pxa variant, the peripheral is software compatible across all pxa processors. Plus there is the problem of the 'x' wildcard in "pxa25x-pwm".

Quoted 4 lines

So use pxa250 ?

My concern is once marvell comes up with PXA1048576 which will have a different PWM unit, then what will be the name for this new one?

I see. OK then, pxa250 it is.

Thanks Marek,
Mike

#9 lore raw

PATCH 1/1 pwm: pxa: add device tree support to pwm driver

In reply to Mike Dunn

Hello.

Quoted 25 lines · Mike Dunn
Quoted 6 lines
Quoted 6 lines
drivers/pwm/pwm-pxa.c +6 -0
+#ifdef CONFIG_OF
+/* use the platform_device id table for OF match table data */
+static struct of_device_id pwm_of_match[] = {
+	{ .compatible = "marvell,pxa25x-pwm", .data = &pwm_id_table[0] },
+	{ .compatible = "marvell,pxa27x-pwm", .data = &pwm_id_table[1] },
+	{ .compatible = "marvell,pxa168-pwm", .data = &pwm_id_table[2] },
Quoted 8 lines

drivers/pwm/pwm-pxa.c static struct pwm_ops pxa_pwm_ops = { · line 137

Quoted 4 lines
drivers/pwm/pwm-pxa.c +4 -0
+	{ .compatible = "marvell,pxa910-pwm", .data = &pwm_id_table[3] },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, pwm_of_match);

Are PXA2xx and PXA3xx PWM impleemntations not all the same ? If so, why not just stick with pxa25x-pwm only for all of the CPUs (aka. the lowest CPU model). Then the table would have but a single entry.

I'm just echoing the existing platform_device_id table...

static const struct platform_device_id pwm_id_table[] = {
	/*   PWM    has_secondary_pwm? */
	{ "pxa25x-pwm", 0 },
	{ "pxa27x-pwm", HAS_SECONDARY_PWM },
	{ "pxa168-pwm", 0 },
	{ "pxa910-pwm", 0 },
	{ },
};
Quoted 1 line

MODULE_DEVICE_TABLE(platform, pwm_id_table);

Unlike 'struct platform_device_id', the "compatible" property can't have
wildcards such as "pxa25x-pwm". You should choose one model (which e.g. was produced first in the PXA25x series) and use that.

Quoted 1 line

Mike

WBR, Sergei

author
#10 lore raw

PATCH 1/1 pwm: pxa: add device tree support to pwm driver

Quoted 31 lines · Sergei Shtylyov

Hello.

Quoted 25 lines · Mike Dunn
Quoted 6 lines
Quoted 6 lines
drivers/pwm/pwm-pxa.c +6 -0
+#ifdef CONFIG_OF
+/* use the platform_device id table for OF match table data */
+static struct of_device_id pwm_of_match[] = {
+    { .compatible = "marvell,pxa25x-pwm", .data = &pwm_id_table[0] },
+    { .compatible = "marvell,pxa27x-pwm", .data = &pwm_id_table[1] },
+    { .compatible = "marvell,pxa168-pwm", .data = &pwm_id_table[2] },
Quoted 8 lines

drivers/pwm/pwm-pxa.c static struct pwm_ops pxa_pwm_ops = { · line 137

Quoted 4 lines
drivers/pwm/pwm-pxa.c +4 -0
+    { .compatible = "marvell,pxa910-pwm", .data = &pwm_id_table[3] },
+    { }
+};
+MODULE_DEVICE_TABLE(of, pwm_of_match);

Are PXA2xx and PXA3xx PWM impleemntations not all the same ? If so, why not just stick with pxa25x-pwm only for all of the CPUs (aka. the lowest CPU model). Then the table would have but a single entry.

I'm just echoing the existing platform_device_id table...

static const struct platform_device_id pwm_id_table[] = {
    /*   PWM    has_secondary_pwm? */
    { "pxa25x-pwm", 0 },
    { "pxa27x-pwm", HAS_SECONDARY_PWM },
    { "pxa168-pwm", 0 },
    { "pxa910-pwm", 0 },
    { },
};
Quoted 1 line

MODULE_DEVICE_TABLE(platform, pwm_id_table);

Quoted 3 lines

Unlike 'struct platform_device_id', the "compatible" property can't have
wildcards such as "pxa25x-pwm". You should choose one model (which e.g. was produced first in the PXA25x series) and use that.

Thanks Sergei, I forgot about that. I also forgot to add a file to Documentation/devicetree/bindings/pwm/ Looks like I have more work.

Mike