[PATCH] arm: shmobile: r8a7790: Fix I2C controller names

[PATCH] arm: shmobile: r8a7790: Fix I2C controller names

[Valentine Barshak]

The R8A7790 is an R-Car Gen2 SoC. The clock division factor
(CDF) width is 3 bits on Gen2 as opposed to 2 bits on Gen1.
Fix the device names for R8A7790 SoC to make the R-Car I2C
driver configure the hardware properly.

Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
---
 arch/arm/mach-shmobile/clock-r8a7790.c | 8 ++++----
 arch/arm/mach-shmobile/setup-r8a7790.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index 81f45a0..18d836b 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -297,13 +297,13 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),
 	CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),
 	CLKDEV_DEV_ID("e6508000.i2c", &mstp_clks[MSTP931]),
-	CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP931]),
+	CLKDEV_DEV_ID("i2c-rcar_gen2.0", &mstp_clks[MSTP931]),
 	CLKDEV_DEV_ID("e6518000.i2c", &mstp_clks[MSTP930]),
-	CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP930]),
+	CLKDEV_DEV_ID("i2c-rcar_gen2.1", &mstp_clks[MSTP930]),
 	CLKDEV_DEV_ID("e6530000.i2c", &mstp_clks[MSTP929]),
-	CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP929]),
+	CLKDEV_DEV_ID("i2c-rcar_gen2.2", &mstp_clks[MSTP929]),
 	CLKDEV_DEV_ID("e6540000.i2c", &mstp_clks[MSTP928]),
