Skip to contentSkip to conversation

Add R8A7791/Koelsch/Henninger board PCI DT support

PATCH Superseded Sergei Shtylyov 3 participants 7 messages Jun 24, 2014 – Jul 8, 2014

Subsystems (2)
Device tree bindings SuperH

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Sergei Shtylyov

author
#0 lore raw

v4 cover Add R8A7791/Koelsch/Henninger board PCI DT support

Hello.

Here's the set of 3 patches against Simon Horman's 'renesas.git' repo,
'renesas-devel-v3.16-rc2-20140623' tag. Here we add PCI USB device tree support for the R8A7791-based Koelsch and Henninger boards. As the 'pci-rcar-gen2' driver device tree support has been merged for 3.16, this patchset can now be merged too...

[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

author
#1 lore raw

PATCH v4 1/3 ARM: shmobile: r8a7791: add internal PCI bridge nodes

Add device nodes for the R8A7791 internal PCI bridge devices.

Signed-off-by Sergei Shtylyov <[email protected]>

---
Changes in version 4:
- added "device_type" and "ranges" properties to the PCI bridge nodes;
- removed "0x" prefix from zero values in the "reg" properties.

Changes in version 3:
- refreshed the patch.

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

 arch/arm/boot/dts/r8a7791.dtsi |   40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
arch/arm/boot/dts/r8a7791.dtsi +40 -0
Index: renesas/arch/arm/boot/dts/r8a7791.dtsi
===================================================================
@@ -961,6 +961,46 @@
 		status = "disabled";
 	};
 
+	pci0: pci at ee090000 {
+		compatible = "renesas,pci-r8a7791";
+		device_type = "pci";
+		clocks = <&mstp7_clks R8A7791_CLK_EHCI>;
+		reg = <0 0xee090000 0 0xc00>,
+		      <0 0xee080000 0 0x1100>;
+		interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;
+		status = "disabled";
+
+		bus-range = <0 0>;
+		#address-cells = <3>;
+		#size-cells = <2>;
+		#interrupt-cells = <1>;
+		ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
+		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 at ee0d0000 {
+		compatible = "renesas,pci-r8a7791";
+		device_type = "pci";
+		clocks = <&mstp7_clks R8A7791_CLK_EHCI>;
+		reg = <0 0xee0d0000 0 0xc00>,
+		      <0 0xee0c0000 0 0x1100>;
+		interrupts = <0 113 IRQ_TYPE_LEVEL_HIGH>;
+		status = "disabled";
+
+		bus-range = <1 1>;
+		#address-cells = <3>;
+		#size-cells = <2>;
+		#interrupt-cells = <1>;
+		ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
+		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>;
+	};
+
 	pciec: pcie at fe000000 {
 		compatible = "renesas,pcie-r8a7791";
 		reg = <0 0xfe000000 0 0x80000>;
author
#2 lore raw

PATCH v4 2/3 ARM: shmobile: koelsch: enable internal PCI

In reply to Sergei Shtylyov

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

Signed-off-by Sergei Shtylyov <[email protected]>

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

Changes in version 2:
- refreshed the patch.

 arch/arm/boot/dts/r8a7791-koelsch.dts |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
arch/arm/boot/dts/r8a7791-koelsch.dts +22 -0
Index: renesas/arch/arm/boot/dts/r8a7791-koelsch.dts
===================================================================
@@ -279,6 +279,16 @@
 		renesas,groups = "i2c6";
 		renesas,function = "i2c6";
 	};
+
+	usb0_pins: usb0 {
+		renesas,groups = "usb0";
+		renesas,function = "usb0";
+	};
+
+	usb1_pins: usb1 {
+		renesas,groups = "usb1";
+		renesas,function = "usb1";
+	};
 };
 
 &ether {

@@ -426,6 +436,18 @@
 	};
 };
 
+&pci0 {
+	status = "okay";
+	pinctrl-0 = <&usb0_pins>;
+	pinctrl-names = "default";
+};
+
+&pci1 {
+	status = "okay";
+	pinctrl-0 = <&usb1_pins>;
+	pinctrl-names = "default";
+};
+
 &pcie_bus_clk {
 	status = "okay";
 };
author
#3 lore raw

PATCH v4 3/3 ARM: shmobile: henninger: enable internal PCI

In reply to Sergei Shtylyov

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

Signed-off-by Sergei Shtylyov <[email protected]>

---
Changes in version 4:
- moved the PCI bridge nodes before PCIe clock/bridge nodes.

Changes in version 3:
- refreshed the patch.

 arch/arm/boot/dts/r8a7791-henninger.dts |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
arch/arm/boot/dts/r8a7791-henninger.dts +22 -0
Index: renesas/arch/arm/boot/dts/r8a7791-henninger.dts
===================================================================
@@ -125,6 +125,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 {

@@ -231,6 +241,18 @@
 	};
 };
 
+&pci0 {
+	status = "okay";
+	pinctrl-0 = <&usb0_pins>;
+	pinctrl-names = "default";
+};
+
+&pci1 {
+	status = "okay";
+	pinctrl-0 = <&usb1_pins>;
+	pinctrl-names = "default";
+};
+
 &pcie_bus_clk {
 	status = "okay";
 };
#4 lore raw

v4 cover Add R8A7791/Koelsch/Henninger board PCI DT support

In reply to Sergei Shtylyov
Quoted 11 lines · On Tuesday 24 June 2014 22:07:31 Sergei Shtylyov wrote:

Here's the set of 3 patches against Simon Horman's 'renesas.git' repo,
'renesas-devel-v3.16-rc2-20140623' tag. Here we add PCI USB device tree support for the R8A7791-based Koelsch and Henninger boards. As the 'pci-rcar-gen2' driver device tree support has been merged for 3.16, this patchset can now be merged too...

[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

Acked-by Arnd Bergmann <[email protected]>
author
#5 lore raw

v4 cover Add R8A7791/Koelsch/Henninger board PCI DT support

Hello.

Quoted 11 lines · Arnd Bergmann
Quoted 9 lines

Here's the set of 3 patches against Simon Horman's 'renesas.git' repo,
'renesas-devel-v3.16-rc2-20140623' tag. Here we add PCI USB device tree support for the R8A7791-based Koelsch and Henninger boards. As the 'pci-rcar-gen2' driver device tree support has been merged for 3.16, this patchset can now be merged too...

[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

Acked-by Arnd Bergmann <[email protected]>

Simon, what's up with this series? You've merged analogous series for
R8A7790 but not this one. You followed up to an older version of it, asking me to re-post when the driver patch gets merged but it already had been merged already (and this version posted), and I got no reply from you then...

WBR, Sergei

#6 lore raw

v4 cover Add R8A7791/Koelsch/Henninger board PCI DT support

Quoted 14 lines · Sergei Shtylyov

Hello.

Quoted 9 lines · Arnd Bergmann
Quoted 9 lines

Here's the set of 3 patches against Simon Horman's 'renesas.git' repo,
'renesas-devel-v3.16-rc2-20140623' tag. Here we add PCI USB device tree support for the R8A7791-based Koelsch and Henninger boards. As the 'pci-rcar-gen2' driver device tree support has been merged for 3.16, this patchset can now be merged too...

[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

Quoted 7 lines
Quoted 1 line
Acked-by Arnd Bergmann <[email protected]>

Simon, what's up with this series? You've merged analogous series for
R8A7790 but not this one. You followed up to an older version of it, asking me to re-post when the driver patch gets merged but it already had been merged already (and this version posted), and I got no reply from you then...

Sorry about that and thanks for the reminder.
I have now queued up this series.