[PATCH 2/2] ARM: lager: add i2c1, i2c2 pins

[PATCH 2/2] ARM: lager: add i2c1, i2c2 pins

[Ben Dooks]

Add pinctrl definitions for i2c1 and i2c2 busses on the Lager board
to ensure these are setup correctly at initialisation time. The i2c0
and i2c3 busses are connected to single function pins.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
---
 arch/arm/boot/dts/r8a7790-lager.dts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 890e39d..300ab20 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -80,6 +80,16 @@
 		renesas,groups = "mmc1_data8", "mmc1_ctrl";
 		renesas,function = "mmc1";
 	};
+
+	i2c1_pins: i2c1 {
+		renesas,groups = "i2c1";
+		renesas,function = "i2c1";
+	};
+
+	i2c2_pins: i2c2 {
+		renesas,groups = "i2c2";
+		renesas,function = "i2c2";
+	};
 };
 
 &mmcif1 {
@@ -102,10 +112,14 @@
 
 &i2c1	{
 	status = "ok";
+	pinctrl-0 = <&i2c1_pins>;
+	pinctrl-names = "default";
 };
 
 &i2c2	{
 	status = "ok";
+	pinctrl-0 = <&i2c2_pins>;
+	pinctrl-names = "default";
 };
 
 &i2c3	{
-- 
1.8.5.3

Re: [PATCH 2/2] ARM: lager: add i2c1, i2c2 pins

[Kuninori Morimoto]

Hi Ben

> Add pinctrl definitions for i2c1 and i2c2 busses on the Lager board
> to ensure these are setup correctly at initialisation time. The i2c0
> and i2c3 busses are connected to single function pins.
> 
> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
> ---

Thank you for your patches,
but, just "i2c support" patch (= [1/2] + [2/2]) is understandable / readable :)

And, about Subject

- ARM: lager: xxx
+ ARM: shmobile: lager: xxx

Best regards
---
Kuninori Morimoto

Re: [PATCH 2/2] ARM: lager: add i2c1, i2c2 pins

[Simon Horman]

On Wed, Feb 12, 2014 at 05:04:34PM +0000, Ben Dooks wrote:
> Add pinctrl definitions for i2c1 and i2c2 busses on the Lager board
> to ensure these are setup correctly at initialisation time. The i2c0
> and i2c3 busses are connected to single function pins.
> 
> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
> ---
>  arch/arm/boot/dts/r8a7790-lager.dts | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)

I have queued up the following.

There was some fuzz when applying this patch, please check that the
following is correct.

From: Ben Dooks <ben.dooks@codethink.co.uk>

[PATCH] ARM: shmobile: lager: add i2c1, i2c2 pins

Add pinctrl definitions for i2c1 and i2c2 busses on the Lager board
to ensure these are setup correctly at initialisation time. The i2c0
and i2c3 busses are connected to single function pins.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
[horms+renesas@verge.net.au: Added shmobile to patch title]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7790-lager.dts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index ee80788..e33ed0d 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -139,6 +139,16 @@
 		states = <3300000 1
 			  1800000 0>;
 	};
