* [PATCH 1/2] ARM: mach-pca100: Add CONFIG_USB_ULPI dependency
@ 2013-03-20 1:39 Fabio Estevam
2013-03-20 1:39 ` [PATCH 2/2] ARM: imx_v4_v5_defconfig: Select CONFIG_USB_PHY Fabio Estevam
2013-03-20 6:20 ` [PATCH 1/2] ARM: mach-pca100: Add CONFIG_USB_ULPI dependency Felipe Balbi
0 siblings, 2 replies; 5+ messages in thread
From: Fabio Estevam @ 2013-03-20 1:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Fabio Estevam <fabio.estevam@freescale.com>
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'
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
arch/arm/mach-imx/mach-pca100.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
index b8b15bb..aa4fffe 100644
--- a/arch/arm/mach-imx/mach-pca100.c
+++ b/arch/arm/mach-imx/mach-pca100.c
@@ -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);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM: imx_v4_v5_defconfig: Select CONFIG_USB_PHY
2013-03-20 1:39 [PATCH 1/2] ARM: mach-pca100: Add CONFIG_USB_ULPI dependency Fabio Estevam
@ 2013-03-20 1:39 ` Fabio Estevam
2013-03-20 6:20 ` Felipe Balbi
2013-03-20 6:20 ` [PATCH 1/2] ARM: mach-pca100: Add CONFIG_USB_ULPI dependency Felipe Balbi
1 sibling, 1 reply; 5+ messages in thread
From: Fabio Estevam @ 2013-03-20 1:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Fabio Estevam <fabio.estevam@freescale.com>
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.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
arch/arm/configs/imx_v4_v5_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index 02c657a..d56bedc 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: mach-pca100: Add CONFIG_USB_ULPI dependency
2013-03-20 1:39 [PATCH 1/2] ARM: mach-pca100: Add CONFIG_USB_ULPI dependency Fabio Estevam
2013-03-20 1:39 ` [PATCH 2/2] ARM: imx_v4_v5_defconfig: Select CONFIG_USB_PHY Fabio Estevam
@ 2013-03-20 6:20 ` Felipe Balbi
2013-03-20 13:36 ` Fabio Estevam
1 sibling, 1 reply; 5+ messages in thread
From: Felipe Balbi @ 2013-03-20 6:20 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Mar 19, 2013 at 10:39:12PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> 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'
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> arch/arm/mach-imx/mach-pca100.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
> index b8b15bb..aa4fffe 100644
> --- a/arch/arm/mach-imx/mach-pca100.c
> +++ b/arch/arm/mach-imx/mach-pca100.c
> @@ -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);
how about just providing a static inline nop on <linux/usb/ulpi.h> ??
--
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>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM: imx_v4_v5_defconfig: Select CONFIG_USB_PHY
2013-03-20 1:39 ` [PATCH 2/2] ARM: imx_v4_v5_defconfig: Select CONFIG_USB_PHY Fabio Estevam
@ 2013-03-20 6:20 ` Felipe Balbi
0 siblings, 0 replies; 5+ messages in thread
From: Felipe Balbi @ 2013-03-20 6:20 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Mar 19, 2013 at 10:39:13PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> 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.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Felipe Balbi <balbi@ti.com>
> ---
> arch/arm/configs/imx_v4_v5_defconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
> index 02c657a..d56bedc 100644
> --- a/arch/arm/configs/imx_v4_v5_defconfig
> +++ b/arch/arm/configs/imx_v4_v5_defconfig
> @@ -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
> --
> 1.7.9.5
>
--
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>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: mach-pca100: Add CONFIG_USB_ULPI dependency
2013-03-20 6:20 ` [PATCH 1/2] ARM: mach-pca100: Add CONFIG_USB_ULPI dependency Felipe Balbi
@ 2013-03-20 13:36 ` Fabio Estevam
0 siblings, 0 replies; 5+ messages in thread
From: Fabio Estevam @ 2013-03-20 13:36 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Mar 20, 2013 at 3:20 AM, Felipe Balbi <balbi@ti.com> wrote:
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-03-20 13:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-20 1:39 [PATCH 1/2] ARM: mach-pca100: Add CONFIG_USB_ULPI dependency Fabio Estevam
2013-03-20 1:39 ` [PATCH 2/2] ARM: imx_v4_v5_defconfig: Select CONFIG_USB_PHY Fabio Estevam
2013-03-20 6:20 ` Felipe Balbi
2013-03-20 6:20 ` [PATCH 1/2] ARM: mach-pca100: Add CONFIG_USB_ULPI dependency Felipe Balbi
2013-03-20 13:36 ` Fabio Estevam
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).