[PATCH V2 1/2] ARM: shmobile: r8a7791: add i2c master nodes to dtsi

[PATCH V2 1/2] ARM: shmobile: r8a7791: add i2c master nodes to dtsi

[Wolfram Sang]

From: Wolfram Sang <wsa@sang-engineering.com>

Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
---
 arch/arm/boot/dts/r8a7791.dtsi | 69 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 41194fe..1ab4f3d 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -19,6 +19,15 @@
 	#address-cells = <2>;
 	#size-cells = <2>;
 
+	aliases {
+		i2c0 = &i2c0;
+		i2c1 = &i2c1;
+		i2c2 = &i2c2;
+		i2c3 = &i2c3;
+		i2c4 = &i2c4;
+		i2c5 = &i2c5;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -170,6 +179,66 @@
 			     <0 17 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
+	i2c0: i2c at e6508000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "renesas,i2c-r8a7791";
+		reg = <0 0xe6508000 0 0x40>;
+		interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp9_clks R8A7791_CLK_I2C0>;
+		status = "disabled";
+	};
+
+	i2c1: i2c at e6518000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "renesas,i2c-r8a7791";
+		reg = <0 0xe6518000 0 0x40>;
+		interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp9_clks R8A7791_CLK_I2C1>;
+		status = "disabled";
+	};
+
+	i2c2: i2c at e6530000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "renesas,i2c-r8a7791";
+		reg = <0 0xe6530000 0 0x40>;
+		interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp9_clks R8A7791_CLK_I2C2>;
+		status = "disabled";
+	};
+
+	i2c3: i2c at e6540000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "renesas,i2c-r8a7791";
+		reg = <0 0xe6540000 0 0x40>;
+		interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp9_clks R8A7791_CLK_I2C3>;
+		status = "disabled";
+	};
+
+	i2c4: i2c at e6520000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "renesas,i2c-r8a7791";
+		reg = <0 0xe6520000 0 0x40>;
+		interrupts = <0 19 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp9_clks R8A7791_CLK_I2C4>;
+		status = "disabled";
+	};
+
+	i2c5: i2c at e6528000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "renesas,i2c-r8a7791";
+		reg = <0 0xe6528000 0 0x40>;
+		interrupts = <0 20 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp9_clks R8A7791_CLK_I2C5>;
+		status = "disabled";
+	};
+
 	pfc: pfc at e6060000 {
 		compatible = "renesas,pfc-r8a7791";
 		reg = <0 0xe6060000 0 0x250>;
-- 
1.8.5.1

[PATCH V2 2/2] ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt

[Wolfram Sang]

From: Wolfram Sang <wsa@sang-engineering.com>

Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
---
 arch/arm/boot/dts/r8a7791-koelsch.dts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index d4b9bba..b3f75d7 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -108,10 +108,29 @@
 	clock-frequency = <20000000>;
 };
 
