Skip to contentSkip to conversation

imx/mx3: fix FTBFS for undefined symbols mx31_usbh1 and mx31_usbh2

PATCH New Uwe Kleine-König 2 participants 8 messages Dec 19, 2009 – Dec 24, 2009

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

PATCH 1/2 imx/mx3: fix FTBFS for undefined symbols mx31_usbh1 and mx31_usbh2

Use the symbols mxc_usbh1 and mxc_usbh2 introduced in

c13a482 (MX3: Add USB platform devices and resources)

instead.

Cc Sascha Hauer <[email protected]>
Cc Valentin Longchamp <[email protected]>
Cc Daniel Mack <[email protected]>
---
 arch/arm/mach-mx3/mach-mx31moboard.c     |    2 +-
 arch/arm/mach-mx3/mx31moboard-devboard.c |    2 +-
 arch/arm/mach-mx3/mx31moboard-marxbot.c  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-mx3/mach-mx31moboard.c +1 -1
index be7d277..949b4de 100644
@@ -392,7 +392,7 @@ static int __init moboard_usbh2_init(void)
 	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
 			USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
 
-	return mxc_register_device(&mx31_usbh2, &usbh2_pdata);
+	return mxc_register_device(&mxc_usbh2, &usbh2_pdata);
 }
 
 
arch/arm/mach-mx3/mx31moboard-devboard.c +1 -1
index 8fc624f..438428e 100644
@@ -179,7 +179,7 @@ static int __init devboard_usbh1_init(void)
 
 	usbh1_pdata.otg = otg;
 
-	return mxc_register_device(&mx31_usbh1, &usbh1_pdata);
+	return mxc_register_device(&mxc_usbh1, &usbh1_pdata);
 }
 
 /*
arch/arm/mach-mx3/mx31moboard-marxbot.c +1 -1
index 85184a3..1f44b9c 100644
@@ -294,7 +294,7 @@ static int __init marxbot_usbh1_init(void)
 
 	usbh1_pdata.otg = otg;
 
-	return mxc_register_device(&mx31_usbh1, &usbh1_pdata);
+	return mxc_register_device(&mxc_usbh1, &usbh1_pdata);
 }
 
 /*
Signature · 1 line
1.6.5.2
#1 lore raw

PATCH 2/2 imx/mx3: depend on USB_ULPI for otg_ulpi_create

otg_ulpi_create is defined in drivers/usb/otg/ulpi.c which depends on CONFIG_USB_ULPI. So protect its usage by the same symbol. Moreover mxc_ulpi_access_ops needs CONFIG_MXC_ULPI.

Cc Sascha Hauer <[email protected]>
Cc Valentin Longchamp <[email protected]>
Cc Daniel Mack <[email protected]>

---
Hello,

This is still not a complete fix, as with
CONFIG_USB=m, CONFIG_PCI=n, CONFIG_USB_OTG_UTILS=n drivers/usb/otg/ulpi.o isn't included in drivers/builtin.o and so the linker still errors out. Maybe USB_ULPI needs to select USB_OTG_UTILS? Then the line

	obj-$(CONFIG_USB_ULPI)          += otg/

in drivers/usb/Makefile becomes superflous as drivers/Makefile has

	obj-$(CONFIG_USB_OTG_UTILS)     += usb/otg/

. OTOH drivers/usb/otg/ulpi.c doesn't seem to make use of anything defined in drivers/usb/otg/otg.c. Daniel?

Best regards
Uwe

---
 arch/arm/mach-mx3/Kconfig            |    3 ++-
 arch/arm/mach-mx3/mach-mx31lite.c    |    4 ++++
 arch/arm/mach-mx3/mach-mx31moboard.c |    4 ++++
 3 files changed, 10 insertions(+), 1 deletions(-)
arch/arm/mach-mx3/Kconfig +2 -1
index ea8ed10..2829441 100644
@@ -49,6 +49,7 @@ config MACH_PCM037_EET
 config MACH_MX31LITE
 	bool "Support MX31 LITEKIT (LogicPD)"
 	select ARCH_MX31
+	select MXC_ULPI if USB_ULPI
 	help
 	  Include support for MX31 LITEKIT platform. This includes specific
 	  configurations for the board and its peripherals.
@@ -63,7 +64,7 @@ config MACH_MX31_3DS
 config MACH_MX31MOBOARD
 	bool "Support mx31moboard platforms (EPFL Mobots group)"
 	select ARCH_MX31
-	select MXC_ULPI
+	select MXC_ULPI if USB_ULPI
 	help
 	  Include support for mx31moboard platform. This includes specific
 	  configurations for the board and its peripherals.
arch/arm/mach-mx3/mach-mx31lite.c +4 -0
index db741be..1e26397 100644
@@ -135,6 +135,7 @@ static struct spi_board_info mc13783_spi_dev __initdata = {
  * USB
  */
 
