[PATCH] i2c-ocores: register devices on child nodes

[PATCH] i2c-ocores: register devices on child nodes

[Thomas Chou]

This patch registers devices on the devicetree child nodes to the bus.
Also removes one trailing whitespace.

Signed-off-by: Thomas Chou <thomas-SDxUXYEhEBiCuPEqFHbRBg@public.gmane.org>
---
 drivers/i2c/busses/i2c-ocores.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index ef3bcb1..c63838f 100644
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -18,7 +18,7 @@
  * - interrupts      : interrupt number
  * - regstep         : size of device registers in bytes
  * - clock-frequency : frequency of bus clock in Hz
- * 
+ *
  * Example:
  *
  *  i2c0: ocores@a0000000 {
@@ -55,6 +55,7 @@
 #include <linux/i2c-ocores.h>
 #include <linux/slab.h>
 #include <linux/io.h>
+#include <linux/of_i2c.h>
 
 struct ocores_i2c {
 	void __iomem *base;
@@ -347,6 +348,9 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
 			i2c_new_device(&i2c->adap, pdata->devices + i);
 	}
 
+	/* Now register all the child nodes */
+	of_i2c_register_devices(&i2c->adap);
+
 	return 0;
 }
 
-- 
1.7.4

Re: [PATCH] i2c-ocores: register devices on child nodes

[Grant Likely]

On Thu, Feb 10, 2011 at 10:51:54AM +0800, Thomas Chou wrote:
> This patch registers devices on the devicetree child nodes to the bus.
> Also removes one trailing whitespace.
> 
> Signed-off-by: Thomas Chou <thomas-SDxUXYEhEBiCuPEqFHbRBg@public.gmane.org>

Acked-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>

Ben, do you want to pick this one up?  Or should I merge it via my
devicetree branch?

g.

> ---
>  drivers/i2c/busses/i2c-ocores.c |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
> index ef3bcb1..c63838f 100644
> --- a/drivers/i2c/busses/i2c-ocores.c
> +++ b/drivers/i2c/busses/i2c-ocores.c
> @@ -18,7 +18,7 @@
>   * - interrupts      : interrupt number
>   * - regstep         : size of device registers in bytes
>   * - clock-frequency : frequency of bus clock in Hz
> - * 
> + *
>   * Example:
>   *
>   *  i2c0: ocores@a0000000 {
> @@ -55,6 +55,7 @@
>  #include <linux/i2c-ocores.h>
>  #include <linux/slab.h>
>  #include <linux/io.h>
> +#include <linux/of_i2c.h>
>  
>  struct ocores_i2c {
>  	void __iomem *base;
> @@ -347,6 +348,9 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
>  			i2c_new_device(&i2c->adap, pdata->devices + i);
>  	}
>  
> +	/* Now register all the child nodes */
> +	of_i2c_register_devices(&i2c->adap);
> +
>  	return 0;
>  }
>  
> -- 
> 1.7.4
> 

Re: [PATCH] i2c-ocores: register devices on child nodes

[Ben Dooks]

On Tue, Feb 15, 2011 at 09:35:40PM -0700, Grant Likely wrote:
> On Thu, Feb 10, 2011 at 10:51:54AM +0800, Thomas Chou wrote:
> > This patch registers devices on the devicetree child nodes to the bus.
> > Also removes one trailing whitespace.
> > 
> > Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> 
> Acked-by: Grant Likely <grant.likely@secretlab.ca>
> 
> Ben, do you want to pick this one up?  Or should I merge it via my
> devicetree branch?

If it applies to the mainline kernel, then I'll take it. 

-- 
Ben Dooks, ben@fluff.org, http://www.fluff.org/ben/

Large Hadron Colada: A large Pina Colada that makes the universe disappear.

Re: [PATCH] i2c-ocores: register devices on child nodes

[Grant Likely]

On Sun, Feb 20, 2011 at 4:28 PM, Ben Dooks <ben-i2c-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org> wrote:
> On Tue, Feb 15, 2011 at 09:35:40PM -0700, Grant Likely wrote:
>> On Thu, Feb 10, 2011 at 10:51:54AM +0800, Thomas Chou wrote:
>> > This patch registers devices on the devicetree child nodes to the bus.
>> > Also removes one trailing whitespace.
>> >
>> > Signed-off-by: Thomas Chou <thomas-SDxUXYEhEBiCuPEqFHbRBg@public.gmane.org>
>>
>> Acked-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
>>
>> Ben, do you want to pick this one up?  Or should I merge it via my
>> devicetree branch?
>
> If it applies to the mainline kernel, then I'll take it.

It should apply to mainline no problem.

g.

>
> --
> Ben Dooks, ben-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org, http://www.fluff.org/ben/
>
> Large Hadron Colada: A large Pina Colada that makes the universe disappear.
>
>



-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

Re: [PATCH] i2c-ocores: register devices on child nodes

[Ben Dooks]

On Thu, Feb 10, 2011 at 10:51:54AM +0800, Thomas Chou wrote:
> This patch registers devices on the devicetree child nodes to the bus.
> Also removes one trailing whitespace.

Is this required as an urgent fix, or can it queue for next merge window?
 