+
+	i2c1_pins: i2c1 {
+		renesas,groups = "i2c1";
+		renesas,function = "i2c1";
+	};
+
+	i2c2_pins: i2c2 {
+		renesas,groups = "i2c2";
+		renesas,function = "i2c2";
+	};
 };
 
 &extal_clk {
@@ -331,10 +341,14 @@
 
 &i2c1	{
 	status = "ok";
+	pinctrl-0 = <&i2c1_pins>;
+	pinctrl-names = "default";
 };
 
 &i2c2	{
 	status = "ok";
+	pinctrl-0 = <&i2c2_pins>;
+	pinctrl-names = "default";
 };
 
 &i2c3	{
-- 
2.0.0.rc2

Re: [PATCH 2/2] ARM: lager: add i2c1, i2c2 pins

[Sergei Shtylyov]

Hello.

On 06/05/2014 04:32 AM, Simon Horman wrote:

>> Add pinctrl definitions for i2c1 and i2c2 busses on the Lager board
>> to ensure these are setup correctly at initialisation time. The i2c0
>> and i2c3 busses are connected to single function pins.

>> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
>> ---
>>   arch/arm/boot/dts/r8a7790-lager.dts | 14 ++++++++++++++
>>   1 file changed, 14 insertions(+)

> I have queued up the following.

> There was some fuzz when applying this patch, please check that the
> following is correct.

> From: Ben Dooks <ben.dooks@codethink.co.uk>

> [PATCH] ARM: shmobile: lager: add i2c1, i2c2 pins

> Add pinctrl definitions for i2c1 and i2c2 busses on the Lager board
> to ensure these are setup correctly at initialisation time. The i2c0
> and i2c3 busses are connected to single function pins.

> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
> [horms+renesas@verge.net.au: Added shmobile to patch title]
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>   arch/arm/boot/dts/r8a7790-lager.dts | 14 ++++++++++++++
>   1 file changed, 14 insertions(+)

> diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
> index ee80788..e33ed0d 100644
> --- a/arch/arm/boot/dts/r8a7790-lager.dts
> +++ b/arch/arm/boot/dts/r8a7790-lager.dts
> @@ -139,6 +139,16 @@
>   		states = <3300000 1
>   			  1800000 0>;
>   	};
> +
> +	i2c1_pins: i2c1 {
> +		renesas,groups = "i2c1";
> +		renesas,function = "i2c1";
> +	};
> +
> +	i2c2_pins: i2c2 {
> +		renesas,groups = "i2c2";
> +		renesas,function = "i2c2";
> +	};

    These subnodes ended up added to a wrong node, they should have been added 
to the PFC node below.

>   };
>
>   &extal_clk {

WBR, Sergei

Re: [PATCH 2/2] ARM: lager: add i2c1, i2c2 pins

[Ben Dooks]

On 05/06/14 14:39, Sergei Shtylyov wrote:
> Hello.
> 
> On 06/05/2014 04:32 AM, Simon Horman wrote:
> 
>>> Add pinctrl definitions for i2c1 and i2c2 busses on the Lager board
>>> to ensure these are setup correctly at initialisation time. The i2c0
>>> and i2c3 busses are connected to single function pins.
> 
>>> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
>>> ---
>>>   arch/arm/boot/dts/r8a7790-lager.dts | 14 ++++++++++++++
>>>   1 file changed, 14 insertions(+)
> 
>> I have queued up the following.
> 
>> There was some fuzz when applying this patch, please check that the
>> following is correct.
> 
>> From: Ben Dooks <ben.dooks@codethink.co.uk>
> 
>> [PATCH] ARM: shmobile: lager: add i2c1, i2c2 pins
> 
>> Add pinctrl definitions for i2c1 and i2c2 busses on the Lager board
>> to ensure these are setup correctly at initialisation time. The i2c0
>> and i2c3 busses are connected to single function pins.
> 
>> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
>> [horms+renesas@verge.net.au: Added shmobile to patch title]
>> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
>> ---
>>   arch/arm/boot/dts/r8a7790-lager.dts | 14 ++++++++++++++
>>   1 file changed, 14 insertions(+)
> 
>> diff --git a/arch/arm/boot/dts/r8a7790-lager.dts
>> b/arch/arm/boot/dts/r8a7790-lager.dts
>> index ee80788..e33ed0d 100644
>> --- a/arch/arm/boot/dts/r8a7790-lager.dts
>> +++ b/arch/arm/boot/dts/r8a7790-lager.dts
>> @@ -139,6 +139,16 @@
>>           states = <3300000 1
>>                 1800000 0>;
>>       };
>> +
>> +    i2c1_pins: i2c1 {
>> +        renesas,groups = "i2c1";
>> +        renesas,function = "i2c1";
>> +    };
>> +
>> +    i2c2_pins: i2c2 {
>> +        renesas,groups = "i2c2";
>> +        renesas,function = "i2c2";
>> +    };
> 
>    These subnodes ended up added to a wrong node, they should have been
> added to the PFC node below.

Thanks, it is not obvious from just looking at them.


-- 
Ben Dooks				http://www.codethink.co.uk/
Senior Engineer				Codethink - Providing Genius

Re: [PATCH 2/2] ARM: lager: add i2c1, i2c2 pins

[Sergei Shtylyov]

Hello.

On 06/05/2014 08:30 PM, Ben Dooks wrote:

>>>> Add pinctrl definitions for i2c1 and i2c2 busses on the Lager board
>>>> to ensure these are setup correctly at initialisation time. The i2c0
>>>> and i2c3 busses are connected to single function pins.

>>>> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
>>>> ---
>>>>    arch/arm/boot/dts/r8a7790-lager.dts | 14 ++++++++++++++
>>>>    1 file changed, 14 insertions(+)

>>> I have queued up the following.

>>> There was some fuzz when applying this patch, please check that the
>>> following is correct.

>>> From: Ben Dooks <ben.dooks@codethink.co.uk>

>>> [PATCH] ARM: shmobile: lager: add i2c1, i2c2 pins

>>> Add pinctrl definitions for i2c1 and i2c2 busses on the Lager board
>>> to ensure these are setup correctly at initialisation time. The i2c0
>>> and i2c3 busses are connected to single function pins.

>>> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
>>> [horms+renesas@verge.net.au: Added shmobile to patch title]
>>> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
>>> ---
>>>    arch/arm/boot/dts/r8a7790-lager.dts | 14 ++++++++++++++
>>>    1 file changed, 14 insertions(+)