-	CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP928]),
+	CLKDEV_DEV_ID("i2c-rcar_gen2.3", &mstp_clks[MSTP928]),
 	CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),
 	CLKDEV_DEV_ID("r8a7790-vin.0", &mstp_clks[MSTP811]),
 	CLKDEV_DEV_ID("r8a7790-vin.1", &mstp_clks[MSTP810]),
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 8474818..77fd7ed 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -85,7 +85,7 @@ static struct resource i2c_resources[] __initdata = {
 
 #define r8a7790_register_i2c(idx)		\
 	platform_device_register_simple(	\
-		"i2c-rcar", idx,		\
+		"i2c-rcar_gen2", idx,		\
 		i2c_resources + (2 * idx), 2);	\
 
 void __init r8a7790_pinmux_init(void)
-- 
1.8.3.1

Re: [PATCH] arm: shmobile: r8a7790: Fix I2C controller names

[Kuninori Morimoto]

Hi

> The R8A7790 is an R-Car Gen2 SoC. The clock division factor
> (CDF) width is 3 bits on Gen2 as opposed to 2 bits on Gen1.
> Fix the device names for R8A7790 SoC to make the R-Car I2C
> driver configure the hardware properly.
> 
> Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
> ---

Grr... this is correct
sorry my fault.

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Simon, this patch is based on below patch

043a3f113ce41e3e6fdbb49551df75e82e8c4ae7
(i2c: rcar: fixup rcar type naming)


Best regards
---
Kuninori Morimoto

Re: [PATCH] arm: shmobile: r8a7790: Fix I2C controller names

[Simon Horman]

On Wed, Dec 18, 2013 at 09:17:05PM -0800, Kuninori Morimoto wrote:
> 
> Hi
> 
> > The R8A7790 is an R-Car Gen2 SoC. The clock division factor
> > (CDF) width is 3 bits on Gen2 as opposed to 2 bits on Gen1.
> > Fix the device names for R8A7790 SoC to make the R-Car I2C
> > driver configure the hardware properly.
> > 
> > Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
> > ---
> 
> Grr... this is correct
> sorry my fault.
> 
> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> Simon, this patch is based on below patch
> 
> 043a3f113ce41e3e6fdbb49551df75e82e8c4ae7
> (i2c: rcar: fixup rcar type naming)

Thanks.

Valentine could you please:

1. Rebase this on the fixes-for-v3.13 branch in the renesas tree and;
2. Include something like this in the following.

This resolves a regression which was introduced by
043a3f113ce41e3 ("i2c: rcar: fixup rcar type naming") in v3.12-rc4.

Thanks.

Re: [PATCH] arm: shmobile: r8a7790: Fix I2C controller names

[Valentine]

On 12/19/2013 12:58 PM, Simon Horman wrote:
> On Wed, Dec 18, 2013 at 09:17:05PM -0800, Kuninori Morimoto wrote:
>>
>> Hi
>>
>>> The R8A7790 is an R-Car Gen2 SoC. The clock division factor
>>> (CDF) width is 3 bits on Gen2 as opposed to 2 bits on Gen1.
>>> Fix the device names for R8A7790 SoC to make the R-Car I2C
>>> driver configure the hardware properly.
>>>
>>> Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
>>> ---
>>
>> Grr... this is correct
>> sorry my fault.
>>
>> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>>
>> Simon, this patch is based on below patch
>>
>> 043a3f113ce41e3e6fdbb49551df75e82e8c4ae7
>> (i2c: rcar: fixup rcar type naming)
>
> Thanks.
>
> Valentine could you please:
>
> 1. Rebase this on the fixes-for-v3.13 branch in the renesas tree and;
> 2. Include something like this in the following.
>
> This resolves a regression which was introduced by
> 043a3f113ce41e3 ("i2c: rcar: fixup rcar type naming") in v3.12-rc4.
>

Sure, I'll rebase, but I think the comment is not needed since the issue here is not really related to 043a3f113ce41e3.
That patch changed the device name from "i2c-rcar_h2" to "i2c-rcar_gen2" in the driver, while the patch that adds i2c to
the r8a7790 platform (b448c904f5058b6c "ARM: shmobile: r8a7790: add I2C support") uses a wrong ("i2c-rcar") name anyways.

> Thanks.
>

Thanks,
Val.

Re: [PATCH] arm: shmobile: r8a7790: Fix I2C controller names

[Valentine]

On 12/19/2013 04:24 PM, Valentine wrote:
> On 12/19/2013 12:58 PM, Simon Horman wrote:
>> On Wed, Dec 18, 2013 at 09:17:05PM -0800, Kuninori Morimoto wrote:
>>>
>>> Hi
>>>
>>>> The R8A7790 is an R-Car Gen2 SoC. The clock division factor
>>>> (CDF) width is 3 bits on Gen2 as opposed to 2 bits on Gen1.
>>>> Fix the device names for R8A7790 SoC to make the R-Car I2C
>>>> driver configure the hardware properly.
>>>>
>>>> Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
>>>> ---
>>>
>>> Grr... this is correct
>>> sorry my fault.
>>>
>>> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>>>
>>> Simon, this patch is based on below patch
>>>
>>> 043a3f113ce41e3e6fdbb49551df75e82e8c4ae7
>>> (i2c: rcar: fixup rcar type naming)
>>
>> Thanks.
>>
>> Valentine could you please:
>>
>> 1. Rebase this on the fixes-for-v3.13 branch in the renesas tree and;
>> 2. Include something like this in the following.
>>
>> This resolves a regression which was introduced by
>> 043a3f113ce41e3 ("i2c: rcar: fixup rcar type naming") in v3.12-rc4.
>>
>
> Sure, I'll rebase, but I think the comment is not needed since the issue here is not really related to 043a3f113ce41e3.
> That patch changed the device name from "i2c-rcar_h2" to "i2c-rcar_gen2" in the driver, while the patch that adds i2c to
> the r8a7790 platform (b448c904f5058b6c "ARM: shmobile: r8a7790: add I2C support") uses a wrong ("i2c-rcar") name anyways.
>

In fact there's nothing to rebase to. I've just looked at fixes-for-v3.13. The branch doesn't have commit
b448c904f5058b6c "ARM: shmobile: r8a7790: add I2C support" which in fact follows v3.13-rc1 (Linux 3.13-rc1)

>> Thanks.
>>
>
> Thanks,
> Val.

Thanks,
Val.

Re: [PATCH] arm: shmobile: r8a7790: Fix I2C controller names

[Simon Horman]

On Thu, Dec 19, 2013 at 04:35:37PM +0400, Valentine wrote:
> On 12/19/2013 04:24 PM, Valentine wrote:
> >On 12/19/2013 12:58 PM, Simon Horman wrote:
> >>On Wed, Dec 18, 2013 at 09:17:05PM -0800, Kuninori Morimoto wrote:
> >>>
> >>>Hi
> >>>
> >>>>The R8A7790 is an R-Car Gen2 SoC. The clock division factor
> >>>>(CDF) width is 3 bits on Gen2 as opposed to 2 bits on Gen1.
> >>>>Fix the device names for R8A7790 SoC to make the R-Car I2C
> >>>>driver configure the hardware properly.
> >>>>
> >>>>Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
> >>>>---
> >>>
> >>>Grr... this is correct
> >>>sorry my fault.
> >>>
> >>>Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >>>
> >>>Simon, this patch is based on below patch
> >>>
> >>>043a3f113ce41e3e6fdbb49551df75e82e8c4ae7
> >>>(i2c: rcar: fixup rcar type naming)
> >>
> >>Thanks.
> >>
> >>Valentine could you please:
> >>
> >>1. Rebase this on the fixes-for-v3.13 branch in the renesas tree and;
> >>2. Include something like this in the following.
> >>
> >>This resolves a regression which was introduced by
> >>043a3f113ce41e3 ("i2c: rcar: fixup rcar type naming") in v3.12-rc4.
> >>
> >
> >Sure, I'll rebase, but I think the comment is not needed since the issue here is not really related to 043a3f113ce41e3.
> >That patch changed the device name from "i2c-rcar_h2" to "i2c-rcar_gen2" in the driver, while the patch that adds i2c to
> >the r8a7790 platform (b448c904f5058b6c "ARM: shmobile: r8a7790: add I2C support") uses a wrong ("i2c-rcar") name anyways.
> >
> 
> In fact there's nothing to rebase to. I've just looked at fixes-for-v3.13. The branch doesn't have commit
> b448c904f5058b6c "ARM: shmobile: r8a7790: add I2C support" which in fact follows v3.13-rc1 (Linux 3.13-rc1)

Sorry, I assumed this was a fix for v3.13, but its actually a fix
for code that has been queued up for v3.14.

Could you please do the following:

1. Note which patch caused the problem in the changelog.
2. Rebase on top of the latest devel tag,
   currently renesas-devel-v3.13-rc5-20131226.

Thanks

Re: [PATCH] arm: shmobile: r8a7790: Fix I2C controller names

[Valentine]

On 12/27/2013 06:10 AM, Simon Horman wrote:
> On Thu, Dec 19, 2013 at 04:35:37PM +0400, Valentine wrote:
>> On 12/19/2013 04:24 PM, Valentine wrote:
>>> On 12/19/2013 12:58 PM, Simon Horman wrote:
>>>> On Wed, Dec 18, 2013 at 09:17:05PM -0800, Kuninori Morimoto wrote:
>>>>>
>>>>> Hi
>>>>>
>>>>>> The R8A7790 is an R-Car Gen2 SoC. The clock division factor
>>>>>> (CDF) width is 3 bits on Gen2 as opposed to 2 bits on Gen1.
>>>>>> Fix the device names for R8A7790 SoC to make the R-Car I2C
>>>>>> driver configure the hardware properly.
>>>>>>
>>>>>> Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
>>>>>> ---
>>>>>
>>>>> Grr... this is correct
>>>>> sorry my fault.
>>>>>
>>>>> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>>>>>
>>>>> Simon, this patch is based on below patch
>>>>>
>>>>> 043a3f113ce41e3e6fdbb49551df75e82e8c4ae7
>>>>> (i2c: rcar: fixup rcar type naming)
>>>>
>>>> Thanks.
>>>>
>>>> Valentine could you please:
>>>>
>>>> 1. Rebase this on the fixes-for-v3.13 branch in the renesas tree and;
>>>> 2. Include something like this in the following.
>>>>
>>>> This resolves a regression which was introduced by
>>>> 043a3f113ce41e3 ("i2c: rcar: fixup rcar type naming") in v3.12-rc4.
>>>>
>>>
>>> Sure, I'll rebase, but I think the comment is not needed since the issue here is not really related to 043a3f113ce41e3.
>>> That patch changed the device name from "i2c-rcar_h2" to "i2c-rcar_gen2" in the driver, while the patch that adds i2c to
>>> the r8a7790 platform (b448c904f5058b6c "ARM: shmobile: r8a7790: add I2C support") uses a wrong ("i2c-rcar") name anyways.
>>>
>>
>> In fact there's nothing to rebase to. I've just looked at fixes-for-v3.13. The branch doesn't have commit
>> b448c904f5058b6c "ARM: shmobile: r8a7790: add I2C support" which in fact follows v3.13-rc1 (Linux 3.13-rc1)
>
> Sorry, I assumed this was a fix for v3.13, but its actually a fix
> for code that has been queued up for v3.14.
>
> Could you please do the following:
>
> 1. Note which patch caused the problem in the changelog.
> 2. Rebase on top of the latest devel tag,
>     currently renesas-devel-v3.13-rc5-20131226.
>
> Thanks
>

Just send the V2 version.

Thanks,
Val.

[GIT PULL] Renesas ARM Based SoC Fixes for v3.14

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

please consider these renesas ARM Based SoC Fixes for v3.14.

This pull-request is based on the Third Round of Renesas ARM Based SoC
Updates for v3.14, tagged as renesas-soc3-for-v3.14, which you have
previously pulled.

It resolves a problem introduced by a patch included in the second round of such
changes, tagged as renesas-soc2-for-v3.14, which you have also previously
pulled.

renesas-soc3-for-v3.14 is based on renesas-soc2-for-v3.14.



The following changes since commit d85bcfa916ffdf078f188aeab60f738b290f4309:

  arm: shmobile: r7s72100: add i2c clocks (2013-12-24 21:09:19 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-fixes-for-v3.14

for you to fetch changes up to db455c786886465c4d7fcd012fe2684b4c887776:

  ARM: shmobile: r8a7790: Fix I2C controller names (2014-01-06 14:25:39 +0900)

----------------------------------------------------------------
Renesas ARM Based SoC Fixes for v3.14

* r8a7790 (R-Car H2) SoC

  - Correct I2C controller names

    This fixes the issue introduced by
    b448c904f5058b6c "ARM: shmobile: r8a7790: add I2C support"
    which is queued-up for v3.14.

----------------------------------------------------------------
Valentine Barshak (1):
      ARM: shmobile: r8a7790: Fix I2C controller names

 arch/arm/mach-shmobile/clock-r8a7790.c | 8 ++++----
 arch/arm/mach-shmobile/setup-r8a7790.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

[PATCH] ARM: shmobile: r8a7790: Fix I2C controller names

[Simon Horman]

From: Valentine Barshak <valentine.barshak@cogentembedded.com>

This fixes the issue introduced by the following commit:
b448c904f5058b6c "ARM: shmobile: r8a7790: add I2C support"

The R8A7790 is an R-Car Gen2 SoC. The clock division factor
(CDF) width is 3 bits on Gen2 as opposed to 2 bits on Gen1.
Fix the device names for R8A7790 SoC to make the R-Car I2C
driver configure the hardware properly.

Changes in V2:
* rebased on top of the latest branch;
* capitalized ARM in the subject line;
* noted the commit that caused the issue in the log.

Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/clock-r8a7790.c | 8 ++++----
 arch/arm/mach-shmobile/setup-r8a7790.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index b6ecea3..e6f88dd 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -292,13 +292,13 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),
 	CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),
 	CLKDEV_DEV_ID("e6508000.i2c", &mstp_clks[MSTP931]),