> Signed-off-by: Thomas Chou <thomas-SDxUXYEhEBiCuPEqFHbRBg@public.gmane.org>
> ---
>  drivers/i2c/busses/i2c-ocores.c |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
> index ef3bcb1..c63838f 100644
> --- a/drivers/i2c/busses/i2c-ocores.c
> +++ b/drivers/i2c/busses/i2c-ocores.c
> @@ -18,7 +18,7 @@
>   * - interrupts      : interrupt number
>   * - regstep         : size of device registers in bytes
>   * - clock-frequency : frequency of bus clock in Hz
> - * 
> + *
>   * Example:
>   *
>   *  i2c0: ocores@a0000000 {
> @@ -55,6 +55,7 @@
>  #include <linux/i2c-ocores.h>
>  #include <linux/slab.h>
>  #include <linux/io.h>
> +#include <linux/of_i2c.h>
>  
>  struct ocores_i2c {
>  	void __iomem *base;
> @@ -347,6 +348,9 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
>  			i2c_new_device(&i2c->adap, pdata->devices + i);
>  	}
>  
> +	/* Now register all the child nodes */
> +	of_i2c_register_devices(&i2c->adap);
> +
>  	return 0;
>  }
>  
> -- 
> 1.7.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Ben Dooks, ben-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org, http://www.fluff.org/ben/

Large Hadron Colada: A large Pina Colada that makes the universe disappear.

Re: [PATCH] i2c-ocores: register devices on child nodes

[Thomas Chou]

On 02/23/2011 08:12 AM, Ben Dooks wrote:
> On Thu, Feb 10, 2011 at 10:51:54AM +0800, Thomas Chou wrote:
>> This patch registers devices on the devicetree child nodes to the bus.
>> Also removes one trailing whitespace.
>
> Is this required as an urgent fix, or can it queue for next merge window?

It is not urgent. An it is fine to queue it for next merge window.

- Thomas

>
>> Signed-off-by: Thomas Chou<thomas-SDxUXYEhEBiCuPEqFHbRBg@public.gmane.org>
>> ---
>>   drivers/i2c/busses/i2c-ocores.c |    6 +++++-
>>   1 files changed, 5 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
>> index ef3bcb1..c63838f 100644
>> --- a/drivers/i2c/busses/i2c-ocores.c
>> +++ b/drivers/i2c/busses/i2c-ocores.c
>> @@ -18,7 +18,7 @@
>>    * - interrupts      : interrupt number
>>    * - regstep         : size of device registers in bytes
>>    * - clock-frequency : frequency of bus clock in Hz
>> - *
>> + *
>>    * Example:
>>    *
>>    *  i2c0: ocores@a0000000 {
>> @@ -55,6 +55,7 @@
>>   #include<linux/i2c-ocores.h>
>>   #include<linux/slab.h>
>>   #include<linux/io.h>
>> +#include<linux/of_i2c.h>
>>
>>   struct ocores_i2c {
>>   	void __iomem *base;
>> @@ -347,6 +348,9 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
>>   			i2c_new_device(&i2c->adap, pdata->devices + i);
>>   	}
>>
>> +	/* Now register all the child nodes */
>> +	of_i2c_register_devices(&i2c->adap);
>> +
>>   	return 0;
>>   }
>>
>> --
>> 1.7.4
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
>> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Re: [PATCH] i2c-ocores: register devices on child nodes

[Grant Likely]

On Tue, Feb 22, 2011 at 5:31 PM, Thomas Chou <thomas-SDxUXYEhEBiCuPEqFHbRBg@public.gmane.org> wrote:
> On 02/23/2011 08:12 AM, Ben Dooks wrote:
>>
>> On Thu, Feb 10, 2011 at 10:51:54AM +0800, Thomas Chou wrote:
>>>
>>> This patch registers devices on the devicetree child nodes to the bus.
>>> Also removes one trailing whitespace.
>>
>> Is this required as an urgent fix, or can it queue for next merge window?
>
> It is not urgent. An it is fine to queue it for next merge window.

Yes, queue for .39

g.

>
> - Thomas
>
>>
>>> Signed-off-by: Thomas Chou<thomas-SDxUXYEhEBiCuPEqFHbRBg@public.gmane.org>
>>> ---
>>>  drivers/i2c/busses/i2c-ocores.c |    6 +++++-
>>>  1 files changed, 5 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/drivers/i2c/busses/i2c-ocores.c
>>> b/drivers/i2c/busses/i2c-ocores.c
>>> index ef3bcb1..c63838f 100644
>>> --- a/drivers/i2c/busses/i2c-ocores.c
>>> +++ b/drivers/i2c/busses/i2c-ocores.c
>>> @@ -18,7 +18,7 @@
>>>   * - interrupts      : interrupt number
>>>   * - regstep         : size of device registers in bytes
>>>   * - clock-frequency : frequency of bus clock in Hz
>>> - *
>>> + *
>>>   * Example:
>>>   *
>>>   *  i2c0: ocores@a0000000 {
>>> @@ -55,6 +55,7 @@
>>>  #include<linux/i2c-ocores.h>
>>>  #include<linux/slab.h>
>>>  #include<linux/io.h>
>>> +#include<linux/of_i2c.h>
>>>
>>>  struct ocores_i2c {
>>>        void __iomem *base;
>>> @@ -347,6 +348,9 @@ static int __devinit ocores_i2c_probe(struct
>>> platform_device *pdev)
>>>                        i2c_new_device(&i2c->adap, pdata->devices + i);
>>>        }
>>>
>>> +       /* Now register all the child nodes */
>>> +       of_i2c_register_devices(&i2c->adap);
>>> +
>>>        return 0;
>>>  }
>>>
>>> --
>>> 1.7.4
>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
>>> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>
>
>



-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.