+#if defined(CONFIG_USB_ULPI)
 #define USB_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \
 			PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU)
 
@@ -180,6 +181,7 @@ static struct mxc_usbh_platform_data usbh2_pdata = {
 	.portsc = MXC_EHCI_MODE_ULPI | MXC_EHCI_UTMI_8BIT,
 	.flags  = MXC_EHCI_POWER_PINS_ENABLED,
 };
+#endif
 
 /*
  * NOR flash
@@ -256,11 +258,13 @@ static void __init mxc_board_init(void)
 	mxc_register_device(&mxc_spi_device1, &spi1_pdata);
 	spi_register_board_info(&mc13783_spi_dev, 1);
 
+#if defined(CONFIG_USB_ULPI)
 	/* USB */
 	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
 				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
 
 	mxc_register_device(&mxc_usbh2, &usbh2_pdata);
+#endif
 
 	/* SMSC9117 IRQ pin */
 	ret = gpio_request(IOMUX_TO_GPIO(MX31_PIN_SFS6), "sms9117-irq");
arch/arm/mach-mx3/mach-mx31moboard.c +4 -0
index 949b4de..8959cfb 100644
@@ -317,6 +317,7 @@ static void usb_xcvr_reset(void)
 	gpio_set_value(USB_RESET_B, 1);
 }
 
+#if defined(CONFIG_USB_ULPI)
 #define USB_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \
 			PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU)
 
@@ -394,6 +395,7 @@ static int __init moboard_usbh2_init(void)
 
 	return mxc_register_device(&mxc_usbh2, &usbh2_pdata);
 }
