All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data
@ 2012-07-25 20:54 Daniel Mack
  2012-07-25 20:54 ` [PATCH 2/2] onewire: w1-gpio: add DT bindings Daniel Mack
                   ` (3 more replies)
  0 siblings, 4 replies; 11+ messages in thread
From: Daniel Mack @ 2012-07-25 20:54 UTC (permalink / raw)
  To: linux-kernel; +Cc: Daniel Mack, Evgeniy Polyakov, Ville Syrjala

In the process of porting boards to devicetree implemenation, we should
keep information about external circuitry where they belong - the
individual drivers.

This patch adds a way to specify a GPIO to drive the (optional) external
pull-up logic, rather than using a function pointer for that.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Cc: Ville Syrjala <syrjala@sci.fi>
---
 drivers/w1/masters/w1-gpio.c |   18 +++++++++++++++++-
 include/linux/w1-gpio.h      |    1 +
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
index df600d1..dac88ff 100644
--- a/drivers/w1/masters/w1-gpio.c
+++ b/drivers/w1/masters/w1-gpio.c
@@ -59,6 +59,13 @@ static int __init w1_gpio_probe(struct platform_device *pdev)
 	if (err)
 		goto free_master;
 
+	if (gpio_is_valid(pdata->ext_pullup_enable_pin)) {
+		err = gpio_request_one(pdata->ext_pullup_enable_pin,
+				       GPIOF_INIT_LOW, "w1 pullup");
+		if (err < 0)
+			goto free_gpio;
+	}
+
 	master->data = pdata;
 	master->read_bit = w1_gpio_read_bit;
 
@@ -72,15 +79,21 @@ static int __init w1_gpio_probe(struct platform_device *pdev)
 
 	err = w1_add_master_device(master);
 	if (err)
-		goto free_gpio;
+		goto free_gpio_ext_pu;
 
 	if (pdata->enable_external_pullup)
 		pdata->enable_external_pullup(1);
 
+	if (gpio_is_valid(pdata->ext_pullup_enable_pin))
+		gpio_set_value(pdata->ext_pullup_enable_pin, 1);
+
 	platform_set_drvdata(pdev, master);
 
 	return 0;
 
+ free_gpio_ext_pu:
+	if (gpio_is_valid(pdata->ext_pullup_enable_pin))
+		gpio_free(pdata->ext_pullup_enable_pin);
  free_gpio:
 	gpio_free(pdata->pin);
  free_master:
@@ -97,6 +110,9 @@ static int __exit w1_gpio_remove(struct platform_device *pdev)
 	if (pdata->enable_external_pullup)
 		pdata->enable_external_pullup(0);
 
+	if (gpio_is_valid(pdata->ext_pullup_enable_pin))
+		gpio_set_value(pdata->ext_pullup_enable_pin, 0);
+
 	w1_remove_master_device(master);
 	gpio_free(pdata->pin);
 	kfree(master);