-	CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP931]),
+	CLKDEV_DEV_ID("i2c-rcar_gen2.0", &mstp_clks[MSTP931]),
 	CLKDEV_DEV_ID("e6518000.i2c", &mstp_clks[MSTP930]),
-	CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP930]),
+	CLKDEV_DEV_ID("i2c-rcar_gen2.1", &mstp_clks[MSTP930]),
 	CLKDEV_DEV_ID("e6530000.i2c", &mstp_clks[MSTP929]),
-	CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP929]),
+	CLKDEV_DEV_ID("i2c-rcar_gen2.2", &mstp_clks[MSTP929]),
 	CLKDEV_DEV_ID("e6540000.i2c", &mstp_clks[MSTP928]),
-	CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP928]),
+	CLKDEV_DEV_ID("i2c-rcar_gen2.3", &mstp_clks[MSTP928]),
 	CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),
 	CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),
 	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 66476d2..d6589f3 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -81,7 +81,7 @@ static struct resource i2c_resources[] __initdata = {
 
 #define r8a7790_register_i2c(idx)		\
 	platform_device_register_simple(	\
-		"i2c-rcar", idx,		\
+		"i2c-rcar_gen2", idx,		\
 		i2c_resources + (2 * idx), 2);	\
 
 void __init r8a7790_pinmux_init(void)
-- 
1.8.4