[PATCH 0/2] ARM: shmobile: add USB3.0 device node on r8a7790

[PATCH 0/2] ARM: shmobile: add USB3.0 device node on r8a7790

[Yoshihiro Shimoda]

 This series is based on Simon's renesas.git branch and
renesas-devel-20141007-v3.17 tag. If we use the generic phy
driver for R-Car Gen2 (drivers/phy/phy-rcar-gen2.c), we can use
the USB3.0 on lager.

Yoshihiro Shimoda (2):
  ARM: shmobile: r8a7790: add USB3.0 device node
  ARM: shmobile: lager: enable USB3.0

 arch/arm/boot/dts/r8a7790-lager.dts |    6 ++++++
 arch/arm/boot/dts/r8a7790.dtsi      |   10 ++++++++++
 2 files changed, 16 insertions(+)

-- 
1.7.9.5

[PATCH 0/2] ARM: shmobile: add USB3.0 device node on r8a7790

[Yoshihiro Shimoda]

 This series is based on Simon's renesas.git branch and
renesas-devel-20141007-v3.17 tag. If we use the generic phy
driver for R-Car Gen2 (drivers/phy/phy-rcar-gen2.c), we can use
the USB3.0 on lager.

Yoshihiro Shimoda (2):
  ARM: shmobile: r8a7790: add USB3.0 device node
  ARM: shmobile: lager: enable USB3.0

 arch/arm/boot/dts/r8a7790-lager.dts |    6 ++++++
 arch/arm/boot/dts/r8a7790.dtsi      |   10 ++++++++++
 2 files changed, 16 insertions(+)

-- 
1.7.9.5

[PATCH 1/2] ARM: shmobile: r8a7790: add USB3.0 device node

[Yoshihiro Shimoda]

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 arch/arm/boot/dts/r8a7790.dtsi |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 2380fd5..16f8646 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1140,6 +1140,16 @@
 		status = "disabled";
 	};
 
+	xhci: usb@ee000000 {
+		compatible = "renesas,xhci-r8a7790";
+		reg = <0 0xee000000 0 0xc00>;
+		interrupts = <0 101 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp3_clks R8A7790_CLK_SSUSB>;
+		phys = <&usb2 1>;
+		phy-names = "usb";
+		status = "disabled";
+	};
+
 	pci0: pci@ee090000 {
 		compatible = "renesas,pci-r8a7790";
 		device_type = "pci";
-- 
1.7.9.5

[PATCH 1/2] ARM: shmobile: r8a7790: add USB3.0 device node

[Yoshihiro Shimoda]

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 arch/arm/boot/dts/r8a7790.dtsi |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 2380fd5..16f8646 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1140,6 +1140,16 @@
 		status = "disabled";
 	};
 
+	xhci: usb@ee000000 {
+		compatible = "renesas,xhci-r8a7790";
+		reg = <0 0xee000000 0 0xc00>;
+		interrupts = <0 101 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp3_clks R8A7790_CLK_SSUSB>;
+		phys = <&usb2 1>;
+		phy-names = "usb";
+		status = "disabled";
+	};
+
 	pci0: pci@ee090000 {
 		compatible = "renesas,pci-r8a7790";
 		device_type = "pci";
-- 
1.7.9.5

[PATCH 2/2] ARM: shmobile: lager: enable USB3.0

[Yoshihiro Shimoda]

Since the PHY of USB3.0 and EHCI/OHCI ch2 are the same, the USB3.0
driver cannot use the phy driver when the EHCI/OHCI ch2 already used it:

phy phy-e6590100.usb-phy.3: phy init failed --> -16
xhci-hcd: probe of ee000000.usb failed with error -16

If so, we have to unbind the EHCI/OHCI ch2, and then we have to bind
the USB3.0 driver as the following:

  echo 0000:02:02.0 > /sys/bus/pci/drivers/ehci-pci/unbind
  echo 0000:02:01.0 > /sys/bus/pci/drivers/ohci-pci/unbind
  echo ee000000.usb > /sys/bus/platform/drivers/xhci-hcd/bind

Note that there will be pinctrl-related error messages if both
internal PCI and USB3.0 are enabled but they should be just ignored:

sh-pfc e6060000.pfc: pin GP_5_22 already requested by ee0d0000.pci; cannot claim for ee000000.usb
sh-pfc e6060000.pfc: pin-182 (ee000000.usb) status -22
ata1: SATA link down (SStatus 0 SControl 300)
sh-pfc e6060000.pfc: could not request pin 182 (GP_5_22) from group usb2  on device sh-pfc

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 arch/arm/boot/dts/r8a7790-lager.dts |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 719979e..3f51be1 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -419,6 +419,12 @@
 	pinctrl-names = "default";
 };
 
+&xhci {
+	status = "okay";
+	pinctrl-0 = <&usb2_pins>;
+	pinctrl-names = "default";
+};
+
 &pci2 {
 	status = "okay";
 	pinctrl-0 = <&usb2_pins>;
-- 
1.7.9.5

[PATCH 2/2] ARM: shmobile: lager: enable USB3.0

[Yoshihiro Shimoda]

Since the PHY of USB3.0 and EHCI/OHCI ch2 are the same, the USB3.0
driver cannot use the phy driver when the EHCI/OHCI ch2 already used it:

phy phy-e6590100.usb-phy.3: phy init failed --> -16
xhci-hcd: probe of ee000000.usb failed with error -16

If so, we have to unbind the EHCI/OHCI ch2, and then we have to bind
the USB3.0 driver as the following:

  echo 0000:02:02.0 > /sys/bus/pci/drivers/ehci-pci/unbind
  echo 0000:02:01.0 > /sys/bus/pci/drivers/ohci-pci/unbind
  echo ee000000.usb > /sys/bus/platform/drivers/xhci-hcd/bind

Note that there will be pinctrl-related error messages if both
internal PCI and USB3.0 are enabled but they should be just ignored:

sh-pfc e6060000.pfc: pin GP_5_22 already requested by ee0d0000.pci; cannot claim for ee000000.usb
sh-pfc e6060000.pfc: pin-182 (ee000000.usb) status -22
ata1: SATA link down (SStatus 0 SControl 300)
sh-pfc e6060000.pfc: could not request pin 182 (GP_5_22) from group usb2  on device sh-pfc

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 arch/arm/boot/dts/r8a7790-lager.dts |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 719979e..3f51be1 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -419,6 +419,12 @@
 	pinctrl-names = "default";
 };
 
+&xhci {
+	status = "okay";
+	pinctrl-0 = <&usb2_pins>;
+	pinctrl-names = "default";
+};
+
 &pci2 {
 	status = "okay";
 	pinctrl-0 = <&usb2_pins>;
-- 
1.7.9.5

Re: [PATCH 0/2] ARM: shmobile: add USB3.0 device node on r8a7790

[Simon Horman]

On Wed, Oct 08, 2014 at 03:24:28PM +0900, Yoshihiro Shimoda wrote:
>  This series is based on Simon's renesas.git branch and
> renesas-devel-20141007-v3.17 tag. If we use the generic phy
> driver for R-Car Gen2 (drivers/phy/phy-rcar-gen2.c), we can use
> the USB3.0 on lager.
> 
> Yoshihiro Shimoda (2):
>   ARM: shmobile: r8a7790: add USB3.0 device node
>   ARM: shmobile: lager: enable USB3.0
> 
>  arch/arm/boot/dts/r8a7790-lager.dts |    6 ++++++
>  arch/arm/boot/dts/r8a7790.dtsi      |   10 ++++++++++
>  2 files changed, 16 insertions(+)

Hi Shimoda-san,

could you update me on the status of this patch.
Should I queue it up?

Re: [PATCH 0/2] ARM: shmobile: add USB3.0 device node on r8a7790

[Simon Horman]

On Wed, Oct 08, 2014 at 03:24:28PM +0900, Yoshihiro Shimoda wrote:
>  This series is based on Simon's renesas.git branch and
> renesas-devel-20141007-v3.17 tag. If we use the generic phy
> driver for R-Car Gen2 (drivers/phy/phy-rcar-gen2.c), we can use
> the USB3.0 on lager.
> 
> Yoshihiro Shimoda (2):
>   ARM: shmobile: r8a7790: add USB3.0 device node
>   ARM: shmobile: lager: enable USB3.0
> 
>  arch/arm/boot/dts/r8a7790-lager.dts |    6 ++++++
>  arch/arm/boot/dts/r8a7790.dtsi      |   10 ++++++++++
>  2 files changed, 16 insertions(+)

Hi Shimoda-san,

could you update me on the status of this patch.
Should I queue it up?

RE: [PATCH 0/2] ARM: shmobile: add USB3.0 device node on r8a7790

[yoshihiro shimoda]

Hi Simon-san,

> On Wed, Oct 08, 2014 at 03:24:28PM +0900, Yoshihiro Shimoda wrote:
> >  This series is based on Simon's renesas.git branch and
> > renesas-devel-20141007-v3.17 tag. If we use the generic phy driver for
> > R-Car Gen2 (drivers/phy/phy-rcar-gen2.c), we can use the USB3.0 on
> > lager.
> >
> > Yoshihiro Shimoda (2):
> >   ARM: shmobile: r8a7790: add USB3.0 device node
> >   ARM: shmobile: lager: enable USB3.0
> >
> >  arch/arm/boot/dts/r8a7790-lager.dts |    6 ++++++
> >  arch/arm/boot/dts/r8a7790.dtsi      |   10 ++++++++++
> >  2 files changed, 16 insertions(+)
> 
> Hi Shimoda-san,
> 
> could you update me on the status of this patch.
> Should I queue it up?

Yes.
So, should I rebase this patch serias on the current your repository?

Best regards,
Yoshihiro Shimoda

Re: [PATCH 0/2] ARM: shmobile: add USB3.0 device node on r8a7790

[Simon Horman]

On Fri, Oct 24, 2014 at 04:44:28AM +0000, yoshihiro shimoda wrote:
> Hi Simon-san,
> 
> > On Wed, Oct 08, 2014 at 03:24:28PM +0900, Yoshihiro Shimoda wrote:
> > >  This series is based on Simon's renesas.git branch and
> > > renesas-devel-20141007-v3.17 tag. If we use the generic phy driver for
> > > R-Car Gen2 (drivers/phy/phy-rcar-gen2.c), we can use the USB3.0 on
> > > lager.
> > >
> > > Yoshihiro Shimoda (2):
> > >   ARM: shmobile: r8a7790: add USB3.0 device node
> > >   ARM: shmobile: lager: enable USB3.0
> > >
> > >  arch/arm/boot/dts/r8a7790-lager.dts |    6 ++++++
> > >  arch/arm/boot/dts/r8a7790.dtsi      |   10 ++++++++++
> > >  2 files changed, 16 insertions(+)
> > 
> > Hi Shimoda-san,
> > 
> > could you update me on the status of this patch.
> > Should I queue it up?
> 
> Yes.
> So, should I rebase this patch serias on the current your repository?

Yes, please rebase it on renesas-devel-20141024-v3.18-rc1

Re: [PATCH 0/2] ARM: shmobile: add USB3.0 device node on r8a7790

[Simon Horman]

On Fri, Oct 24, 2014 at 04:44:28AM +0000, yoshihiro shimoda wrote:
> Hi Simon-san,
> 
> > On Wed, Oct 08, 2014 at 03:24:28PM +0900, Yoshihiro Shimoda wrote:
> > >  This series is based on Simon's renesas.git branch and
> > > renesas-devel-20141007-v3.17 tag. If we use the generic phy driver for
> > > R-Car Gen2 (drivers/phy/phy-rcar-gen2.c), we can use the USB3.0 on
> > > lager.
> > >
> > > Yoshihiro Shimoda (2):
> > >   ARM: shmobile: r8a7790: add USB3.0 device node
> > >   ARM: shmobile: lager: enable USB3.0
> > >
> > >  arch/arm/boot/dts/r8a7790-lager.dts |    6 ++++++
> > >  arch/arm/boot/dts/r8a7790.dtsi      |   10 ++++++++++
> > >  2 files changed, 16 insertions(+)
> > 
> > Hi Shimoda-san,
> > 
> > could you update me on the status of this patch.
> > Should I queue it up?
> 
> Yes.
> So, should I rebase this patch serias on the current your repository?

Yes, please rebase it on renesas-devel-20141024-v3.18-rc1