diff --git a/include/linux/w1-gpio.h b/include/linux/w1-gpio.h
index 3adeff8..065e3ae 100644
--- a/include/linux/w1-gpio.h
+++ b/include/linux/w1-gpio.h
@@ -19,6 +19,7 @@ struct w1_gpio_platform_data {
 	unsigned int pin;
 	unsigned int is_open_drain:1;
 	void (*enable_external_pullup)(int enable);
+	unsigned int ext_pullup_enable_pin;
 };
 
 #endif /* _LINUX_W1_GPIO_H */
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 2/2] onewire: w1-gpio: add DT bindings
  2012-07-25 20:54 [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data Daniel Mack
@ 2012-07-25 20:54 ` Daniel Mack
  2012-07-30 17:26 ` [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data Daniel Mack
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 11+ messages in thread
From: Daniel Mack @ 2012-07-25 20:54 UTC (permalink / raw)
  To: linux-kernel; +Cc: Daniel Mack, Evgeniy Polyakov, Ville Syrjala

This patch add DT bindings to the w1-gpio driver, along with some
documentation on how to use them.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Cc: Ville Syrjala <syrjala@sci.fi>
---
 Documentation/devicetree/bindings/w1/w1-gpio.txt |   22 +++++++++++
 drivers/w1/masters/w1-gpio.c                     |   46 ++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/w1/w1-gpio.txt

diff --git a/Documentation/devicetree/bindings/w1/w1-gpio.txt b/Documentation/devicetree/bindings/w1/w1-gpio.txt
new file mode 100644
index 0000000..6e09c35
--- /dev/null
+++ b/Documentation/devicetree/bindings/w1/w1-gpio.txt
@@ -0,0 +1,22 @@
+w1-gpio devicetree bindings
+
+Required properties:
+
+ - compatible: "w1-gpio"
+ - gpios: one or two GPIO specs:
+		- the first one is used as data I/O pin
+		- the second one is optional. If specified, it is used as
+		  enable pin for an external pin pullup.
+
+Optional properties:
+
+ - linux,open-drain: if specified, the data pin is considered in
+		     open-drain mode.
+
+Examples:
+
+	onewire@0 {
+		compatible = "w1-gpio";
+		gpios = <&gpio 126 0>, <&gpio 105 0>;
+	};
+
diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
index dac88ff..c4644b4 100644
--- a/drivers/w1/masters/w1-gpio.c
+++ b/drivers/w1/masters/w1-gpio.c
@@ -14,6 +14,8 @@
 #include <linux/slab.h>
 #include <linux/w1-gpio.h>
 #include <linux/gpio.h>
+#include <linux/of_platform.h>
+#include <linux/of_gpio.h>
 
 #include "../w1.h"
 #include "../w1_int.h"
@@ -42,12 +44,55 @@ static u8 w1_gpio_read_bit(void *data)
 	return gpio_get_value(pdata->pin) ? 1 : 0;
 }
 
+#ifdef CONFIG_OF
+static struct of_device_id w1_gpio_dt_ids[] = {
+	{ .compatible = "w1-gpio" },
+	{}
+};
+MODULE_DEVICE_TABLE(of, w1_gpio_dt_ids);
+
+static int w1_gpio_probe_dt(struct platform_device *pdev)
+{
+	struct w1_gpio_platform_data *pdata = pdev->dev.platform_data;
+	struct device_node *np = pdev->dev.of_node;
+	const struct of_device_id *of_id =
+			of_match_device(w1_gpio_dt_ids, &pdev->dev);
+
+	if (!of_id)
+		return 0;
+
+	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+	if (!pdata)
+		return -ENOMEM;
+
+	if (of_get_property(np, "linux,open-drain", NULL))
+		pdata->is_open_drain = 1;
+
+	pdata->pin = of_get_gpio(np, 0);
+	pdata->ext_pullup_enable_pin = of_get_gpio(np, 1);
+	pdev->dev.platform_data = pdata;
+
+	return 0;
+}
+#else
+static int w1_gpio_probe_dt(struct platform_device *pdev)
+{
+	return 0;
+}
+#endif
+
 static int __init w1_gpio_probe(struct platform_device *pdev)
 {
 	struct w1_bus_master *master;
 	struct w1_gpio_platform_data *pdata = pdev->dev.platform_data;
 	int err;
 
+	err = w1_gpio_probe_dt(pdev);
+	if (err < 0)
+		return err;
+
+	pdata = pdev->dev.platform_data;
+
 	if (!pdata)
 		return -ENXIO;
 
@@ -151,6 +196,7 @@ static struct platform_driver w1_gpio_driver = {
 	.driver = {
 		.name	= "w1-gpio",
 		.owner	= THIS_MODULE,
+		.of_match_table = of_match_ptr(w1_gpio_dt_ids),
 	},
 	.remove	= __exit_p(w1_gpio_remove),
 	.suspend = w1_gpio_suspend,
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data
  2012-07-25 20:54 [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data Daniel Mack
  2012-07-25 20:54 ` [PATCH 2/2] onewire: w1-gpio: add DT bindings Daniel Mack
@ 2012-07-30 17:26 ` Daniel Mack
  2012-07-30 17:32 ` Evgeniy Polyakov
  2012-07-30 18:12 ` Evgeniy Polyakov
  3 siblings, 0 replies; 11+ messages in thread
From: Daniel Mack @ 2012-07-30 17:26 UTC (permalink / raw)
  To: Daniel Mack; +Cc: linux-kernel, Evgeniy Polyakov, Ville Syrjala

Ping.

On 25.07.2012 22:54, Daniel Mack wrote:
> In the process of porting boards to devicetree implemenation, we should
> keep information about external circuitry where they belong - the
> individual drivers.
> 
> This patch adds a way to specify a GPIO to drive the (optional) external
> pull-up logic, rather than using a function pointer for that.
> 
> Signed-off-by: Daniel Mack <zonque@gmail.com>
> Cc: Evgeniy Polyakov <zbr@ioremap.net>
> Cc: Ville Syrjala <syrjala@sci.fi>
> ---
>  drivers/w1/masters/w1-gpio.c |   18 +++++++++++++++++-
>  include/linux/w1-gpio.h      |    1 +
>  2 files changed, 18 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
> index df600d1..dac88ff 100644
> --- a/drivers/w1/masters/w1-gpio.c
> +++ b/drivers/w1/masters/w1-gpio.c
> @@ -59,6 +59,13 @@ static int __init w1_gpio_probe(struct platform_device *pdev)
>  	if (err)
>  		goto free_master;
>  
> +	if (gpio_is_valid(pdata->ext_pullup_enable_pin)) {
> +		err = gpio_request_one(pdata->ext_pullup_enable_pin,
> +				       GPIOF_INIT_LOW, "w1 pullup");
> +		if (err < 0)
> +			goto free_gpio;
> +	}
> +
>  	master->data = pdata;
>  	master->read_bit = w1_gpio_read_bit;
>  
> @@ -72,15 +79,21 @@ static int __init w1_gpio_probe(struct platform_device *pdev)
>  
>  	err = w1_add_master_device(master);
>  	if (err)
> -		goto free_gpio;
> +		goto free_gpio_ext_pu;
>  
>  	if (pdata->enable_external_pullup)
>  		pdata->enable_external_pullup(1);
>  
> +	if (gpio_is_valid(pdata->ext_pullup_enable_pin))
> +		gpio_set_value(pdata->ext_pullup_enable_pin, 1);
> +
>  	platform_set_drvdata(pdev, master);
>  
>  	return 0;
>  
> + free_gpio_ext_pu:
> +	if (gpio_is_valid(pdata->ext_pullup_enable_pin))
> +		gpio_free(pdata->ext_pullup_enable_pin);
>   free_gpio:
>  	gpio_free(pdata->pin);
>   free_master:
> @@ -97,6 +110,9 @@ static int __exit w1_gpio_remove(struct platform_device *pdev)
>  	if (pdata->enable_external_pullup)
>  		pdata->enable_external_pullup(0);
>  
> +	if (gpio_is_valid(pdata->ext_pullup_enable_pin))
> +		gpio_set_value(pdata->ext_pullup_enable_pin, 0);
> +
>  	w1_remove_master_device(master);
>  	gpio_free(pdata->pin);
>  	kfree(master);
> diff --git a/include/linux/w1-gpio.h b/include/linux/w1-gpio.h
> index 3adeff8..065e3ae 100644
> --- a/include/linux/w1-gpio.h
> +++ b/include/linux/w1-gpio.h
> @@ -19,6 +19,7 @@ struct w1_gpio_platform_data {
>  	unsigned int pin;
>  	unsigned int is_open_drain:1;
>  	void (*enable_external_pullup)(int enable);
> +	unsigned int ext_pullup_enable_pin;
>  };
>  
>  #endif /* _LINUX_W1_GPIO_H */
> 


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data
  2012-07-25 20:54 [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data Daniel Mack
  2012-07-25 20:54 ` [PATCH 2/2] onewire: w1-gpio: add DT bindings Daniel Mack
  2012-07-30 17:26 ` [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data Daniel Mack
@ 2012-07-30 17:32 ` Evgeniy Polyakov
  2012-07-30 17:35   ` Daniel Mack
  2012-07-30 18:12 ` Evgeniy Polyakov
  3 siblings, 1 reply; 11+ messages in thread
From: Evgeniy Polyakov @ 2012-07-30 17:32 UTC (permalink / raw)
  To: Daniel Mack; +Cc: linux-kernel, Ville Syrjala, GregKH

Hi

Sorry for long delay

On Wed, Jul 25, 2012 at 10:54:29PM +0200, Daniel Mack (zonque@gmail.com) wrote:
> In the process of porting boards to devicetree implemenation, we should
> keep information about external circuitry where they belong - the
> individual drivers.
> 
> This patch adds a way to specify a GPIO to drive the (optional) external
> pull-up logic, rather than using a function pointer for that.

I do not object against this patch, but I have rather limited knowledge
about gpio driver. Patch looks good, feel free to add my
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>

Greg, please pull it into your tree, if Ville does not object.
Thank you.

-- 
	Evgeniy Polyakov

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data
  2012-07-30 17:32 ` Evgeniy Polyakov
@ 2012-07-30 17:35   ` Daniel Mack
  0 siblings, 0 replies; 11+ messages in thread
From: Daniel Mack @ 2012-07-30 17:35 UTC (permalink / raw)
  To: Evgeniy Polyakov; +Cc: linux-kernel, Ville Syrjala, GregKH

On 30.07.2012 19:32, Evgeniy Polyakov wrote:
> Hi
> 
> Sorry for long delay
> 
> On Wed, Jul 25, 2012 at 10:54:29PM +0200, Daniel Mack (zonque@gmail.com) wrote:
>> In the process of porting boards to devicetree implemenation, we should
>> keep information about external circuitry where they belong - the
>> individual drivers.
>>
>> This patch adds a way to specify a GPIO to drive the (optional) external
>> pull-up logic, rather than using a function pointer for that.
> 
> I do not object against this patch, but I have rather limited knowledge
> about gpio driver.

The first patch just offers a new way to drive an optional external
pull-up and as nobody uses that feature currently, there can't be any
breakage.

And the second patch doesn't change any functional behaviour of the
driver, it simply offers a new way to instanciate it.

> Patch looks good, feel free to add my
> Acked-by: Evgeniy Polyakov <zbr@ioremap.net>

Thanks!

> 
> Greg, please pull it into your tree, if Ville does not object.
> Thank you.
> 


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data
  2012-07-25 20:54 [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data Daniel Mack
                   ` (2 preceding siblings ...)
  2012-07-30 17:32 ` Evgeniy Polyakov
@ 2012-07-30 18:12 ` Evgeniy Polyakov
  2012-07-31  0:59   ` Ville Syrjälä
  3 siblings, 1 reply; 11+ messages in thread
From: Evgeniy Polyakov @ 2012-07-30 18:12 UTC (permalink / raw)
  To: Daniel Mack; +Cc: linux-kernel, Ville Syrjala, GregKH

Hi

Sorry for long delay
[resend with fixed Greg's address :)]

On Wed, Jul 25, 2012 at 10:54:29PM +0200, Daniel Mack (zonque@gmail.com) wrote:
> In the process of porting boards to devicetree implemenation, we should
> keep information about external circuitry where they belong - the
> individual drivers.
> 
> This patch adds a way to specify a GPIO to drive the (optional) external
> pull-up logic, rather than using a function pointer for that.

I do not object against this patch, but I have rather limited knowledge
about gpio driver. Patch looks good, feel free to add my
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>

Greg, please pull it into your tree, if Ville does not object.
Thank you.

-- 
	Evgeniy Polyakov

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data
  2012-07-30 18:12 ` Evgeniy Polyakov
@ 2012-07-31  0:59   ` Ville Syrjälä
  2012-07-31  6:19     ` Daniel Mack
  0 siblings, 1 reply; 11+ messages in thread
From: Ville Syrjälä @ 2012-07-31  0:59 UTC (permalink / raw)
  To: Evgeniy Polyakov; +Cc: Daniel Mack, linux-kernel, GregKH

On Mon, Jul 30, 2012 at 10:12:39PM +0400, Evgeniy Polyakov wrote:
> Hi
> 
> Sorry for long delay
> [resend with fixed Greg's address :)]
> 
> On Wed, Jul 25, 2012 at 10:54:29PM +0200, Daniel Mack (zonque@gmail.com) wrote:
> > In the process of porting boards to devicetree implemenation, we should
> > keep information about external circuitry where they belong - the
> > individual drivers.
> > 
> > This patch adds a way to specify a GPIO to drive the (optional) external
> > pull-up logic, rather than using a function pointer for that.
> 
> I do not object against this patch, but I have rather limited knowledge
> about gpio driver. Patch looks good, feel free to add my
> Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
> 
> Greg, please pull it into your tree, if Ville does not object.

No objections from me.

The only cosmetic issue I spotted was 'pdata' being assigned twice in
w1_gpio_probe().

-- 
Ville Syrjälä
syrjala@sci.fi
http://www.sci.fi/~syrjala/

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data
  2012-07-31  0:59   ` Ville Syrjälä
@ 2012-07-31  6:19     ` Daniel Mack
  2012-08-01 16:57       ` Ville Syrjälä
  0 siblings, 1 reply; 11+ messages in thread
From: Daniel Mack @ 2012-07-31  6:19 UTC (permalink / raw)
  To: Ville Syrjälä, Evgeniy Polyakov, linux-kernel, GregKH

[-- Attachment #1: Type: text/plain, Size: 1047 bytes --]

On 31.07.2012 02:59, Ville Syrjälä wrote:
> On Mon, Jul 30, 2012 at 10:12:39PM +0400, Evgeniy Polyakov wrote:
>> Hi
>>
>> Sorry for long delay
>> [resend with fixed Greg's address :)]
>>
>> On Wed, Jul 25, 2012 at 10:54:29PM +0200, Daniel Mack (zonque@gmail.com) wrote:
>>> In the process of porting boards to devicetree implemenation, we should
>>> keep information about external circuitry where they belong - the
>>> individual drivers.
>>>
>>> This patch adds a way to specify a GPIO to drive the (optional) external
>>> pull-up logic, rather than using a function pointer for that.
>>
>> I do not object against this patch, but I have rather limited knowledge
>> about gpio driver. Patch looks good, feel free to add my
>> Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
>>
>> Greg, please pull it into your tree, if Ville does not object.
> 
> No objections from me.

I take this as an Acked-by:?

> The only cosmetic issue I spotted was 'pdata' being assigned twice in
> w1_gpio_probe().

Right. Amended patch below.


Thanks a lot,
Daniel




[-- Attachment #2: 0001-onewire-w1-gpio-add-DT-bindings.patch --]
[-- Type: text/x-patch, Size: 3393 bytes --]

>From 37385d15bbd9dbc637f1e46d962c90be5eeb1409 Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Mon, 23 Jul 2012 16:36:35 +0200
Subject: [PATCH v2] onewire: w1-gpio: add DT bindings

This patch add DT bindings to the w1-gpio driver, along with some
documentation on how to use them.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Acked-by: Ville Syrjala <syrjala@sci.fi>
---
 Documentation/devicetree/bindings/w1/w1-gpio.txt | 22 +++++++++++
 drivers/w1/masters/w1-gpio.c                     | 48 +++++++++++++++++++++++-
 2 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/w1/w1-gpio.txt

diff --git a/Documentation/devicetree/bindings/w1/w1-gpio.txt b/Documentation/devicetree/bindings/w1/w1-gpio.txt
new file mode 100644
index 0000000..6e09c35
--- /dev/null
+++ b/Documentation/devicetree/bindings/w1/w1-gpio.txt
@@ -0,0 +1,22 @@
+w1-gpio devicetree bindings
+
+Required properties:
+
+ - compatible: "w1-gpio"
+ - gpios: one or two GPIO specs:
+		- the first one is used as data I/O pin
+		- the second one is optional. If specified, it is used as
+		  enable pin for an external pin pullup.
+
+Optional properties:
+
+ - linux,open-drain: if specified, the data pin is considered in
+		     open-drain mode.
+
+Examples:
+
+	onewire@0 {
+		compatible = "w1-gpio";
+		gpios = <&gpio 126 0>, <&gpio 105 0>;
+	};
+
diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
index dac88ff..6012c4e 100644
--- a/drivers/w1/masters/w1-gpio.c
+++ b/drivers/w1/masters/w1-gpio.c
@@ -14,6 +14,8 @@
 #include <linux/slab.h>
 #include <linux/w1-gpio.h>
 #include <linux/gpio.h>
+#include <linux/of_platform.h>
+#include <linux/of_gpio.h>
 
 #include "../w1.h"
 #include "../w1_int.h"
@@ -42,12 +44,55 @@ static u8 w1_gpio_read_bit(void *data)
 	return gpio_get_value(pdata->pin) ? 1 : 0;
 }
 
+#ifdef CONFIG_OF
+static struct of_device_id w1_gpio_dt_ids[] = {
+	{ .compatible = "w1-gpio" },
+	{}
+};
+MODULE_DEVICE_TABLE(of, w1_gpio_dt_ids);
+
+static int w1_gpio_probe_dt(struct platform_device *pdev)
+{
+	struct w1_gpio_platform_data *pdata = pdev->dev.platform_data;
+	struct device_node *np = pdev->dev.of_node;
+	const struct of_device_id *of_id =
+			of_match_device(w1_gpio_dt_ids, &pdev->dev);
+
+	if (!of_id)
+		return 0;
+
+	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+	if (!pdata)
+		return -ENOMEM;
+
+	if (of_get_property(np, "linux,open-drain", NULL))
+		pdata->is_open_drain = 1;
+
+	pdata->pin = of_get_gpio(np, 0);
+	pdata->ext_pullup_enable_pin = of_get_gpio(np, 1);
+	pdev->dev.platform_data = pdata;
+
+	return 0;
+}
+#else
+static int w1_gpio_probe_dt(struct platform_device *pdev)
+{
+	return 0;
+}
+#endif
+
 static int __init w1_gpio_probe(struct platform_device *pdev)
 {
 	struct w1_bus_master *master;
-	struct w1_gpio_platform_data *pdata = pdev->dev.platform_data;
+	struct w1_gpio_platform_data *pdata;
 	int err;
 
+	err = w1_gpio_probe_dt(pdev);
+	if (err < 0)
+		return err;
+
+	pdata = pdev->dev.platform_data;
+
 	if (!pdata)
 		return -ENXIO;
 
@@ -151,6 +196,7 @@ static struct platform_driver w1_gpio_driver = {
 	.driver = {
 		.name	= "w1-gpio",
 		.owner	= THIS_MODULE,
+		.of_match_table = of_match_ptr(w1_gpio_dt_ids),
 	},
 	.remove	= __exit_p(w1_gpio_remove),
 	.suspend = w1_gpio_suspend,
-- 
1.7.11.2


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data
  2012-07-31  6:19     ` Daniel Mack
@ 2012-08-01 16:57       ` Ville Syrjälä
  2012-08-05 16:18         ` Daniel Mack
  0 siblings, 1 reply; 11+ messages in thread
From: Ville Syrjälä @ 2012-08-01 16:57 UTC (permalink / raw)
  To: Daniel Mack; +Cc: Evgeniy Polyakov, linux-kernel, GregKH

On Tue, Jul 31, 2012 at 08:19:06AM +0200, Daniel Mack wrote:
> On 31.07.2012 02:59, Ville Syrjälä wrote:
> > On Mon, Jul 30, 2012 at 10:12:39PM +0400, Evgeniy Polyakov wrote:
> >> Hi
> >>
> >> Sorry for long delay
> >> [resend with fixed Greg's address :)]
> >>
> >> On Wed, Jul 25, 2012 at 10:54:29PM +0200, Daniel Mack (zonque@gmail.com) wrote:
> >>> In the process of porting boards to devicetree implemenation, we should
> >>> keep information about external circuitry where they belong - the
> >>> individual drivers.
> >>>
> >>> This patch adds a way to specify a GPIO to drive the (optional) external
> >>> pull-up logic, rather than using a function pointer for that.
> >>
> >> I do not object against this patch, but I have rather limited knowledge
> >> about gpio driver. Patch looks good, feel free to add my
> >> Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
> >>
> >> Greg, please pull it into your tree, if Ville does not object.
> > 
> > No objections from me.
> 
> I take this as an Acked-by:?

Sure, why not :)

Acked-by: Ville Syrjälä <syrjala@sci.fi>

-- 
Ville Syrjälä
syrjala@sci.fi
http://www.sci.fi/~syrjala/

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data
  2012-08-01 16:57       ` Ville Syrjälä
@ 2012-08-05 16:18         ` Daniel Mack
  2012-08-16 16:57           ` GregKH
  0 siblings, 1 reply; 11+ messages in thread
From: Daniel Mack @ 2012-08-05 16:18 UTC (permalink / raw)
  To: Ville Syrjälä, Evgeniy Polyakov, linux-kernel, GregKH

On 01.08.2012 18:57, Ville Syrjälä wrote:
> On Tue, Jul 31, 2012 at 08:19:06AM +0200, Daniel Mack wrote:
>> On 31.07.2012 02:59, Ville Syrjälä wrote:
>>> On Mon, Jul 30, 2012 at 10:12:39PM +0400, Evgeniy Polyakov wrote:
>>>> Hi
>>>>
>>>> Sorry for long delay
>>>> [resend with fixed Greg's address :)]
>>>>
>>>> On Wed, Jul 25, 2012 at 10:54:29PM +0200, Daniel Mack (zonque@gmail.com) wrote:
>>>>> In the process of porting boards to devicetree implemenation, we should
>>>>> keep information about external circuitry where they belong - the
>>>>> individual drivers.
>>>>>
>>>>> This patch adds a way to specify a GPIO to drive the (optional) external
>>>>> pull-up logic, rather than using a function pointer for that.
>>>>
>>>> I do not object against this patch, but I have rather limited knowledge
>>>> about gpio driver. Patch looks good, feel free to add my
>>>> Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
>>>>
>>>> Greg, please pull it into your tree, if Ville does not object.
>>>
>>> No objections from me.
>>
>> I take this as an Acked-by:?
> 
> Sure, why not :)
> 
> Acked-by: Ville Syrjälä <syrjala@sci.fi>
> 

Greg, could you queue up these two patches somewhere?


Thanks,
Daniel

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data
  2012-08-05 16:18         ` Daniel Mack
@ 2012-08-16 16:57           ` GregKH
  0 siblings, 0 replies; 11+ messages in thread
From: GregKH @ 2012-08-16 16:57 UTC (permalink / raw)
  To: Daniel Mack; +Cc: Ville Syrjälä, Evgeniy Polyakov, linux-kernel

On Sun, Aug 05, 2012 at 06:18:01PM +0200, Daniel Mack wrote:
> On 01.08.2012 18:57, Ville Syrjälä wrote:
> > On Tue, Jul 31, 2012 at 08:19:06AM +0200, Daniel Mack wrote:
> >> On 31.07.2012 02:59, Ville Syrjälä wrote:
> >>> On Mon, Jul 30, 2012 at 10:12:39PM +0400, Evgeniy Polyakov wrote:
> >>>> Hi
> >>>>
> >>>> Sorry for long delay
> >>>> [resend with fixed Greg's address :)]
> >>>>
> >>>> On Wed, Jul 25, 2012 at 10:54:29PM +0200, Daniel Mack (zonque@gmail.com) wrote:
> >>>>> In the process of porting boards to devicetree implemenation, we should
> >>>>> keep information about external circuitry where they belong - the
> >>>>> individual drivers.
> >>>>>
> >>>>> This patch adds a way to specify a GPIO to drive the (optional) external
> >>>>> pull-up logic, rather than using a function pointer for that.
> >>>>
> >>>> I do not object against this patch, but I have rather limited knowledge
> >>>> about gpio driver. Patch looks good, feel free to add my
> >>>> Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
> >>>>
> >>>> Greg, please pull it into your tree, if Ville does not object.
> >>>
> >>> No objections from me.
> >>
> >> I take this as an Acked-by:?
> > 
> > Sure, why not :)
> > 
> > Acked-by: Ville Syrjälä <syrjala@sci.fi>
> > 
> 
> Greg, could you queue up these two patches somewhere?

Yes, I now have them, thanks.

greg k-h

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2012-08-16 16:57 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-25 20:54 [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data Daniel Mack
2012-07-25 20:54 ` [PATCH 2/2] onewire: w1-gpio: add DT bindings Daniel Mack
2012-07-30 17:26 ` [PATCH 1/2] onewire: w1-gpio: add ext_pullup_enable pin in platform data Daniel Mack
2012-07-30 17:32 ` Evgeniy Polyakov
2012-07-30 17:35   ` Daniel Mack
2012-07-30 18:12 ` Evgeniy Polyakov
2012-07-31  0:59   ` Ville Syrjälä
2012-07-31  6:19     ` Daniel Mack
2012-08-01 16:57       ` Ville Syrjälä
2012-08-05 16:18         ` Daniel Mack
2012-08-16 16:57           ` GregKH

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.