Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d5d8590 authored by Daniel Mack's avatar Daniel Mack Committed by Sascha Hauer
Browse files

ARM: mx3: mx31lilly: fix build error for !CONFIG_USB_ULPI 



arch/arm/mach-mx3/built-in.o: In function `mx31lilly_board_init':
mach-kzm_arm11_01.c:(.init.text+0x674): undefined reference to `otg_ulpi_create'
mach-kzm_arm11_01.c:(.init.text+0x68c): undefined reference to `otg_ulpi_create'
mach-kzm_arm11_01.c:(.init.text+0x744): undefined reference to `mxc_ulpi_access_ops'
make: *** [.tmp_vmlinux1] Error 1

Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 980019d7

arch/arm/mach-mx3/mach-mx31lilly.c

+22 −11
Original line number Original line Diff line number Diff line
@@ -115,6 +115,8 @@ static struct platform_device physmap_flash_device = { 




/* USB */

/* USB */





#if defined(CONFIG_USB_ULPI)



#define USB_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \

#define USB_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \

			PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU)

			PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU)
@@ -244,10 +246,20 @@ static struct mxc_usbh_platform_data usbh2_pdata = { 
	.flags	= MXC_EHCI_POWER_PINS_ENABLED,

	.flags	= MXC_EHCI_POWER_PINS_ENABLED,

};

};





static struct platform_device *devices[] __initdata = {

static void lilly1131_usb_init(void)

	&smsc91x_device,

{

	&physmap_flash_device,

	usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

};

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);



	mxc_register_device(&mxc_usbh1, &usbh1_pdata);

	mxc_register_device(&mxc_usbh2, &usbh2_pdata);

}



#else

static inline void lilly1131_usb_init(void) {}

#endif /* CONFIG_USB_ULPI */





/* SPI */

/* SPI */
@@ -279,6 +291,11 @@ static struct spi_board_info mc13783_dev __initdata = { 
	.platform_data	= &mc13783_pdata,

	.platform_data	= &mc13783_pdata,

};

};





static struct platform_device *devices[] __initdata = {

	&smsc91x_device,

	&physmap_flash_device,

};



static int mx31lilly_baseboard;

static int mx31lilly_baseboard;

core_param(mx31lilly_baseboard, mx31lilly_baseboard, int, 0444);

core_param(mx31lilly_baseboard, mx31lilly_baseboard, int, 0444);
@@ -321,13 +338,7 @@ static void __init mx31lilly_board_init(void) 
	platform_add_devices(devices, ARRAY_SIZE(devices));

	platform_add_devices(devices, ARRAY_SIZE(devices));





	/* USB */

	/* USB */

	usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

	lilly1131_usb_init();

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);



	mxc_register_device(&mxc_usbh1, &usbh1_pdata);

	mxc_register_device(&mxc_usbh2, &usbh2_pdata);

}

}





static void __init mx31lilly_timer_init(void)

static void __init mx31lilly_timer_init(void)