[PATCH 0/6] arm64: renesas: add USB 2.0 device nodes for r8a7795

[PATCH 0/6] arm64: renesas: add USB 2.0 device nodes for r8a7795

[Yoshihiro Shimoda]

This patch set is based on the renesas.git / 20151221renesas-devel-20151221-v4.4-rc6 tag.
(commit id = fe0e8e675dedf1877709a17258e88151c2614b77)

Yoshihiro Shimoda (6):
  arm64: renesas: r8a7795: add usb2_phy device nodes
  arm64: renesas: r8a7795: add USB2.0 Host (EHCI/OHCI) device nodes
  arm64: renesas: r8a7795: add HS-USB device node
  arm64: renesas: salvator-x: enable usb2_phy
  arm64: renesas: salvator-x: enable USB 2.0 Host channel 1 and 2
  arm64: renesas: salvator-x: enable HS-USB

 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts |  54 +++++++++-
 arch/arm64/boot/dts/renesas/r8a7795.dtsi           | 113 +++++++++++++++++++++
 2 files changed, 166 insertions(+), 1 deletion(-)

-- 
1.9.1

[PATCH 1/6] arm64: renesas: r8a7795: add usb2_phy device nodes

[Yoshihiro Shimoda]

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

diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index bb353cd..89393ea 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -775,5 +775,39 @@
 			clocks = <&cpg CPG_MOD 815>;
 			status = "disabled";
 		};
+
+		usb2_phy0: usb-phy@ee080200 {
+			compatible = "renesas,usb2-phy-r8a7795";
+			reg = <0 0xee080200 0 0x700>, <0 0xe6590100 0 0x100>;
+			reg-names = "usb2_host", "hsusb";
+			interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 703>, <&cpg CPG_MOD 704>;
+			clock-names = "usb2", "hsusb";
+			power-domains = <&cpg>;
+			#phy-cells = <0>;
+			status = "disabled";
+		};
+
+		usb2_phy1: usb-phy@ee0a0200 {
+			compatible = "renesas,usb2-phy-r8a7795";
+			reg = <0 0xee0a0200 0 0x700>;
+			reg-names = "usb2_host";
+			clocks = <&cpg CPG_MOD 702>;
+			clock-names = "usb2";
+			power-domains = <&cpg>;
+			#phy-cells = <0>;
+			status = "disabled";
+		};
+
+		usb2_phy2: usb-phy@ee0c0200 {
+			compatible = "renesas,usb2-phy-r8a7795";
+			reg = <0 0xee0c0200 0 0x700>;
+			reg-names = "usb2_host";
+			clocks = <&cpg CPG_MOD 701>;
+			clock-names = "usb2";
+			power-domains = <&cpg>;
+			#phy-cells = <0>;
+			status = "disabled";
+		};
 	};
 };
-- 
1.9.1

[PATCH 2/6] arm64: renesas: r8a7795: add USB2.0 Host (EHCI/OHCI) device nodes

[Yoshihiro Shimoda]

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

diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 89393ea..e26073c 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -809,5 +809,71 @@
 			#phy-cells = <0>;
 			status = "disabled";
 		};