>>> diff --git a/arch/arm/boot/dts/r8a7790-lager.dts
>>> b/arch/arm/boot/dts/r8a7790-lager.dts
>>> index ee80788..e33ed0d 100644
>>> --- a/arch/arm/boot/dts/r8a7790-lager.dts
>>> +++ b/arch/arm/boot/dts/r8a7790-lager.dts
>>> @@ -139,6 +139,16 @@
>>>            states = <3300000 1
>>>                  1800000 0>;
>>>        };
>>> +
>>> +    i2c1_pins: i2c1 {
>>> +        renesas,groups = "i2c1";
>>> +        renesas,function = "i2c1";
>>> +    };
>>> +
>>> +    i2c2_pins: i2c2 {
>>> +        renesas,groups = "i2c2";
>>> +        renesas,function = "i2c2";
>>> +    };

>>     These subnodes ended up added to a wrong node, they should have been
>> added to the PFC node below.

> Thanks, it is not obvious from just looking at them.

    It was obvious from the context, actually.

WBR, Sergei

Re: [PATCH 2/2] ARM: lager: add i2c1, i2c2 pins

[Simon Horman]

On Thu, Jun 05, 2014 at 09:49:22PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 06/05/2014 08:30 PM, Ben Dooks wrote:
> 
> >>>>Add pinctrl definitions for i2c1 and i2c2 busses on the Lager board
> >>>>to ensure these are setup correctly at initialisation time. The i2c0
> >>>>and i2c3 busses are connected to single function pins.
> 
> >>>>Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
> >>>>---
> >>>>   arch/arm/boot/dts/r8a7790-lager.dts | 14 ++++++++++++++
> >>>>   1 file changed, 14 insertions(+)
> 
> >>>I have queued up the following.
> 
> >>>There was some fuzz when applying this patch, please check that the
> >>>following is correct.
> 
> >>>From: Ben Dooks <ben.dooks@codethink.co.uk>
> 
> >>>[PATCH] ARM: shmobile: lager: add i2c1, i2c2 pins
> 
> >>>Add pinctrl definitions for i2c1 and i2c2 busses on the Lager board
> >>>to ensure these are setup correctly at initialisation time. The i2c0
> >>>and i2c3 busses are connected to single function pins.
> 
> >>>Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
> >>>[horms+renesas@verge.net.au: Added shmobile to patch title]
> >>>Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> >>>---
> >>>   arch/arm/boot/dts/r8a7790-lager.dts | 14 ++++++++++++++
> >>>   1 file changed, 14 insertions(+)
> 
> >>>diff --git a/arch/arm/boot/dts/r8a7790-lager.dts
> >>>b/arch/arm/boot/dts/r8a7790-lager.dts
> >>>index ee80788..e33ed0d 100644
> >>>--- a/arch/arm/boot/dts/r8a7790-lager.dts
> >>>+++ b/arch/arm/boot/dts/r8a7790-lager.dts
> >>>@@ -139,6 +139,16 @@
> >>>           states = <3300000 1
> >>>                 1800000 0>;
> >>>       };
> >>>+
> >>>+    i2c1_pins: i2c1 {
> >>>+        renesas,groups = "i2c1";
> >>>+        renesas,function = "i2c1";
> >>>+    };
> >>>+
> >>>+    i2c2_pins: i2c2 {
> >>>+        renesas,groups = "i2c2";
> >>>+        renesas,function = "i2c2";
> >>>+    };
> 
> >>    These subnodes ended up added to a wrong node, they should have been
> >>added to the PFC node below.
> 
> >Thanks, it is not obvious from just looking at them.
> 
>    It was obvious from the context, actually.

Thanks for pointing out my error.

I plan to queue up the following to resolve this problem.

From: Simon Horman <horms+renesas@verge.net.au>

[PATCH] ARM: shmobile: lager: Move i2c[12]_pins nodes to pfc node

Due to an error when resolving conflicts df40f256b18300e1 ("ARM: shmobile:
lager: add i2c1, i2c2 pins") added the i2c[12]_pins nodes to the wrong
node.

This patch moves them to their correct location in the pfc node.

Cc: Ben Dooks <ben.dooks@codethink.co.uk>
Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7790-lager.dts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index e33ed0d..2bb42bc 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -139,16 +139,6 @@
 		states = <3300000 1
 			  1800000 0>;
 	};
-
-	i2c1_pins: i2c1 {
-		renesas,groups = "i2c1";
-		renesas,function = "i2c1";
-	};
-
-	i2c2_pins: i2c2 {
-		renesas,groups = "i2c2";
-		renesas,function = "i2c2";
-	};
 };
 
 &extal_clk {
@@ -210,6 +200,16 @@
 		renesas,function = "msiof1";
 	};
 
+	i2c1_pins: i2c1 {
+		renesas,groups = "i2c1";
+		renesas,function = "i2c1";
+	};
+
+	i2c2_pins: i2c2 {
+		renesas,groups = "i2c2";
+		renesas,function = "i2c2";
+	};
+
 	i2c3_pins: i2c3 {
 		renesas,groups = "i2c3";
 		renesas,function = "i2c3";
-- 
2.0.0.rc2