* [PATCH V6] mfd: stmpe: Update DT support for stmpe driver
@ 2012-12-06 15:43 Viresh Kumar
2012-12-06 16:40 ` Lee Jones
2012-12-06 20:21 ` Linus Walleij
0 siblings, 2 replies; 4+ messages in thread
From: Viresh Kumar @ 2012-12-06 15:43 UTC (permalink / raw)
To: sameo
Cc: lee.jones, devicetree-discuss, linux-kernel, spear-devel,
Vipul Kumar Samar, Viresh Kumar
From: Vipul Kumar Samar <vipulkumar.samar@st.com>
This patch extends existing DT support for stmpe devices. This updates:
- missing header files in stmpe.c
- stmpe_of_probe() with pwm, rotator and new bindings.
- Bindings are updated in binding document.
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Vipul Kumar Samar <vipulkumar.samar@st.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
Hi Samuel,
I have added acked by Lee as he earlier Acked this patch, most of the part is
still the same. And nothing new added.
V5->V6:
- Removed of_devide_id tables from stmpe-i2c[spi].c
Documentation/devicetree/bindings/mfd/stmpe.txt | 9 ++++++---
drivers/mfd/stmpe.c | 27 +++++++++++++++++++------
2 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/Documentation/devicetree/bindings/mfd/stmpe.txt b/Documentation/devicetree/bindings/mfd/stmpe.txt
index 8f0aeda..d2d88d9 100644
--- a/Documentation/devicetree/bindings/mfd/stmpe.txt
+++ b/Documentation/devicetree/bindings/mfd/stmpe.txt
@@ -1,8 +1,11 @@
-* STMPE Multi-Functional Device
+* ST Microelectronics STMPE Multi-Functional Device
+
+STMPE is an MFD device which may expose following inbuilt devices: gpio, keypad,
+touchscreen, adc, pwm, rotator.
Required properties:
- - compatible : "st,stmpe[811|1601|2401|2403]"
- - reg : I2C address of the device
+ - compatible : "st,stmpe[610|801|811|1601|2401|2403]"
+ - reg : I2C/SPI address of the device
Optional properties:
- interrupts : The interrupt outputs from the controller
diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 34408b4..bb2dfdb 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -7,12 +7,15 @@
* Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
*/
+#include <linux/err.h>
#include <linux/gpio.h>
#include <linux/export.h>
#include <linux/kernel.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/irqdomain.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
#include <linux/pm.h>
#include <linux/slab.h>
#include <linux/mfd/core.h>
@@ -1019,6 +1022,14 @@ void __devinit stmpe_of_probe(struct stmpe_platform_data *pdata,
{
struct device_node *child;
+ /*
+ * Distinct names of same cell-type within multiple instances of stmpe
+ * will be guaranteed by DT.
+ */
+ pdata->id = -1;
+
+ pdata->irq_trigger = IRQF_TRIGGER_NONE;
+
of_property_read_u32(np, "st,autosleep-timeout",
&pdata->autosleep_timeout);
@@ -1027,15 +1038,16 @@ void __devinit stmpe_of_probe(struct stmpe_platform_data *pdata,
for_each_child_of_node(np, child) {
if (!strcmp(child->name, "stmpe_gpio")) {
pdata->blocks |= STMPE_BLOCK_GPIO;
- }
- if (!strcmp(child->name, "stmpe_keypad")) {
+ } else if (!strcmp(child->name, "stmpe_keypad")) {
pdata->blocks |= STMPE_BLOCK_KEYPAD;
- }
- if (!strcmp(child->name, "stmpe_touchscreen")) {
+ } else if (!strcmp(child->name, "stmpe_touchscreen")) {
pdata->blocks |= STMPE_BLOCK_TOUCHSCREEN;
- }
- if (!strcmp(child->name, "stmpe_adc")) {
+ } else if (!strcmp(child->name, "stmpe_adc")) {
pdata->blocks |= STMPE_BLOCK_ADC;
+ } else if (!strcmp(child->name, "stmpe_pwm")) {
+ pdata->blocks |= STMPE_BLOCK_PWM;
+ } else if (!strcmp(child->name, "stmpe_rotator")) {
+ pdata->blocks |= STMPE_BLOCK_ROTATOR;
}
}
}
@@ -1106,6 +1118,9 @@ int __devinit stmpe_probe(struct stmpe_client_info *ci, int partnum)
return -ENODEV;
}
stmpe->variant = stmpe_noirq_variant_info[stmpe->partnum];
+ } else if (pdata->irq_trigger == IRQF_TRIGGER_NONE) {
+ pdata->irq_trigger =
+ irqd_get_trigger_type(irq_get_irq_data(stmpe->irq));
}
ret = stmpe_chip_init(stmpe);
--
1.7.12.rc2.18.g61b472e
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH V6] mfd: stmpe: Update DT support for stmpe driver
2012-12-06 15:43 [PATCH V6] mfd: stmpe: Update DT support for stmpe driver Viresh Kumar
@ 2012-12-06 16:40 ` Lee Jones
2012-12-06 16:47 ` Viresh Kumar
2012-12-06 20:21 ` Linus Walleij
1 sibling, 1 reply; 4+ messages in thread
From: Lee Jones @ 2012-12-06 16:40 UTC (permalink / raw)
To: Viresh Kumar
Cc: sameo, devicetree-discuss, linux-kernel, spear-devel, Vipul Kumar Samar
On Thu, 06 Dec 2012, Viresh Kumar wrote:
> From: Vipul Kumar Samar <vipulkumar.samar@st.com>
>
> This patch extends existing DT support for stmpe devices. This updates:
> - missing header files in stmpe.c
> - stmpe_of_probe() with pwm, rotator and new bindings.
> - Bindings are updated in binding document.
>
> Acked-by: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Vipul Kumar Samar <vipulkumar.samar@st.com>
> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
> ---
> Hi Samuel,
>
> I have added acked by Lee as he earlier Acked this patch, most of the part is
> still the same. And nothing new added.
>
> V5->V6:
> - Removed of_devide_id tables from stmpe-i2c[spi].c
>
> Documentation/devicetree/bindings/mfd/stmpe.txt | 9 ++++++---
> drivers/mfd/stmpe.c | 27 +++++++++++++++++++------
> 2 files changed, 27 insertions(+), 9 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/mfd/stmpe.txt b/Documentation/devicetree/bindings/mfd/stmpe.txt
> index 8f0aeda..d2d88d9 100644
> --- a/Documentation/devicetree/bindings/mfd/stmpe.txt
> +++ b/Documentation/devicetree/bindings/mfd/stmpe.txt
> @@ -1,8 +1,11 @@
> -* STMPE Multi-Functional Device
> +* ST Microelectronics STMPE Multi-Functional Device
> +
> +STMPE is an MFD device which may expose following inbuilt devices: gpio, keypad,
^ the
> +touchscreen, adc, pwm, rotator.
>
> Required properties:
> - - compatible : "st,stmpe[811|1601|2401|2403]"
> - - reg : I2C address of the device
> + - compatible : "st,stmpe[610|801|811|1601|2401|2403]"
> + - reg : I2C/SPI address of the device
>
> Optional properties:
> - interrupts : The interrupt outputs from the controller
> diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
> index 34408b4..bb2dfdb 100644
> --- a/drivers/mfd/stmpe.c
> +++ b/drivers/mfd/stmpe.c
> @@ -7,12 +7,15 @@
> * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
> */
>
> +#include <linux/err.h>
> #include <linux/gpio.h>
> #include <linux/export.h>
> #include <linux/kernel.h>
> #include <linux/interrupt.h>
> #include <linux/irq.h>
> #include <linux/irqdomain.h>
> +#include <linux/of.h>
> +#include <linux/of_gpio.h>
> #include <linux/pm.h>
> #include <linux/slab.h>
> #include <linux/mfd/core.h>
> @@ -1019,6 +1022,14 @@ void __devinit stmpe_of_probe(struct stmpe_platform_data *pdata,
> {
> struct device_node *child;
>
> + /*
> + * Distinct names of same cell-type within multiple instances of stmpe
> + * will be guaranteed by DT.
> + */
I think the comment is unnecessary.
> + pdata->id = -1;
Perhaps PLATFORM_DEVID_AUTO would be better?
> + pdata->irq_trigger = IRQF_TRIGGER_NONE;
> +
There's no need for this. It's guaranteed to be zero by:
pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
> of_property_read_u32(np, "st,autosleep-timeout",
> &pdata->autosleep_timeout);
>
> @@ -1027,15 +1038,16 @@ void __devinit stmpe_of_probe(struct stmpe_platform_data *pdata,
> for_each_child_of_node(np, child) {
> if (!strcmp(child->name, "stmpe_gpio")) {
> pdata->blocks |= STMPE_BLOCK_GPIO;
> - }
> - if (!strcmp(child->name, "stmpe_keypad")) {
> + } else if (!strcmp(child->name, "stmpe_keypad")) {
> pdata->blocks |= STMPE_BLOCK_KEYPAD;
> - }
> - if (!strcmp(child->name, "stmpe_touchscreen")) {
> + } else if (!strcmp(child->name, "stmpe_touchscreen")) {
> pdata->blocks |= STMPE_BLOCK_TOUCHSCREEN;
> - }
> - if (!strcmp(child->name, "stmpe_adc")) {
> + } else if (!strcmp(child->name, "stmpe_adc")) {
> pdata->blocks |= STMPE_BLOCK_ADC;
> + } else if (!strcmp(child->name, "stmpe_pwm")) {
> + pdata->blocks |= STMPE_BLOCK_PWM;
> + } else if (!strcmp(child->name, "stmpe_rotator")) {
> + pdata->blocks |= STMPE_BLOCK_ROTATOR;
> }
> }
> }
> @@ -1106,6 +1118,9 @@ int __devinit stmpe_probe(struct stmpe_client_info *ci, int partnum)
> return -ENODEV;
> }
> stmpe->variant = stmpe_noirq_variant_info[stmpe->partnum];
> + } else if (pdata->irq_trigger == IRQF_TRIGGER_NONE) {
> + pdata->irq_trigger =
> + irqd_get_trigger_type(irq_get_irq_data(stmpe->irq));
> }
>
> ret = stmpe_chip_init(stmpe);
> --
> 1.7.12.rc2.18.g61b472e
>
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH V6] mfd: stmpe: Update DT support for stmpe driver
2012-12-06 16:40 ` Lee Jones
@ 2012-12-06 16:47 ` Viresh Kumar
0 siblings, 0 replies; 4+ messages in thread
From: Viresh Kumar @ 2012-12-06 16:47 UTC (permalink / raw)
To: Lee Jones
Cc: sameo, devicetree-discuss, linux-kernel, spear-devel, Vipul Kumar Samar
On 6 December 2012 22:10, Lee Jones <lee.jones@linaro.org> wrote:
> On Thu, 06 Dec 2012, Viresh Kumar wrote:
>> + pdata->id = -1;
>
> Perhaps PLATFORM_DEVID_AUTO would be better?
Why do we want to allocate device id's for it? Multiple devices
are already distinguished and so -1 would be better.
>> + pdata->irq_trigger = IRQF_TRIGGER_NONE;
>> +
>
> There's no need for this. It's guaranteed to be zero by:
>
> pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
I kept it so that in future others don't think that we missed handling
of irq_trigger for DT case.
--
viresh
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH V6] mfd: stmpe: Update DT support for stmpe driver
2012-12-06 15:43 [PATCH V6] mfd: stmpe: Update DT support for stmpe driver Viresh Kumar
2012-12-06 16:40 ` Lee Jones
@ 2012-12-06 20:21 ` Linus Walleij
1 sibling, 0 replies; 4+ messages in thread
From: Linus Walleij @ 2012-12-06 20:21 UTC (permalink / raw)
To: Viresh Kumar
Cc: sameo, lee.jones, devicetree-discuss, linux-kernel, spear-devel,
Vipul Kumar Samar
On Thu, Dec 6, 2012 at 4:43 PM, Viresh Kumar <viresh.kumar@linaro.org> wrote:
> From: Vipul Kumar Samar <vipulkumar.samar@st.com>
>
> This patch extends existing DT support for stmpe devices. This updates:
> - missing header files in stmpe.c
> - stmpe_of_probe() with pwm, rotator and new bindings.
> - Bindings are updated in binding document.
>
> Acked-by: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Vipul Kumar Samar <vipulkumar.samar@st.com>
> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-12-06 20:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-06 15:43 [PATCH V6] mfd: stmpe: Update DT support for stmpe driver Viresh Kumar
2012-12-06 16:40 ` Lee Jones
2012-12-06 16:47 ` Viresh Kumar
2012-12-06 20:21 ` Linus Walleij
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).