[PATCH 0/2] ARM: shmobile: alt: Correct pfc

[PATCH 0/2] ARM: shmobile: alt: Correct pfc

[Simon Horman]

0c9400fab882 ("Merge branch 'heads/dt-for-v4.5' into next") introduced
pfc pins to the alt device tree but did not reference them. This patch
set addresses that and other deficiencies in that patch.

Written and tested against renesas-next-20151118-v4.4-rc1

Simon Horman (2):
  ARM: shmobile: alt: Correct scif2 pfc
  ARM: shmobile: alt: Correct ether pfc

 arch/arm/boot/dts/r8a7794-alt.dts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

-- 
2.1.4

[PATCH 1/2] ARM: shmobile: alt: Correct scif2 pfc

[Simon Horman]

0c9400fab882 ("Merge branch 'heads/dt-for-v4.5' into next") introduced
pfc pins to the alt device tree but did not reference them. This patch
fixes scif2 pfc by adding references to the scif2 pins.

Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794-alt.dts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
index fd1cfcdd65ef..412eb7ad86db 100644
--- a/arch/arm/boot/dts/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -182,5 +182,8 @@
 };
 
 &scif2 {
+	pinctrl-0 = <&scif2_pins>;
+	pinctrl-names = "default";
+
 	status = "okay";
 };
-- 
2.1.4

[PATCH 2/2] ARM: shmobile: alt: Correct ether pfc

[Simon Horman]

0c9400fab882 ("Merge branch 'heads/dt-for-v4.5' into next") introduced
pfc pins to the alt device tree but did not reference them. This patch
fixes ether pfc by:

* Referencing ether pins
* Adding and referencing phy1 pins
* Removing ether b pins. These are not used in the configuration
  of the alt board used for testing and their presence prevents
  ethernet from functioning correctly in that environment.

Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794-alt.dts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
index 412eb7ad86db..7c72494f51b0 100644
--- a/arch/arm/boot/dts/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -111,9 +111,9 @@
 		renesas,function = "eth";
 	};
 
-	ether_b_pins: ether {
-		renesas,groups = "eth_link_b", "eth_mdio_b", "eth_rmii_b";
-		renesas,function = "eth";
+	phy1_pins: phy1 {
+		renesas,groups = "intc_irq8";
+		renesas,function = "intc";
 	};
 
 	i2c1_pins: i2c1 {
@@ -132,6 +132,9 @@
 };
 
 &ether {
+	pinctrl-0 = <&ether_pins &phy1_pins>;
+	pinctrl-names = "default";
+
 	phy-handle = <&phy1>;
 	renesas,ether-link-active-low;
 	status = "okay";
-- 
2.1.4

[PATCH 2/2] ARM: shmobile: alt: Correct ether pfc

[Sergei Shtylyov]

Hello.

On 11/23/2015 10:16 AM, Simon Horman wrote:

> 0c9400fab882 ("Merge branch 'heads/dt-for-v4.5' into next") introduced
> pfc pins to the alt device tree but did not reference them. This patch

    Merge introduced?

> fixes ether pfc by:
>
> * Referencing ether pins
> * Adding and referencing phy1 pins
> * Removing ether b pins. These are not used in the configuration
>    of the alt board used for testing and their presence prevents
>    ethernet from functioning correctly in that environment.
>
> Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

[...]

MBR, Sergei

[PATCH 1/2] ARM: shmobile: alt: Correct scif2 pfc

[Sergei Shtylyov]

Hello.

On 11/23/2015 10:16 AM, Simon Horman wrote:

> 0c9400fab882 ("Merge branch 'heads/dt-for-v4.5' into next") introduced
> pfc pins to the alt device tree but did not reference them. This patch

    Merge introduced? I thought there was a concrete commit doing that...

> fixes scif2 pfc by adding references to the scif2 pins.
>
> Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

[...]

MBR, Sergei

[PATCH 1/2] ARM: shmobile: alt: Correct scif2 pfc

[Simon Horman]

On Mon, Nov 23, 2015 at 03:25:33PM +0300, Sergei Shtylyov wrote:
> Hello.
> 
> On 11/23/2015 10:16 AM, Simon Horman wrote:
> 
> >0c9400fab882 ("Merge branch 'heads/dt-for-v4.5' into next") introduced
> >pfc pins to the alt device tree but did not reference them. This patch
> 
>    Merge introduced? I thought there was a concrete commit doing that...

Indeed, I will fix that.