Skip to contentSkip to conversation

ARM: mach-pca100: Add CONFIG_USB_ULPI dependency

PATCH New Fabio Estevam 2 participants 5 messages Mar 20, 2013

Subsystems (3)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/2 ARM: mach-pca100: Add CONFIG_USB_ULPI dependency

From: Fabio Estevam <[email protected]>

Since commit edc7cb2e955f (usb: phy: make it a menuconfig) CONFIG_USB_ULPI can only be enabled if CONFIG_USB_PHY is selected.

CONFIG_USB_ULPI is selected in the imx_v4_v5_defconfig, but CONFIG_USB_PHY is not, which causes the following error:

arch/arm/mach-imx/built-in.o: In function `pca100_init':
platform-mx2-emma.c:(.init.text+0x6788): undefined reference to otg_ulpi_create' platform-mx2-emma.c:(.init.text+0x682c): undefined reference to mxc_ulpi_access_ops'

---
 arch/arm/mach-imx/mach-pca100.c |    4 ++++
 1 file changed, 4 insertions(+)
arch/arm/mach-imx/mach-pca100.c +4 -0
index b8b15bb..aa4fffe 100644
@@ -278,6 +278,7 @@ static struct mxc_usbh_platform_data otg_pdata __initdata = {
 	.portsc	= MXC_EHCI_MODE_ULPI,
 };
 
+#if IS_ENABLED(CONFIG_USB_ULPI)
 static int usbh2_phy_init(struct platform_device *pdev)
 {
 	gpio_set_value(USBH2_PHY_CS_GPIO, 0);
@@ -291,6 +292,7 @@ static struct mxc_usbh_platform_data usbh2_pdata __initdata = {
 	.init	= usbh2_phy_init,
 	.portsc	= MXC_EHCI_MODE_ULPI,
 };
+#endif
 
 static const struct fsl_usb2_platform_data otg_device_pdata __initconst = {
 	.operating_mode = FSL_USB2_DR_DEVICE,
@@ -398,11 +400,13 @@ static void __init pca100_init(void)
 		imx27_add_fsl_usb2_udc(&otg_device_pdata);
 	}
 
+#if IS_ENABLED(CONFIG_USB_ULPI)
 	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
 				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
 
 	if (usbh2_pdata.otg)
 		imx27_add_mxc_ehci_hs(2, &usbh2_pdata);
+#endif
 
 	imx27_add_imx_fb(&pca100_fb_data);
 
Signature · 1 line
1.7.9.5
author reviewer
#1 lore raw

PATCH 2/2 ARM: imx_v4_v5_defconfig: Select CONFIG_USB_PHY

From: Fabio Estevam <[email protected]>

Since commit edc7cb2e955f (usb: phy: make it a menuconfig) in order to be able to select CONFIG_USB_ULPI, it is necessary to select CONFIG_USB_PHY.

---
 arch/arm/configs/imx_v4_v5_defconfig |    1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/imx_v4_v5_defconfig +1 -0
index 02c657a..d56bedc 100644
@@ -156,6 +156,7 @@ CONFIG_USB_HID=m
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_MXC=y
+CONFIG_USB_PHY=y
 CONFIG_USB_ULPI=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 2/2 ARM: imx_v4_v5_defconfig: Select CONFIG_USB_PHY

Quoted 6 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Since commit edc7cb2e955f (usb: phy: make it a menuconfig) in order to be able to select CONFIG_USB_ULPI, it is necessary to select CONFIG_USB_PHY.

Quoted 19 lines
---
 arch/arm/configs/imx_v4_v5_defconfig |    1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/imx_v4_v5_defconfig +1 -0
index 02c657a..d56bedc 100644
@@ -156,6 +156,7 @@ CONFIG_USB_HID=m
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_MXC=y
+CONFIG_USB_PHY=y
 CONFIG_USB_ULPI=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
Signature · 1 line
1.7.9.5
Signature · 8 lines
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130320/538bd93a/attachment.sig>
#3 lore raw

PATCH 1/2 ARM: mach-pca100: Add CONFIG_USB_ULPI dependency

In reply to Fabio Estevam
Quoted 38 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Since commit edc7cb2e955f (usb: phy: make it a menuconfig) CONFIG_USB_ULPI can only be enabled if CONFIG_USB_PHY is selected.

CONFIG_USB_ULPI is selected in the imx_v4_v5_defconfig, but CONFIG_USB_PHY is not, which causes the following error:

arch/arm/mach-imx/built-in.o: In function `pca100_init':
platform-mx2-emma.c:(.init.text+0x6788): undefined reference to otg_ulpi_create' platform-mx2-emma.c:(.init.text+0x682c): undefined reference to mxc_ulpi_access_ops'

---
 arch/arm/mach-imx/mach-pca100.c |    4 ++++
 1 file changed, 4 insertions(+)
arch/arm/mach-imx/mach-pca100.c +2 -0
index b8b15bb..aa4fffe 100644
@@ -278,6 +278,7 @@ static struct mxc_usbh_platform_data otg_pdata __initdata = {
 	.portsc	= MXC_EHCI_MODE_ULPI,
 };
 
+#if IS_ENABLED(CONFIG_USB_ULPI)
 static int usbh2_phy_init(struct platform_device *pdev)
 {
 	gpio_set_value(USBH2_PHY_CS_GPIO, 0);
@@ -291,6 +292,7 @@ static struct mxc_usbh_platform_data usbh2_pdata __initdata = {
 	.init	= usbh2_phy_init,
 	.portsc	= MXC_EHCI_MODE_ULPI,
 };
+#endif
 
 static const struct fsl_usb2_platform_data otg_device_pdata __initconst = {
 	.operating_mode = FSL_USB2_DR_DEVICE,

arch/arm/mach-imx/mach-pca100.c static void __init pca100_init(void) · line 405

Quoted 6 lines
arch/arm/mach-imx/mach-pca100.c +1 -0
@@ -398,11 +400,13 @@ static void __init pca100_init(void)
 		imx27_add_fsl_usb2_udc(&otg_device_pdata);
 	}
 
+#if IS_ENABLED(CONFIG_USB_ULPI)
 	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
 				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);

how about just providing a static inline nop on <linux/usb/ulpi.h> ??

Signature · 8 lines
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130320/3126eb1f/attachment.sig>
author reviewer
#4 lore raw

PATCH 1/2 ARM: mach-pca100: Add CONFIG_USB_ULPI dependency

Quoted 1 line · Felipe Balbi

how about just providing a static inline nop on <linux/usb/ulpi.h> ??

Good idea. Just sent a patch doing this to the linux-usb list.

Thanks,

Fabio Estevam