Skip to contentSkip to conversation

ARM: shmobile: lager: add PCI USB host controllers

PATCH In review Ulrich Hecht 2 participants 3 messages Nov 20, 2013 – Nov 21, 2013

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 9/9 ARM: shmobile: lager: add PCI USB host controllers

Adds USB1 and 2 as hosts and binds them to the USB phy.

---
 arch/arm/mach-shmobile/Kconfig       |  1 +
 arch/arm/mach-shmobile/board-lager.c | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
arch/arm/mach-shmobile/Kconfig +1 -0
index 557f55c..e93812f 100644
@@ -244,6 +244,7 @@ config MACH_LAGER
 	bool "Lager board"
 	depends on ARCH_R8A7790
 	select USE_OF
+	select PCI
 
 config MACH_LAGER_REFERENCE
 	bool "Lager board - Reference Device Tree Implementation"
arch/arm/mach-shmobile/board-lager.c +23 -0
index efe242d8..71d4482 100644
@@ -271,6 +271,17 @@ static const struct resource usbhs_phy_resources[] __initconst = {
 	DEFINE_RES_MEM(0xe6590100, 0x100),
 };
 
+static const struct resource usbhs_pci1_resources[] __initconst = {
+	DEFINE_RES_MEM(0xee0b0000, 0xc00),
+	DEFINE_RES_MEM(0xee0a0000, 0x1100),
+	DEFINE_RES_IRQ(gic_spi(112)),
+};
+static const struct resource usbhs_pci2_resources[] __initconst = {
+	DEFINE_RES_MEM(0xee0d0000, 0xc00),
+	DEFINE_RES_MEM(0xee0c0000, 0x1100),
+	DEFINE_RES_IRQ(gic_spi(113)),
+};
+
 static const struct pinctrl_map lager_pinctrl_map[] = {
 	/* DU (CN10: ARGB0, CN13: LVDS) */
 	PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7790", "pfc-r8a7790",
@@ -337,6 +348,18 @@ static void __init lager_add_standard_devices(void)
 					  sizeof(usbhs_phy_pdata));
 	lager_register_usbhs();
 
+	usb_bind_phy("0000:00:01.0", 0, "usb_phy_rcar_gen2");
+	usb_bind_phy("0000:00:02.0", 0, "usb_phy_rcar_gen2");
+	usb_bind_phy("0000:01:01.0", 0, "usb_phy_rcar_gen2");
+	usb_bind_phy("0000:01:02.0", 0, "usb_phy_rcar_gen2");
+
+	platform_device_register_simple("pci-rcar-gen2", 1,
+					usbhs_pci1_resources,
+					ARRAY_SIZE(usbhs_pci1_resources));
+	platform_device_register_simple("pci-rcar-gen2", 2,
+					usbhs_pci2_resources,
+					ARRAY_SIZE(usbhs_pci2_resources));
+
 	lager_add_du_device();
 }
 
Signature · 1 line
1.8.4
#1 lore raw
Quoted 43 lines · Ulrich Hecht

Adds USB1 and 2 as hosts and binds them to the USB phy.

---
  arch/arm/mach-shmobile/Kconfig       |  1 +
  arch/arm/mach-shmobile/board-lager.c | 23 +++++++++++++++++++++++
  2 files changed, 24 insertions(+)
arch/arm/mach-shmobile/Kconfig +1 -0
index 557f55c..e93812f 100644
@@ -244,6 +244,7 @@ config MACH_LAGER
  	bool "Lager board"
  	depends on ARCH_R8A7790
  	select USE_OF
+	select PCI
 
  config MACH_LAGER_REFERENCE
  	bool "Lager board - Reference Device Tree Implementation"
arch/arm/mach-shmobile/board-lager.c +11 -0
index efe242d8..71d4482 100644
@@ -271,6 +271,17 @@ static const struct resource usbhs_phy_resources[] __initconst = {
  	DEFINE_RES_MEM(0xe6590100, 0x100),
  };
 
+static const struct resource usbhs_pci1_resources[] __initconst = {
+	DEFINE_RES_MEM(0xee0b0000, 0xc00),
+	DEFINE_RES_MEM(0xee0a0000, 0x1100),
+	DEFINE_RES_IRQ(gic_spi(112)),
+};
+static const struct resource usbhs_pci2_resources[] __initconst = {
+	DEFINE_RES_MEM(0xee0d0000, 0xc00),
+	DEFINE_RES_MEM(0xee0c0000, 0x1100),
+	DEFINE_RES_IRQ(gic_spi(113)),
+};
+
  static const struct pinctrl_map lager_pinctrl_map[] = {
  	/* DU (CN10: ARGB0, CN13: LVDS) */
  	PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7790", "pfc-r8a7790",

arch/arm/mach-shmobile/board-lager.c static void __init lager_add_standard_devices(void) · line 352

Quoted 5 lines
arch/arm/mach-shmobile/board-lager.c +2 -0
@@ -337,6 +348,18 @@ static void __init lager_add_standard_devices(void)
  					  sizeof(usbhs_phy_pdata));
  	lager_register_usbhs();
 
+	usb_bind_phy("0000:00:01.0", 0, "usb_phy_rcar_gen2");
+	usb_bind_phy("0000:00:02.0", 0, "usb_phy_rcar_gen2");

You don't seem to register PCI controller 0 here. Thus, PCI bus 0 is the root bus of controller 1 which has nothing to do with the USB phy.

Quoted 4 lines
arch/arm/mach-shmobile/board-lager.c +3 -0
+	usb_bind_phy("0000:01:01.0", 0, "usb_phy_rcar_gen2");
+	usb_bind_phy("0000:01:02.0", 0, "usb_phy_rcar_gen2");
+

arch/arm/mach-shmobile/board-lager.c static void __init lager_add_standard_devices(void) · line 365

Quoted 10 lines
arch/arm/mach-shmobile/board-lager.c +7 -0
+	platform_device_register_simple("pci-rcar-gen2", 1,
+					usbhs_pci1_resources,
+					ARRAY_SIZE(usbhs_pci1_resources));
+	platform_device_register_simple("pci-rcar-gen2", 2,
+					usbhs_pci2_resources,
+					ARRAY_SIZE(usbhs_pci2_resources));
+
  	lager_add_du_device();
  }
 

Thanks,
Val.

#2 lore raw
In reply to Ulrich Hecht
Quoted 7 lines · Valentine

arch/arm/mach-shmobile/board-lager.c static void __init lager_add_standard_devices(void) · line 352

Quoted 2 lines · Ulrich Hecht
arch/arm/mach-shmobile/board-lager.c +2 -0
+       usb_bind_phy("0000:00:01.0", 0, "usb_phy_rcar_gen2");
+       usb_bind_phy("0000:00:02.0", 0, "usb_phy_rcar_gen2");

You don't seem to register PCI controller 0 here. Thus, PCI bus 0 is the root bus of controller 1
which has nothing to do with the USB phy.

Good point. I'll remove those.

CU
Uli