[PATCH] ARM: shmobile: koelsch: Remove non-existent i2c6 pinmux

[PATCH] ARM: shmobile: koelsch: Remove non-existent i2c6 pinmux

[Geert Uytterhoeven]

On r8a7791, i2c6 (aka iic3) doesn't need pinmux, but the koelsch dts
refers to non-existent pinmux configuration data:

pinmux core: sh-pfc does not support function i2c6
sh-pfc e6060000.pfc: invalid function i2c6 in map table

Remove it to fix this.

Fixes: commit 1d41f36a68c0f4e9b01d563ce33bab5201858b54 ("ARM: shmobile:
       koelsch dts: Add VDD MPU regulator for DVFS")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm/boot/dts/r8a7791-koelsch.dts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 7966dace64ce..951a5c55003e 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -275,11 +275,6 @@
 		renesas,function = "msiof0";
 	};
 
-	i2c6_pins: i2c6 {
-		renesas,groups = "i2c6";
-		renesas,function = "i2c6";
-	};
-
 	usb0_pins: usb0 {
 		renesas,groups = "usb0";
 		renesas,function = "usb0";
@@ -477,8 +472,6 @@
 };
 
 &i2c6 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&i2c6_pins>;
 	status = "okay";
 	clock-frequency = <100000>;
 
-- 
1.9.1

Re: [PATCH] ARM: shmobile: koelsch: Remove non-existent i2c6 pinmux

[Simon Horman]

On Tue, Aug 12, 2014 at 03:03:13PM +0200, Geert Uytterhoeven wrote:
> On r8a7791, i2c6 (aka iic3) doesn't need pinmux, but the koelsch dts
> refers to non-existent pinmux configuration data:
> 
> pinmux core: sh-pfc does not support function i2c6
> sh-pfc e6060000.pfc: invalid function i2c6 in map table
> 
> Remove it to fix this.
> 
> Fixes: commit 1d41f36a68c0f4e9b01d563ce33bab5201858b54 ("ARM: shmobile:
>        koelsch dts: Add VDD MPU regulator for DVFS")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Thanks Geert. Does this manifest as a run-time problem?

Regardless, it looks like I should queue this up as
a fix for v3.17. Is that your thinking too?

> ---
>  arch/arm/boot/dts/r8a7791-koelsch.dts | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
> index 7966dace64ce..951a5c55003e 100644
> --- a/arch/arm/boot/dts/r8a7791-koelsch.dts
> +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
> @@ -275,11 +275,6 @@
>  		renesas,function = "msiof0";
>  	};
>  
> -	i2c6_pins: i2c6 {
> -		renesas,groups = "i2c6";
> -		renesas,function = "i2c6";
> -	};
> -
>  	usb0_pins: usb0 {
>  		renesas,groups = "usb0";
>  		renesas,function = "usb0";
> @@ -477,8 +472,6 @@
>  };
>  
>  &i2c6 {
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&i2c6_pins>;
>  	status = "okay";
>  	clock-frequency = <100000>;
>  
> -- 
> 1.9.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH] ARM: shmobile: koelsch: Remove non-existent i2c6 pinmux

[Geert Uytterhoeven]

Hi Simon,

On Tue, Aug 12, 2014 at 3:36 PM, Simon Horman <horms@verge.net.au> wrote:
> On Tue, Aug 12, 2014 at 03:03:13PM +0200, Geert Uytterhoeven wrote:
>> On r8a7791, i2c6 (aka iic3) doesn't need pinmux, but the koelsch dts
>> refers to non-existent pinmux configuration data:
>>
>> pinmux core: sh-pfc does not support function i2c6
>> sh-pfc e6060000.pfc: invalid function i2c6 in map table
>>
>> Remove it to fix this.
>>
>> Fixes: commit 1d41f36a68c0f4e9b01d563ce33bab5201858b54 ("ARM: shmobile:
>>        koelsch dts: Add VDD MPU regulator for DVFS")
>> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> Thanks Geert. Does this manifest as a run-time problem?

I don't think it causes any harm, despite the error message.
i2c6 works fine (using a modified version of "ARM: shmobile:
koelsch-reference: Add restart function" from the BSP).

> Regardless, it looks like I should queue this up as
> a fix for v3.17. Is that your thinking too?

The error message is a regression from v3.16, so v3.17 would be
appropriate. However, if you have no other DTS fixes for v3.17,
v3.18 is fine for me, too.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@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

Re: [PATCH] ARM: shmobile: koelsch: Remove non-existent i2c6 pinmux

[Simon Horman]

On Tue, Aug 12, 2014 at 03:48:12PM +0200, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Tue, Aug 12, 2014 at 3:36 PM, Simon Horman <horms@verge.net.au> wrote:
> > On Tue, Aug 12, 2014 at 03:03:13PM +0200, Geert Uytterhoeven wrote:
> >> On r8a7791, i2c6 (aka iic3) doesn't need pinmux, but the koelsch dts
> >> refers to non-existent pinmux configuration data:
> >>
> >> pinmux core: sh-pfc does not support function i2c6
> >> sh-pfc e6060000.pfc: invalid function i2c6 in map table
> >>
> >> Remove it to fix this.
> >>
> >> Fixes: commit 1d41f36a68c0f4e9b01d563ce33bab5201858b54 ("ARM: shmobile:
> >>        koelsch dts: Add VDD MPU regulator for DVFS")
> >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> >
> > Thanks Geert. Does this manifest as a run-time problem?
> 
> I don't think it causes any harm, despite the error message.
> i2c6 works fine (using a modified version of "ARM: shmobile:
> koelsch-reference: Add restart function" from the BSP).
> 
> > Regardless, it looks like I should queue this up as
> > a fix for v3.17. Is that your thinking too?
> 
> The error message is a regression from v3.16, so v3.17 would be
> appropriate. However, if you have no other DTS fixes for v3.17,
> v3.18 is fine for me, too.

I don't have any other fixes pending at this time.
But sending this one to the arm-soc guys should not
be much of a burden.

[PATCH] ARM: shmobile: koelsch: Remove non-existent i2c6 pinmux

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@glider.be>

On r8a7791, i2c6 (aka iic3) doesn't need pinmux, but the koelsch dts
refers to non-existent pinmux configuration data:

pinmux core: sh-pfc does not support function i2c6
sh-pfc e6060000.pfc: invalid function i2c6 in map table

Remove it to fix this.

Fixes: commit 1d41f36a68c0f4e9b01d563ce33bab5201858b54 ("ARM: shmobile:
       koelsch dts: Add VDD MPU regulator for DVFS")

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7791-koelsch.dts | 7 -------
 1 file changed, 7 deletions(-)

Hi Olof, Arnd, Kevin,

please consider this as a fix for v3.17.

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 23486c0..be59014 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -275,11 +275,6 @@
 		renesas,function = "msiof0";
 	};
 
-	i2c6_pins: i2c6 {
-		renesas,groups = "i2c6";
-		renesas,function = "i2c6";
-	};
-
 	usb0_pins: usb0 {
 		renesas,groups = "usb0";
 		renesas,function = "usb0";
@@ -420,8 +415,6 @@
 };
 
 &i2c6 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&i2c6_pins>;
 	status = "okay";
 	clock-frequency = <100000>;
 
-- 
2.0.1

Re: [PATCH] ARM: shmobile: koelsch: Remove non-existent i2c6 pinmux

[Olof Johansson]

On Fri, Aug 15, 2014 at 07:19:10AM +0900, Simon Horman wrote:
> From: Geert Uytterhoeven <geert+renesas@glider.be>
> 
> On r8a7791, i2c6 (aka iic3) doesn't need pinmux, but the koelsch dts
> refers to non-existent pinmux configuration data:
> 
> pinmux core: sh-pfc does not support function i2c6
> sh-pfc e6060000.pfc: invalid function i2c6 in map table
> 
> Remove it to fix this.
> 
> Fixes: commit 1d41f36a68c0f4e9b01d563ce33bab5201858b54 ("ARM: shmobile:
>        koelsch dts: Add VDD MPU regulator for DVFS")
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>  arch/arm/boot/dts/r8a7791-koelsch.dts | 7 -------
>  1 file changed, 7 deletions(-)
> 
> Hi Olof, Arnd, Kevin,
> 
> please consider this as a fix for v3.17.

Applied.


-Olof

Re: [PATCH] ARM: shmobile: koelsch: Remove non-existent i2c6 pinmux

[Simon Horman]

On Sun, Aug 24, 2014 at 11:23:44AM -0700, Olof Johansson wrote:
> On Fri, Aug 15, 2014 at 07:19:10AM +0900, Simon Horman wrote:
> > From: Geert Uytterhoeven <geert+renesas@glider.be>
> > 
> > On r8a7791, i2c6 (aka iic3) doesn't need pinmux, but the koelsch dts
> > refers to non-existent pinmux configuration data:
> > 
> > pinmux core: sh-pfc does not support function i2c6
> > sh-pfc e6060000.pfc: invalid function i2c6 in map table
> > 
> > Remove it to fix this.
> > 
> > Fixes: commit 1d41f36a68c0f4e9b01d563ce33bab5201858b54 ("ARM: shmobile:
> >        koelsch dts: Add VDD MPU regulator for DVFS")
> > 
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > ---
> >  arch/arm/boot/dts/r8a7791-koelsch.dts | 7 -------
> >  1 file changed, 7 deletions(-)
> > 
> > Hi Olof, Arnd, Kevin,
> > 
> > please consider this as a fix for v3.17.
> 
> Applied.

Thanks!