+#endif
 
 
 static struct gpio_led mx31moboard_leds[] = {
@@ -534,9 +536,11 @@ static void __init mxc_board_init(void)
 
 	usb_xcvr_reset();
 
+#if defined(CONFIG_USB_ULPI)
 	moboard_usbotg_init();
 	mxc_register_device(&mxc_otg_udc_device, &usb_pdata);
 	moboard_usbh2_init();
+#endif
 
 	switch (mx31moboard_baseboard) {
 	case MX31NOBOARD:
Signature · 1 line
1.6.5.2
#2 lore raw

PATCH 2/2 imx/mx3: depend on USB_ULPI for otg_ulpi_create

Quoted 3 lines · Uwe Kleine-K?nig

otg_ulpi_create is defined in drivers/usb/otg/ulpi.c which depends on CONFIG_USB_ULPI. So protect its usage by the same symbol. Moreover mxc_ulpi_access_ops needs CONFIG_MXC_ULPI.

I completely agree on the fixes this patch brings. I however have some comments with the mx31moboard parts.

Best Regards

Val

Quoted 99 lines
Cc Sascha Hauer <[email protected]>
Cc Valentin Longchamp <[email protected]>
Cc Daniel Mack <[email protected]>

---
Hello,

This is still not a complete fix, as with
CONFIG_USB=m, CONFIG_PCI=n, CONFIG_USB_OTG_UTILS=n drivers/usb/otg/ulpi.o isn't included in drivers/builtin.o and so the linker still errors out. Maybe USB_ULPI needs to select USB_OTG_UTILS? Then the line

	obj-$(CONFIG_USB_ULPI)          += otg/

in drivers/usb/Makefile becomes superflous as drivers/Makefile has

	obj-$(CONFIG_USB_OTG_UTILS)     += usb/otg/

. OTOH drivers/usb/otg/ulpi.c doesn't seem to make use of anything defined in drivers/usb/otg/otg.c. Daniel?

Best regards
Uwe

---
 arch/arm/mach-mx3/Kconfig            |    3 ++-
 arch/arm/mach-mx3/mach-mx31lite.c    |    4 ++++
 arch/arm/mach-mx3/mach-mx31moboard.c |    4 ++++
 3 files changed, 10 insertions(+), 1 deletions(-)
arch/arm/mach-mx3/Kconfig +2 -1
index ea8ed10..2829441 100644
@@ -49,6 +49,7 @@ config MACH_PCM037_EET
 config MACH_MX31LITE
 	bool "Support MX31 LITEKIT (LogicPD)"
 	select ARCH_MX31
+	select MXC_ULPI if USB_ULPI
 	help
 	  Include support for MX31 LITEKIT platform. This includes specific
 	  configurations for the board and its peripherals.
@@ -63,7 +64,7 @@ config MACH_MX31_3DS
 config MACH_MX31MOBOARD
 	bool "Support mx31moboard platforms (EPFL Mobots group)"
 	select ARCH_MX31
-	select MXC_ULPI
+	select MXC_ULPI if USB_ULPI
 	help
 	  Include support for mx31moboard platform. This includes specific
 	  configurations for the board and its peripherals.
arch/arm/mach-mx3/mach-mx31lite.c +4 -0
index db741be..1e26397 100644
@@ -135,6 +135,7 @@ static struct spi_board_info mc13783_spi_dev __initdata = {
  * USB
  */
 
+#if defined(CONFIG_USB_ULPI)
 #define USB_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \
 			PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU)
 
@@ -180,6 +181,7 @@ static struct mxc_usbh_platform_data usbh2_pdata = {
 	.portsc = MXC_EHCI_MODE_ULPI | MXC_EHCI_UTMI_8BIT,
 	.flags  = MXC_EHCI_POWER_PINS_ENABLED,
 };
+#endif
 
 /*
  * NOR flash
@@ -256,11 +258,13 @@ static void __init mxc_board_init(void)
 	mxc_register_device(&mxc_spi_device1, &spi1_pdata);
 	spi_register_board_info(&mc13783_spi_dev, 1);
 
+#if defined(CONFIG_USB_ULPI)
 	/* USB */
 	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
 				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
 
 	mxc_register_device(&mxc_usbh2, &usbh2_pdata);
+#endif
 
 	/* SMSC9117 IRQ pin */
 	ret = gpio_request(IOMUX_TO_GPIO(MX31_PIN_SFS6), "sms9117-irq");
arch/arm/mach-mx3/mach-mx31moboard.c +1 -0
index 949b4de..8959cfb 100644
@@ -317,6 +317,7 @@ static void usb_xcvr_reset(void)
 	gpio_set_value(USB_RESET_B, 1);
 }
 
+#if defined(CONFIG_USB_ULPI)
 #define USB_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \
 			PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU)
 

arch/arm/mach-mx3/mach-mx31moboard.c static int __init moboard_usbh2_init(void) · line 398

Quoted 4 lines
arch/arm/mach-mx3/mach-mx31moboard.c +1 -0
@@ -394,6 +395,7 @@ static int __init moboard_usbh2_init(void)
 
 	return mxc_register_device(&mxc_usbh2, &usbh2_pdata);
 }
+#endif

On our board, the otg port is always used and configured as slave. So it does not use the ULPI code. The first #if defined then should go below, after the definition of moboard_usbotg_init and before the definition of usb_pdata (around line 343 in 2.6.33-rc1).

