Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'imx-for-2.6.35' of git://git.pengutronix.de/git/imx/linux-2.6
+22
-11
arch/arm/mach-mx3/mach-mx31lilly.c
+22
-11
arch/arm/mach-mx3/mach-mx31lilly.c
···
115
115
116
116
/* USB */
117
117
118
+
#if defined(CONFIG_USB_ULPI)
119
+
118
120
#define USB_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \
119
121
PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU)
120
122
···
246
244
.flags = MXC_EHCI_POWER_PINS_ENABLED,
247
245
};
248
246
249
-
static struct platform_device *devices[] __initdata = {
250
-
&smsc91x_device,
251
-
&physmap_flash_device,
252
-
};
247
+
static void lilly1131_usb_init(void)
248
+
{
249
+
usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
250
+
USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
251
+
usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
252
+
USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
253
+
254
+
mxc_register_device(&mxc_usbh1, &usbh1_pdata);
255
+
mxc_register_device(&mxc_usbh2, &usbh2_pdata);
256
+
}
257
+
258
+
#else
259
+
static inline void lilly1131_usb_init(void) {}
260
+
#endif /* CONFIG_USB_ULPI */
253
261
254
262
/* SPI */
255
263
···
289
277
.bus_num = 1,
290
278
.chip_select = 0,
291
279
.platform_data = &mc13783_pdata,
280
+
};
281
+
282
+
static struct platform_device *devices[] __initdata = {
283
+
&smsc91x_device,
284
+
&physmap_flash_device,
292
285
};
293
286
294
287
static int mx31lilly_baseboard;
···
338
321
platform_add_devices(devices, ARRAY_SIZE(devices));
339
322
340
323
/* USB */
341
-
usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
342
-
USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
343
-
usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
344
-
USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
345
-
346
-
mxc_register_device(&mxc_usbh1, &usbh1_pdata);
347
-
mxc_register_device(&mxc_usbh2, &usbh2_pdata);
324
+
lilly1131_usb_init();
348
325
}
349
326
350
327
static void __init mx31lilly_timer_init(void)