+
+		ehci0: usb@ee080100 {
+			compatible = "renesas,ehci-r8a7795", "generic-ehci";
+			reg = <0 0xee080100 0 0xff>;
+			interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 703>;
+			phys = <&usb2_phy0>;
+			phy-names = "usb";
+			power-domains = <&cpg>;
+			status = "disabled";
+		};
+
+		ehci1: usb@ee0a0100 {
+			compatible = "renesas,ehci-r8a7795", "generic-ehci";
+			reg = <0 0xee0a0100 0 0xff>;
+			interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 702>;
+			phys = <&usb2_phy1>;
+			phy-names = "usb";
+			power-domains = <&cpg>;
+			status = "disabled";
+		};
+
+		ehci2: usb@ee0c0100 {
+			compatible = "renesas,ehci-r8a7795", "generic-ehci";
+			reg = <0 0xee0c0100 0 0xff>;
+			interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 701>;
+			phys = <&usb2_phy2>;
+			phy-names = "usb";
+			power-domains = <&cpg>;
+			status = "disabled";
+		};
+
+		ohci0: usb@ee080000 {
+			compatible = "renesas,ohci-r8a7795", "generic-ohci";
+			reg = <0 0xee080000 0 0xff>;
+			interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 703>;
+			phys = <&usb2_phy0>;
+			phy-names = "usb";
+			power-domains = <&cpg>;
+			status = "disabled";
+		};
+
+		ohci1: usb@ee0a0000 {
+			compatible = "renesas,ohci-r8a7795", "generic-ohci";
+			reg = <0 0xee0a0000 0 0xff>;
+			interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 702>;
+			phys = <&usb2_phy1>;
+			phy-names = "usb";
+			power-domains = <&cpg>;
+			status = "disabled";
+		};
+
+		ohci2: usb@ee0c0000 {
+			compatible = "renesas,ohci-r8a7795", "generic-ohci";
+			reg = <0 0xee0c0000 0 0xff>;
+			interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 701>;
+			phys = <&usb2_phy2>;
+			phy-names = "usb";
+			power-domains = <&cpg>;
+			status = "disabled";
+		};
 	};
 };
-- 
1.9.1

[PATCH 3/6] arm64: renesas: r8a7795: add HS-USB device node

[Yoshihiro Shimoda]

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

diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index e26073c..4bccfb2b 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -875,5 +875,18 @@
 			power-domains = <&cpg>;
 			status = "disabled";
 		};
+
+		hsusb: usb@e6590000 {
+			compatible = "renesas,usbhs-r8a7795",
+				     "renesas,rcar-gen3-usbhs";
+			reg = <0 0xe6590000 0 0x100>;
+			interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 704>;
+			renesas,buswait = <11>;
+			phys = <&usb2_phy0>;
+			phy-names = "usb";
+			power-domains = <&cpg>;
+			status = "disabled";
+		};
 	};
 };
-- 
1.9.1

[PATCH 4/6] arm64: renesas: salvator-x: enable usb2_phy

[Yoshihiro Shimoda]

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 34 +++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
index 265d12f..7353407 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
@@ -122,8 +122,22 @@
 				 "audio_clkout_a", "audio_clkout3_a";
 		renesas,function = "audio_clk";
 	};
-};
 
+	usb0_pins: usb0 {
+		renesas,groups = "usb0";
+		renesas,function = "usb";
+	};
+
+	usb1_pins: usb1 {
+		renesas,groups = "usb1";
+		renesas,function = "usb";
+	};
+
+	usb2_pins: usb2 {
+		renesas,groups = "usb2";
+		renesas,function = "usb";
+	};
+};
 &scif1 {
 	pinctrl-0 = <&scif1_pins>;
 	pinctrl-names = "default";
@@ -249,3 +263,21 @@
 		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
 	};
 };
+
+&usb2_phy0 {
+	status = "okay";
+	pinctrl-0 = <&usb0_pins>;
+	pinctrl-names = "default";
+};
+
+&usb2_phy1 {
+	status = "okay";
+	pinctrl-0 = <&usb1_pins>;
+	pinctrl-names = "default";
+};
+
+&usb2_phy2 {
+	status = "okay";
+	pinctrl-0 = <&usb2_pins>;
+	pinctrl-names = "default";
+};
-- 
1.9.1

[PATCH 5/6] arm64: renesas: salvator-x: enable USB 2.0 Host channel 1 and 2

[Yoshihiro Shimoda]

This patch doesn't enable USB2.0 Host channel 0 because it is connected
to MAX3355 and cannot control the SHDN pin for now.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
index 7353407..8e9cd31 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
@@ -281,3 +281,19 @@
 	pinctrl-0 = <&usb2_pins>;
 	pinctrl-names = "default";
 };
+
+&ehci1 {
+	status = "okay";
+};
+
+&ehci2 {
+	status = "okay";
+};
+
+&ohci1 {
+	status = "okay";
+};
+
+&ohci2 {
+	status = "okay";
+};
-- 
1.9.1

[PATCH 6/6] arm64: renesas: salvator-x: enable HS-USB