arch/arm/mach-mx3/mach-mx31moboard.c static void __init mxc_board_init(void) · line 543

Quoted 12 lines
arch/arm/mach-mx3/mach-mx31moboard.c +2 -0
 static struct gpio_led mx31moboard_leds[] = {
@@ -534,9 +536,11 @@ static void __init mxc_board_init(void)
 
 	usb_xcvr_reset();
 
+#if defined(CONFIG_USB_ULPI)
 	moboard_usbotg_init();
 	mxc_register_device(&mxc_otg_udc_device, &usb_pdata);
 	moboard_usbh2_init();
+#endif

For the same reason as above, the first two lines should go out of the #if defined clause where only moboard_usbh2_init.

Quoted 3 lines
arch/arm/mach-mx3/mach-mx31moboard.c +0 -0
 	switch (mx31moboard_baseboard) {
 	case MX31NOBOARD:
Signature · 4 lines
Valentin Longchamp, PhD Student, EPFL-STI-LSRO1
valentin.longchamp at epfl.ch, Phone: +41216937827
http://people.epfl.ch/valentin.longchamp
MEA3485, Station 9, CH-1015 Lausanne
#3 lore raw

PATCH v2 1/1 imx/mx3: depend on USB_ULPI for otg_ulpi_create

otg_ulpi_create is defined in drivers/usb/otg/ulpi.c which depends on CONFIG_USB_ULPI. So protect its usage by the same symbol. Moreover mxc_ulpi_access_ops needs CONFIG_MXC_ULPI.

Cc Sascha Hauer <[email protected]>
Cc Valentin Longchamp <[email protected]>
Cc Daniel Mack <[email protected]>

---
Hello,

compared to the previous version moboard_usbotg_init and mxc_register_device(&mxc_otg_udc_device, ...) isn't protected by

The old comment about not building drivers/usb/otg/ulpi.o into vmlinux still applies, so I reproduce the old text again:

This is still not a complete fix, as with
CONFIG_USB=m, CONFIG_PCI=n, CONFIG_USB_OTG_UTILS=n drivers/usb/otg/ulpi.o isn't included in drivers/builtin.o and so the linker still errors out. Maybe USB_ULPI needs to select USB_OTG_UTILS? Then the line

	obj-$(CONFIG_USB_ULPI)          += otg/

in drivers/usb/Makefile becomes superflous as drivers/Makefile has

	obj-$(CONFIG_USB_OTG_UTILS)     += usb/otg/

. OTOH drivers/usb/otg/ulpi.c doesn't seem to make use of anything defined in drivers/usb/otg/otg.c.

Best regards
Uwe

---
 arch/arm/mach-mx3/Kconfig            |    3 ++-
 arch/arm/mach-mx3/mach-mx31lite.c    |    4 ++++
 arch/arm/mach-mx3/mach-mx31moboard.c |    4 ++++
 3 files changed, 10 insertions(+), 1 deletions(-)
arch/arm/mach-mx3/Kconfig +2 -1
index ea8ed10..2829441 100644
@@ -49,6 +49,7 @@ config MACH_PCM037_EET
 config MACH_MX31LITE
 	bool "Support MX31 LITEKIT (LogicPD)"
 	select ARCH_MX31
+	select MXC_ULPI if USB_ULPI
 	help
 	  Include support for MX31 LITEKIT platform. This includes specific
 	  configurations for the board and its peripherals.
@@ -63,7 +64,7 @@ config MACH_MX31_3DS
 config MACH_MX31MOBOARD
 	bool "Support mx31moboard platforms (EPFL Mobots group)"
 	select ARCH_MX31
-	select MXC_ULPI
+	select MXC_ULPI if USB_ULPI
 	help
 	  Include support for mx31moboard platform. This includes specific
 	  configurations for the board and its peripherals.
arch/arm/mach-mx3/mach-mx31lite.c +4 -0
index db741be..1e26397 100644
@@ -135,6 +135,7 @@ static struct spi_board_info mc13783_spi_dev __initdata = {
  * USB
  */
 
+#if defined(CONFIG_USB_ULPI)
 #define USB_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \
 			PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU)
 
@@ -180,6 +181,7 @@ static struct mxc_usbh_platform_data usbh2_pdata = {
 	.portsc = MXC_EHCI_MODE_ULPI | MXC_EHCI_UTMI_8BIT,
 	.flags  = MXC_EHCI_POWER_PINS_ENABLED,
 };
+#endif
 
 /*
  * NOR flash
@@ -256,11 +258,13 @@ static void __init mxc_board_init(void)
 	mxc_register_device(&mxc_spi_device1, &spi1_pdata);
 	spi_register_board_info(&mc13783_spi_dev, 1);
 
+#if defined(CONFIG_USB_ULPI)
 	/* USB */
 	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
 				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
 
 	mxc_register_device(&mxc_usbh2, &usbh2_pdata);
+#endif
 
 	/* SMSC9117 IRQ pin */
 	ret = gpio_request(IOMUX_TO_GPIO(MX31_PIN_SFS6), "sms9117-irq");
arch/arm/mach-mx3/mach-mx31moboard.c +4 -0
index 949b4de..ac4c815 100644
@@ -341,6 +341,7 @@ static void moboard_usbotg_init(void)
 	gpio_direction_output(OTG_EN_B, 0);
 }
 
+#if defined(CONFIG_USB_ULPI)
 static struct fsl_usb2_platform_data usb_pdata = {
 	.operating_mode	= FSL_USB2_DR_DEVICE,
 	.phy_mode	= FSL_USB2_PHY_ULPI,
@@ -394,6 +395,9 @@ static int __init moboard_usbh2_init(void)
 
 	return mxc_register_device(&mxc_usbh2, &usbh2_pdata);
 }
+#else
+static inline int moboard_usbh2_init(void) {}
+#endif
 
 
 static struct gpio_led mx31moboard_leds[] = {
Signature · 1 line
1.6.5.2
#4 lore raw

PATCH v3 1/1 imx/mx3: depend on USB_ULPI for otg_ulpi_create

otg_ulpi_create is defined in drivers/usb/otg/ulpi.c which depends on CONFIG_USB_ULPI. So protect its usage by the same symbol. Moreover mxc_ulpi_access_ops needs CONFIG_MXC_ULPI.

Cc Sascha Hauer <[email protected]>
Cc Valentin Longchamp <[email protected]>
Cc Daniel Mack <[email protected]>

---
Hello,

ups, the last version introduced another FTBFS and a warning. This patch is better.

The old comment about not building drivers/usb/otg/ulpi.o into vmlinux still applies, so I reproduce the old text again:

This is still not a complete fix, as with
CONFIG_USB=m, CONFIG_PCI=n, CONFIG_USB_OTG_UTILS=n drivers/usb/otg/ulpi.o isn't included in drivers/builtin.o and so the linker still errors out. Maybe USB_ULPI needs to select USB_OTG_UTILS? Then the line

	obj-$(CONFIG_USB_ULPI)          += otg/

in drivers/usb/Makefile becomes superflous as drivers/Makefile has

	obj-$(CONFIG_USB_OTG_UTILS)     += usb/otg/

. OTOH drivers/usb/otg/ulpi.c doesn't seem to make use of anything defined in drivers/usb/otg/otg.c.

Best regards
Uwe

---
 arch/arm/mach-mx3/Kconfig            |    3 ++-
 arch/arm/mach-mx3/mach-mx31lite.c    |    4 ++++
 arch/arm/mach-mx3/mach-mx31moboard.c |    5 +++++
 3 files changed, 11 insertions(+), 1 deletions(-)
arch/arm/mach-mx3/Kconfig +2 -1
index ea8ed10..2829441 100644
@@ -49,6 +49,7 @@ config MACH_PCM037_EET
 config MACH_MX31LITE
 	bool "Support MX31 LITEKIT (LogicPD)"
 	select ARCH_MX31
+	select MXC_ULPI if USB_ULPI
 	help
 	  Include support for MX31 LITEKIT platform. This includes specific
 	  configurations for the board and its peripherals.
@@ -63,7 +64,7 @@ config MACH_MX31_3DS
 config MACH_MX31MOBOARD
 	bool "Support mx31moboard platforms (EPFL Mobots group)"
 	select ARCH_MX31
-	select MXC_ULPI
+	select MXC_ULPI if USB_ULPI
 	help
 	  Include support for mx31moboard platform. This includes specific
 	  configurations for the board and its peripherals.
arch/arm/mach-mx3/mach-mx31lite.c +4 -0
index db741be..1e26397 100644
@@ -135,6 +135,7 @@ static struct spi_board_info mc13783_spi_dev __initdata = {
  * USB
  */
 
+#if defined(CONFIG_USB_ULPI)
 #define USB_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \
 			PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU)
 
@@ -180,6 +181,7 @@ static struct mxc_usbh_platform_data usbh2_pdata = {
 	.portsc = MXC_EHCI_MODE_ULPI | MXC_EHCI_UTMI_8BIT,
 	.flags  = MXC_EHCI_POWER_PINS_ENABLED,
 };
+#endif
 
 /*
  * NOR flash
@@ -256,11 +258,13 @@ static void __init mxc_board_init(void)
 	mxc_register_device(&mxc_spi_device1, &spi1_pdata);
 	spi_register_board_info(&mc13783_spi_dev, 1);
 
+#if defined(CONFIG_USB_ULPI)
 	/* USB */
 	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
 				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
 
 	mxc_register_device(&mxc_usbh2, &usbh2_pdata);
+#endif
 
 	/* SMSC9117 IRQ pin */
 	ret = gpio_request(IOMUX_TO_GPIO(MX31_PIN_SFS6), "sms9117-irq");
arch/arm/mach-mx3/mach-mx31moboard.c +5 -0
index 949b4de..9428827 100644
@@ -346,6 +346,8 @@ static struct fsl_usb2_platform_data usb_pdata = {
 	.phy_mode	= FSL_USB2_PHY_ULPI,
 };
 
+#if defined(CONFIG_USB_ULPI)
+
 #define USBH2_EN_B IOMUX_TO_GPIO(MX31_PIN_SCK6)
 
 static int moboard_usbh2_hw_init(struct platform_device *pdev)
@@ -394,6 +396,9 @@ static int __init moboard_usbh2_init(void)
 
 	return mxc_register_device(&mxc_usbh2, &usbh2_pdata);
 }
+#else
+static inline int moboard_usbh2_init(void) { return 0; }
+#endif
 
 
 static struct gpio_led mx31moboard_leds[] = {
Signature · 1 line
1.6.5.2
#5 lore raw

please pull FTBFS fixes (Was: [PATCH v3] imx/mx3: depend on USB_ULPI for otg_ulpi_create)

Hello,

the two patches sent in this thread together with the fix for

arch/arm/mm/copypage-v6.c: In function 'v6_copy_user_highpage_nonaliasing':
arch/arm/mm/copypage-v6.c:51: error: implicit declaration of function '__cpuc_flush_dcache_page'

that is already in your tree make the mx3 related defconfigs build again.

Sascha is currently on vacation and won't be back until next year.

So you can pull from my tree:

The following changes since commit 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f:
Linus Torvalds (1):

        Linux 2.6.33-rc1

are available in the git repository at:

git://git.pengutronix.de/git/ukl/linux-2.6.git imx-for-rmk

Uwe Kleine-K?nig (1):
imx/mx3: depend on USB_ULPI for otg_ulpi_create

Valentin Longchamp (1):
imx/mx31moboard: fix usbh device names

 arch/arm/mach-mx3/Kconfig                |    3 ++-
 arch/arm/mach-mx3/mx31lite.c             |    4 ++++
 arch/arm/mach-mx3/mx31moboard-devboard.c |    2 +-
 arch/arm/mach-mx3/mx31moboard-marxbot.c  |    2 +-
 arch/arm/mach-mx3/mx31moboard.c          |    7 ++++++-
 5 files changed, 14 insertions(+), 4 deletions(-)
Signature · 2 lines
Pengutronix e.K.                              | Uwe Kleine-K?nig            |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |
#6 lore raw

PATCH 1/2 imx/mx3: fix FTBFS for undefined symbols mx31_usbh1 and mx31_usbh2

In reply to Uwe Kleine-König

Hallo Uwe,

Quoted 5 lines · Uwe Kleine-K?nig

Use the symbols mxc_usbh1 and mxc_usbh2 introduced in

c13a482 (MX3: Add USB platform devices and resources)

instead.

I have sent a patch to fix this. It was first sent on December, 4th and again on December, 18th
(http://article.gmane.org/gmane.linux.ports.arm.kernel/71126)

I hope it will be picked for next -rc.

Best Regards

Val

Quoted 50 lines
Cc Sascha Hauer <[email protected]>
Cc Valentin Longchamp <[email protected]>
Cc Daniel Mack <[email protected]>
---
 arch/arm/mach-mx3/mach-mx31moboard.c     |    2 +-
 arch/arm/mach-mx3/mx31moboard-devboard.c |    2 +-
 arch/arm/mach-mx3/mx31moboard-marxbot.c  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-mx3/mach-mx31moboard.c +1 -1
index be7d277..949b4de 100644
@@ -392,7 +392,7 @@ static int __init moboard_usbh2_init(void)
 	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
 			USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
 
-	return mxc_register_device(&mx31_usbh2, &usbh2_pdata);
+	return mxc_register_device(&mxc_usbh2, &usbh2_pdata);
 }
 
 
arch/arm/mach-mx3/mx31moboard-devboard.c +1 -1
index 8fc624f..438428e 100644
@@ -179,7 +179,7 @@ static int __init devboard_usbh1_init(void)
 
 	usbh1_pdata.otg = otg;
 
-	return mxc_register_device(&mx31_usbh1, &usbh1_pdata);
+	return mxc_register_device(&mxc_usbh1, &usbh1_pdata);
 }
 
 /*
arch/arm/mach-mx3/mx31moboard-marxbot.c +1 -1
index 85184a3..1f44b9c 100644
@@ -294,7 +294,7 @@ static int __init marxbot_usbh1_init(void)
 
 	usbh1_pdata.otg = otg;
 
-	return mxc_register_device(&mx31_usbh1, &usbh1_pdata);
+	return mxc_register_device(&mxc_usbh1, &usbh1_pdata);
 }
 
 /*
Signature · 4 lines
Valentin Longchamp, PhD Student, EPFL-STI-LSRO1
valentin.longchamp at epfl.ch, Phone: +41216937827
http://people.epfl.ch/valentin.longchamp
MEA3485, Station 9, CH-1015 Lausanne
#7 lore raw

PATCH 1/2 imx/mx3: fix FTBFS for undefined symbols mx31_usbh1 and mx31_usbh2

Quoted 5 lines · Valentin Longchamp

Hallo Uwe,

Quoted 2 lines · Uwe Kleine-K?nig

Use the symbols mxc_usbh1 and mxc_usbh2 introduced in

Quoted 7 lines
Quoted 3 lines

c13a482 (MX3: Add USB platform devices and resources)

instead.

I have sent a patch to fix this. It was first sent on December, 4th and again on December, 18th
(http://article.gmane.org/gmane.linux.ports.arm.kernel/71126)

OK, actually the patches are identically. Sascha, you can interpret this as an Acked-by: me.

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                              | Uwe Kleine-K?nig            |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |