[PATCH v2 0/3] Add R8A7791/Koelsch/Henninger board PCI DT support

[PATCH v2 0/3] Add R8A7791/Koelsch/Henninger board PCI DT support

[Sergei Shtylyov]

Hello.

   Here's the set of 3 patches against Simon Horman's 'renesas.git' repo,
'renesas-devel-v3.15-rc5-20140517' tag. Here we add internal PCI support for
the R8A7791-based Koelsch and Henninger boards for the sake of getting USB
EHCI/OHCI working...

[1/3] ARM: shmobile: r8a7791: add internal PCI bridge nodes
[2/3] ARM: shmobile: koelsch: enable internal PCI
[3/3] ARM: shmobile: henninger: enable internal PCI

WBR, Sergei

[PATCH v2 1/3] ARM: shmobile: r8a7791: add internal PCI bridge nodes

[Sergei Shtylyov]

Add device nodes for the R8A7791 internal PCI bridge devices.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
Changes in version 2:
- added interrupt-related properties to the PCI device nodes;
- refreshed the patch.

 arch/arm/boot/dts/r8a7791.dtsi |   36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

Index: renesas/arch/arm/boot/dts/r8a7791.dtsi
===================================================================
--- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi
+++ renesas/arch/arm/boot/dts/r8a7791.dtsi
@@ -880,4 +880,40 @@
 		#size-cells = <0>;
 		status = "disabled";
 	};
+
+	pci0: pci@ee090000 {
+		compatible = "renesas,pci-r8a7791";
+		clocks = <&mstp7_clks R8A7791_CLK_EHCI>;
+		reg = <0x0 0xee090000 0x0 0xc00>,
+		      <0x0 0xee080000 0x0 0x1100>;
+		interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;
+		status = "disabled";
+
+		bus-range = <0 0>;
+		#address-cells = <3>;
+		#size-cells = <2>;
+		#interrupt-cells = <1>;
+		interrupt-map-mask = <0xff00 0 0 0x7>;
+		interrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
+			      	 0x0800 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
+			      	 0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>;
+	};
+
+	pci1: pci@ee0d0000 {
+		compatible = "renesas,pci-r8a7791";
+		clocks = <&mstp7_clks R8A7791_CLK_EHCI>;
+		reg = <0x0 0xee0d0000 0x0 0xc00>,
+		      <0x0 0xee0c0000 0x0 0x1100>;
+		interrupts = <0 113 IRQ_TYPE_LEVEL_HIGH>;
+		status = "disabled";
+
+		bus-range = <1 1>;
+		#address-cells = <3>;
+		#size-cells = <2>;
+		#interrupt-cells = <1>;
+		interrupt-map-mask = <0xff00 0 0 0x7>;
+		interrupt-map = <0x0000 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
+			      	 0x0800 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
+			      	 0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
+	};
 };

[PATCH v2 2/3] ARM: shmobile: koelsch: enable internal PCI

[Sergei Shtylyov]

Enable internal AHB-PCI bridges for the USB EHCI/OHCI controllers attached to
them.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
Changes in version 2:
- refreshed the patch.

 arch/arm/boot/dts/r8a7791-koelsch.dts |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

Index: renesas/arch/arm/boot/dts/r8a7791-koelsch.dts
===================================================================
--- renesas.orig/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ renesas/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -293,6 +293,16 @@
 				 "msiof0_tx";
 		renesas,function = "msiof0";
 	};
+
+	usb0_pins: usb0 {
+		renesas,groups = "usb0";
+		renesas,function = "usb0";
+	};
+
+	usb1_pins: usb1 {
+		renesas,groups = "usb1";
+		renesas,function = "usb1";
+	};
 };
 
 &ether {
@@ -408,3 +418,15 @@
 		spi-cpha;
 	};
 };
+
+&pci0 {
+	status = "okay";
+	pinctrl-0 = <&usb0_pins>;
+	pinctrl-names = "default";
+};
+
+&pci1 {
+	status = "okay";
+	pinctrl-0 = <&usb1_pins>;
+	pinctrl-names = "default";
+};

[PATCH v2 3/3] ARM: shmobile: henninger: enable internal PCI

[Sergei Shtylyov]

Enable internal AHB-PCI bridges for the USB EHCI/OHCI controllers attached to
them.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
 arch/arm/boot/dts/r8a7791-henninger.dts |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

Index: renesas/arch/arm/boot/dts/r8a7791-henninger.dts
===================================================================
--- renesas.orig/arch/arm/boot/dts/r8a7791-henninger.dts
+++ renesas/arch/arm/boot/dts/r8a7791-henninger.dts
@@ -120,6 +120,16 @@
 				 "msiof0_tx";
 		renesas,function = "msiof0";
 	};