[Yoshihiro Shimoda]

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
index 8e9cd31..eb16403 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
@@ -297,3 +297,7 @@
 &ohci2 {
 	status = "okay";
 };
+
+&hsusb {
+	status = "okay";
+};
-- 
1.9.1

Re: [PATCH 2/6] arm64: renesas: r8a7795: add USB2.0 Host (EHCI/OHCI) device nodes

[Sergei Shtylyov]

Hello.

On 12/25/2015 1:03 PM, Yoshihiro Shimoda wrote:

> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> ---
>   arch/arm64/boot/dts/renesas/r8a7795.dtsi | 66 ++++++++++++++++++++++++++++++++
>   1 file changed, 66 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> index 89393ea..e26073c 100644
> --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> @@ -809,5 +809,71 @@
>   			#phy-cells = <0>;
>   			status = "disabled";
>   		};
> +
> +		ehci0: usb@ee080100 {
> +			compatible = "renesas,ehci-r8a7795", "generic-ehci";
> +			reg = <0 0xee080100 0 0xff>;

    s/0xff/0x100? This is size, not limit.

> +			interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&cpg CPG_MOD 703>;
> +			phys = <&usb2_phy0>;
> +			phy-names = "usb";
> +			power-domains = <&cpg>;
> +			status = "disabled";
> +		};
> +
> +		ehci1: usb@ee0a0100 {
> +			compatible = "renesas,ehci-r8a7795", "generic-ehci";
> +			reg = <0 0xee0a0100 0 0xff>;

    Likewise?

> +			interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&cpg CPG_MOD 702>;
> +			phys = <&usb2_phy1>;
> +			phy-names = "usb";
> +			power-domains = <&cpg>;
> +			status = "disabled";
> +		};
> +
> +		ehci2: usb@ee0c0100 {
> +			compatible = "renesas,ehci-r8a7795", "generic-ehci";
> +			reg = <0 0xee0c0100 0 0xff>;

    Likewise?

> +			interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&cpg CPG_MOD 701>;
> +			phys = <&usb2_phy2>;
> +			phy-names = "usb";
> +			power-domains = <&cpg>;
> +			status = "disabled";
> +		};
> +
> +		ohci0: usb@ee080000 {
> +			compatible = "renesas,ohci-r8a7795", "generic-ohci";
> +			reg = <0 0xee080000 0 0xff>;

    Likewise?

> +			interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&cpg CPG_MOD 703>;
> +			phys = <&usb2_phy0>;
> +			phy-names = "usb";
> +			power-domains = <&cpg>;
> +			status = "disabled";
> +		};
> +
> +		ohci1: usb@ee0a0000 {
> +			compatible = "renesas,ohci-r8a7795", "generic-ohci";
> +			reg = <0 0xee0a0000 0 0xff>;

    Likewise?

> +			interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&cpg CPG_MOD 702>;
> +			phys = <&usb2_phy1>;
> +			phy-names = "usb";
> +			power-domains = <&cpg>;
> +			status = "disabled";
> +		};
> +
> +		ohci2: usb@ee0c0000 {
> +			compatible = "renesas,ohci-r8a7795", "generic-ohci";
> +			reg = <0 0xee0c0000 0 0xff>;

    Likewise?

[...]

MBR, Sergei

RE: [PATCH 2/6] arm64: renesas: r8a7795: add USB2.0 Host (EHCI/OHCI) device nodes

[Yoshihiro Shimoda]

Hello,

> From: Sergei Shtylyov
> Sent: Friday, December 25, 2015 8:36 PM
> 
> Hello.
> 
> On 12/25/2015 1:03 PM, Yoshihiro Shimoda wrote:
> 
> > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > ---
> >   arch/arm64/boot/dts/renesas/r8a7795.dtsi | 66 ++++++++++++++++++++++++++++++++
> >   1 file changed, 66 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> > index 89393ea..e26073c 100644
> > --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> > @@ -809,5 +809,71 @@
> >   			#phy-cells = <0>;
> >   			status = "disabled";
> >   		};
> > +
> > +		ehci0: usb@ee080100 {
> > +			compatible = "renesas,ehci-r8a7795", "generic-ehci";
> > +			reg = <0 0xee080100 0 0xff>;
> 
>     s/0xff/0x100? This is size, not limit.

Thank you for the point! I will fix all nodes about this.

Best regards,
Yoshihiro Shimoda

Re: [PATCH 4/6] arm64: renesas: salvator-x: enable usb2_phy

[Geert Uytterhoeven]

Hi Shimoda-san,

On Fri, Dec 25, 2015 at 11:03 AM, Yoshihiro Shimoda
<yoshihiro.shimoda.uh@renesas.com> wrote:
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> ---
>  arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 34 +++++++++++++++++++++-
>  1 file changed, 33 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
> index 265d12f..7353407 100644
> --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
> +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
> @@ -122,8 +122,22 @@
>                                  "audio_clkout_a", "audio_clkout3_a";
>                 renesas,function = "audio_clk";
>         };
> -};
>
> +       usb0_pins: usb0 {
> +               renesas,groups = "usb0";
> +               renesas,function = "usb";
> +       };
> +
> +       usb1_pins: usb1 {
> +               renesas,groups = "usb1";
> +               renesas,function = "usb";
> +       };
> +
> +       usb2_pins: usb2 {
> +               renesas,groups = "usb2";
> +               renesas,function = "usb";
> +       };

sh-pfc e6060000.pfc: function 'usb' not supported
sh-pfc e6060000.pfc: invalid function usb in map table
sh-pfc e6060000.pfc: function 'usb' not supported
sh-pfc e6060000.pfc: invalid function usb in map table
sh-pfc e6060000.pfc: function 'usb' not supported
sh-pfc e6060000.pfc: invalid function usb in map table

As the usb patches for pfc-r8a7795 haven't been posted yet, it's difficult
to test/comment.

Note that the functions were called "usb%u" in a previous version, and in the
pfc-r8a7795 code in the BSP.

Can you please post the pfc-r8a7795 patches, too?

Thanks!

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 4/6] arm64: renesas: salvator-x: enable usb2_phy

[Yoshihiro Shimoda]

Hi Geert-san,

> From: Geert Uytterhoeven
> Sent: Tuesday, January 05, 2016 9:56 PM
> 
> Hi Shimoda-san,
> 
> On Fri, Dec 25, 2015 at 11:03 AM, Yoshihiro Shimoda
> <yoshihiro.shimoda.uh@renesas.com> wrote:
> > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > ---
> >  arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 34 +++++++++++++++++++++-
> >  1 file changed, 33 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
> > index 265d12f..7353407 100644
> > --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
> > +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
> > @@ -122,8 +122,22 @@
> >                                  "audio_clkout_a", "audio_clkout3_a";
> >                 renesas,function = "audio_clk";
> >         };
> > -};
> >
> > +       usb0_pins: usb0 {
> > +               renesas,groups = "usb0";
> > +               renesas,function = "usb";
> > +       };
> > +
> > +       usb1_pins: usb1 {
> > +               renesas,groups = "usb1";
> > +               renesas,function = "usb";
> > +       };
> > +
> > +       usb2_pins: usb2 {
> > +               renesas,groups = "usb2";
> > +               renesas,function = "usb";
> > +       };
> 
> sh-pfc e6060000.pfc: function 'usb' not supported
> sh-pfc e6060000.pfc: invalid function usb in map table
> sh-pfc e6060000.pfc: function 'usb' not supported
> sh-pfc e6060000.pfc: invalid function usb in map table
> sh-pfc e6060000.pfc: function 'usb' not supported
> sh-pfc e6060000.pfc: invalid function usb in map table
> 
> As the usb patches for pfc-r8a7795 haven't been posted yet, it's difficult
> to test/comment.
> 
> Note that the functions were called "usb%u" in a previous version, and in the
> pfc-r8a7795 code in the BSP.
> 
> Can you please post the pfc-r8a7795 patches, too?

Thank you for the point. I overlooked these error messages because
usb host functions worked correctly...

Anyway, I will make the pfc-r8a7795 patches for it later.

Best regards,
Yoshihiro Shimoda

> Thanks!
> 
> 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