+&i2c2 {
+	pinctrl-0 = <&i2c2_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+	clock-frequency = <400000>;
+
+	eeprom at 50 {
+		compatible = "renesas,24c02";
+		reg = <0x50>;
+		pagesize = <16>;
+	};
+};
+
 &pfc {
 	pinctrl-0 = <&scif0_pins &scif1_pins>;
 	pinctrl-names = "default";
 
+	i2c2_pins: i2c {
+		renesas,groups = "i2c2";
+		renesas,function = "i2c2";
+	};
+
 	scif0_pins: serial0 {
 		renesas,groups = "scif0_data_d";
 		renesas,function = "scif0";
-- 
1.8.5.1

[PATCH V2 1/2] ARM: shmobile: r8a7791: add i2c master nodes to dtsi

[Magnus Damm]

On Mon, Feb 17, 2014 at 7:44 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
> From: Wolfram Sang <wsa@sang-engineering.com>
>
> Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
> ---
>  arch/arm/boot/dts/r8a7791.dtsi | 69 ++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 69 insertions(+)
>
> diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
> index 41194fe..1ab4f3d 100644
> --- a/arch/arm/boot/dts/r8a7791.dtsi
> +++ b/arch/arm/boot/dts/r8a7791.dtsi
> @@ -19,6 +19,15 @@
>         #address-cells = <2>;
>         #size-cells = <2>;
>
> +       aliases {
> +               i2c0 = &i2c0;
> +               i2c1 = &i2c1;
> +               i2c2 = &i2c2;
> +               i2c3 = &i2c3;
> +               i2c4 = &i2c4;
> +               i2c5 = &i2c5;
> +       };
> +
>         cpus {
>                 #address-cells = <1>;
>                 #size-cells = <0>;
> @@ -170,6 +179,66 @@
>                              <0 17 IRQ_TYPE_LEVEL_HIGH>;
>         };
>
> +       i2c0: i2c at e6508000 {
> +               #address-cells = <1>;
> +               #size-cells = <0>;
> +               compatible = "renesas,i2c-r8a7791";

V2 of this patch looks good to me, thanks!

Acked-by: Magnus Damm <damm@opensource.se>

When you have time, please send an incremental patch to add support
for the three IIC channels as well.

Cheers,

/ magnus

[PATCH V2 2/2] ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt

[Magnus Damm]

On Mon, Feb 17, 2014 at 7:44 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
> From: Wolfram Sang <wsa@sang-engineering.com>
>
> Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
> ---
>  arch/arm/boot/dts/r8a7791-koelsch.dts | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)

Acked-by: Magnus Damm <damm@opensource.se>

Thanks,

/ magnus

[PATCH V2 1/2] ARM: shmobile: r8a7791: add i2c master nodes to dtsi

[Simon Horman]

On Mon, Feb 17, 2014 at 09:06:23PM +0900, Magnus Damm wrote:
> On Mon, Feb 17, 2014 at 7:44 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
> > From: Wolfram Sang <wsa@sang-engineering.com>
> >
> > Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>

Thanks, I have queued this up.

[PATCH V2 2/2] ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt

[Simon Horman]

On Mon, Feb 17, 2014 at 11:44:42AM +0100, Wolfram Sang wrote:
> From: Wolfram Sang <wsa@sang-engineering.com>
> 
> Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>

Thanks, I have queued up the following after resolving a minor conflict.


From: Wolfram Sang <wsa@sang-engineering.com>

ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt

Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
[horms+renesas at verge.net.au: resolved conflict]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7791-koelsch.dts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index f67d2d0..bf6ba0c 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -108,10 +108,29 @@
 	clock-frequency = <20000000>;
 };
 
+&i2c2 {
+	pinctrl-0 = <&i2c2_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+	clock-frequency = <400000>;
+
+	eeprom at 50 {
+		compatible = "renesas,24c02";
+		reg = <0x50>;
+		pagesize = <16>;
+	};
+};
+
 &pfc {
 	pinctrl-0 = <&du_pins &scif0_pins &scif1_pins>;
 	pinctrl-names = "default";
 
+	i2c2_pins: i2c {
+		renesas,groups = "i2c2";
+		renesas,function = "i2c2";
+	};
+
 	du_pins: du {
 		renesas,groups = "du_rgb666", "du_sync", "du_clk_out_0";
 		renesas,function = "du";
-- 
1.8.5.2

[PATCH V2 2/2] ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt

[Sergei Shtylyov]

Hello.

On 02/17/2014 01:44 PM, Wolfram Sang wrote:

> From: Wolfram Sang <wsa@sang-engineering.com>

> Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
> ---
>   arch/arm/boot/dts/r8a7791-koelsch.dts | 19 +++++++++++++++++++
>   1 file changed, 19 insertions(+)

> diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
> index d4b9bba..b3f75d7 100644
> --- a/arch/arm/boot/dts/r8a7791-koelsch.dts
> +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
> @@ -108,10 +108,29 @@
>   	clock-frequency = <20000000>;
>   };
>
> +&i2c2 {
> +	pinctrl-0 = <&i2c2_pins>;
> +	pinctrl-names = "default";
> +
> +	status = "okay";
> +	clock-frequency = <400000>;
> +
> +	eeprom at 50 {
> +		compatible = "renesas,24c02";

    This is not quite right: Renesas' part is called differently, and you're 
carrying the other vendor's naming onto Renesas parts. I'd just say "24c02" 
(which I'll do in the Henninger board patch).

WBR, Sergei

[PATCH V2 2/2] ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt

[Wolfram Sang]

> >+	eeprom at 50 {
> >+		compatible = "renesas,24c02";
> 
>    This is not quite right: Renesas' part is called differently, and
> you're carrying the other vendor's naming onto Renesas parts. I'd
> just say "24c02" (which I'll do in the Henninger board patch).

What about "generic"?

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140509/ed4c0d4f/attachment.sig>

[PATCH V2 2/2] ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt

[Sergei Shtylyov]

Hello.

On 05/09/2014 09:06 AM, Wolfram Sang wrote:

>>> +	eeprom at 50 {
>>> +		compatible = "renesas,24c02";

>>     This is not quite right: Renesas' part is called differently, and
>> you're carrying the other vendor's naming onto Renesas parts. I'd
>> just say "24c02" (which I'll do in the Henninger board patch).

> What about "generic"?

    I don't know, really. However, you're right in that there should be some 
vendor prefix -- I've just seen Documentation/devicetree/bindings/eeprom.txt.

WBR, Sergei

[PATCH V2 2/2] ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt

[Simon Horman]

On Sat, May 10, 2014 at 02:59:15AM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 05/09/2014 09:06 AM, Wolfram Sang wrote:
> 
> >>>+	eeprom at 50 {
> >>>+		compatible = "renesas,24c02";
> 
> >>    This is not quite right: Renesas' part is called differently, and
> >>you're carrying the other vendor's naming onto Renesas parts. I'd
> >>just say "24c02" (which I'll do in the Henninger board patch).
> 
> >What about "generic"?
> 
>    I don't know, really. However, you're right in that there should
> be some vendor prefix -- I've just seen
> Documentation/devicetree/bindings/eeprom.txt.

A quick survey of arch/arm/boot/dts/ yields:

"atmel,24c02" (22 times)
"microchip,24c02" (once)
"mcp,24c02" (once)

So it seems to me that precedence is in favour of using "renesas,24c02".

[PATCH V2 2/2] ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt

[Geert Uytterhoeven]

On Sun, May 11, 2014 at 2:08 AM, Simon Horman <horms@verge.net.au> wrote:
> On Sat, May 10, 2014 at 02:59:15AM +0400, Sergei Shtylyov wrote:
>> Hello.
>>
>> On 05/09/2014 09:06 AM, Wolfram Sang wrote:
>>
>> >>>+  eeprom at 50 {
>> >>>+          compatible = "renesas,24c02";
>>
>> >>    This is not quite right: Renesas' part is called differently, and
>> >>you're carrying the other vendor's naming onto Renesas parts. I'd
>> >>just say "24c02" (which I'll do in the Henninger board patch).
>>
>> >What about "generic"?
>>
>>    I don't know, really. However, you're right in that there should
>> be some vendor prefix -- I've just seen
>> Documentation/devicetree/bindings/eeprom.txt.
>
> A quick survey of arch/arm/boot/dts/ yields:
>
> "atmel,24c02" (22 times)
> "microchip,24c02" (once)
> "mcp,24c02" (once)
>
> So it seems to me that precedence is in favour of using "renesas,24c02".

Except that the Renesas part is called differently (as Sergei already pointed
out), unlike the Atmel and Microchip parts.

So it should be:

        compatible = "renesas,r1ex24002", "<something>,24c02";

Unfortunately the datasheet doesn't mention compatibility with parts from
other manufacturers.

So let's <something> be "atmel"?

BTW, we have a similar issue with Genmai, which has an R1EX24128.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

[PATCH V2 2/2] ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt

[Sergei Shtylyov]

Hello.

On 05/12/2014 11:35 AM, Geert Uytterhoeven wrote:

>>>>>> +  eeprom at 50 {
>>>>>> +          compatible = "renesas,24c02";

>>>>>     This is not quite right: Renesas' part is called differently, and
>>>>> you're carrying the other vendor's naming onto Renesas parts. I'd
>>>>> just say "24c02" (which I'll do in the Henninger board patch).

>>>> What about "generic"?

>>>     I don't know, really. However, you're right in that there should
>>> be some vendor prefix -- I've just seen
>>> Documentation/devicetree/bindings/eeprom.txt.

>> A quick survey of arch/arm/boot/dts/ yields:

>> "atmel,24c02" (22 times)
>> "microchip,24c02" (once)
>> "mcp,24c02" (once)

>> So it seems to me that precedence is in favour of using "renesas,24c02".

> Except that the Renesas part is called differently (as Sergei already pointed
> out), unlike the Atmel and Microchip parts.

> So it should be:

>          compatible = "renesas,r1ex24002", "<something>,24c02";

    Unfortunately, that way the legacy I2C driver matching used now won't work 
anymore. :-(

> Unfortunately the datasheet doesn't mention compatibility with parts from
> other manufacturers.

> So let's <something> be "atmel"?

    Yes, probably. But the "renesas,r1ex24002" part have to be dropped.

> Gr{oetje,eeting}s,
>                          Geert

WBR, Sergei

[PATCH V2 2/2] ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt

[Simon Horman]

On Mon, May 12, 2014 at 09:35:46AM +0200, Geert Uytterhoeven wrote:
> On Sun, May 11, 2014 at 2:08 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Sat, May 10, 2014 at 02:59:15AM +0400, Sergei Shtylyov wrote:
> >> Hello.
> >>
> >> On 05/09/2014 09:06 AM, Wolfram Sang wrote:
> >>
> >> >>>+  eeprom at 50 {
> >> >>>+          compatible = "renesas,24c02";
> >>
> >> >>    This is not quite right: Renesas' part is called differently, and
> >> >>you're carrying the other vendor's naming onto Renesas parts. I'd
> >> >>just say "24c02" (which I'll do in the Henninger board patch).
> >>
> >> >What about "generic"?
> >>
> >>    I don't know, really. However, you're right in that there should
> >> be some vendor prefix -- I've just seen
> >> Documentation/devicetree/bindings/eeprom.txt.
> >
> > A quick survey of arch/arm/boot/dts/ yields:
> >
> > "atmel,24c02" (22 times)
> > "microchip,24c02" (once)
> > "mcp,24c02" (once)
> >
> > So it seems to me that precedence is in favour of using "renesas,24c02".
> 
> Except that the Renesas part is called differently (as Sergei already pointed
> out), unlike the Atmel and Microchip parts.
> 
> So it should be:
> 
>         compatible = "renesas,r1ex24002", "<something>,24c02";
> 
> Unfortunately the datasheet doesn't mention compatibility with parts from
> other manufacturers.
> 
> So let's <something> be "atmel"?

If <something> isn't documented as being compatible then
I feel that we should not add it to the list.

> BTW, we have a similar issue with Genmai, which has an R1EX24128.
> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>