+
+	usb0_pins: usb0 {
+		renesas,groups = "usb0";
+		renesas,function = "usb0";
+	};
+
+	usb1_pins: usb1 {
+		renesas,groups = "usb1";
+		renesas,function = "usb1";
+	};
 };
 
 &scif0 {
@@ -217,3 +227,15 @@
 		spi-cpha;
 	};
 };
+
+&pci0 {
+	status = "okay";
+	pinctrl-0 = <&usb0_pins>;
+	pinctrl-names = "default";
+};
+
+&pci1 {
+	status = "okay";
+	pinctrl-0 = <&usb1_pins>;
+	pinctrl-names = "default";
+};

Re: [PATCH v2 1/3] ARM: shmobile: r8a7791: add internal PCI bridge nodes

[Arnd Bergmann]

On Tuesday 20 May 2014 01:52:05 Sergei Shtylyov wrote:
> +               interrupt-map-mask = <0xff00 0 0 0x7>;
> +               interrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
> +                                0x0800 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
> +                                0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>;

Are there only internal devices on this PCI host?

If there are slots, the map should normally list all four interrupts
per slot in some way.

	Arnd

Re: [PATCH v2 1/3] ARM: shmobile: r8a7791: add internal PCI bridge nodes

[Sergei Shtylyov]

Hello.

On 20-05-2014 12:04, Arnd Bergmann wrote:

>> +               interrupt-map-mask = <0xff00 0 0 0x7>;
>> +               interrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
>> +                                0x0800 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
>> +                                0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>;

> Are there only internal devices on this PCI host?

    Yes, and all populated device slots are listed.

> 	Arnd

WBR, Sergei

Re: [PATCH v2 0/3] Add R8A7791/Koelsch/Henninger board PCI DT support

[Sergei Shtylyov]

Hello.

On 05/20/2014 01:48 AM, Sergei Shtylyov wrote:

>     Here's the set of 3 patches against Simon Horman's 'renesas.git' repo,
> 'renesas-devel-v3.15-rc5-20140517' tag. Here we add internal PCI support for
> the R8A7791-based Koelsch and Henninger boards for the sake of getting USB
> EHCI/OHCI working...

    Forgot to mention that it depends on the internal PCI bridge device tree 
support reposted just before these patches...

> [1/3] ARM: shmobile: r8a7791: add internal PCI bridge nodes
> [2/3] ARM: shmobile: koelsch: enable internal PCI
> [3/3] ARM: shmobile: henninger: enable internal PCI

WBR, Sergei

Re: [PATCH v2 0/3] Add R8A7791/Koelsch/Henninger board PCI DT support

[Simon Horman]

On Tue, May 20, 2014 at 10:20:32PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 05/20/2014 01:48 AM, Sergei Shtylyov wrote:
> 
> >    Here's the set of 3 patches against Simon Horman's 'renesas.git' repo,
> >'renesas-devel-v3.15-rc5-20140517' tag. Here we add internal PCI support for
> >the R8A7791-based Koelsch and Henninger boards for the sake of getting USB
> >EHCI/OHCI working...
> 
>    Forgot to mention that it depends on the internal PCI bridge device tree
> support reposted just before these patches...
> 
> >[1/3] ARM: shmobile: r8a7791: add internal PCI bridge nodes
> >[2/3] ARM: shmobile: koelsch: enable internal PCI
> >[3/3] ARM: shmobile: henninger: enable internal PCI

Thanks, please repost these patches when the device tree support

Re: [PATCH v2 0/3] Add R8A7791/Koelsch/Henninger board PCI DT support

[Sergei Shtylyov]

Hello.

On 06/28/2014 03:59 AM, Simon Horman wrote:

>>>     Here's the set of 3 patches against Simon Horman's 'renesas.git' repo,
>>> 'renesas-devel-v3.15-rc5-20140517' tag. Here we add internal PCI support for
>>> the R8A7791-based Koelsch and Henninger boards for the sake of getting USB
>>> EHCI/OHCI working...

>>     Forgot to mention that it depends on the internal PCI bridge device tree
>> support reposted just before these patches...

>>> [1/3] ARM: shmobile: r8a7791: add internal PCI bridge nodes
>>> [2/3] ARM: shmobile: koelsch: enable internal PCI
>>> [3/3] ARM: shmobile: henninger: enable internal PCI

> Thanks, please repost these patches when the device tree support

    Where did you get that old stuff? The current version of this patchset is 
4, not 2!

WBR, Sergei