diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-01 14:10:38 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-01 14:10:38 +0200 |
| commit | b821d73607cc6387b1ee588af97a44e8eb2b4fe2 (patch) | |
| tree | 74df0464f1eec0120d9f9aebc75f3707e0a5d8d7 /arch/arm/boards/phycard-i.MX27 | |
| parent | 1a886dd4780c55c29129a145cd4c771fe297fa6f (diff) | |
| parent | ad7590ee64b9c90d372d9294d4d1b1b9a2960e51 (diff) | |
| download | barebox-b821d73607cc6387b1ee588af97a44e8eb2b4fe2.tar.gz barebox-b821d73607cc6387b1ee588af97a44e8eb2b4fe2.tar.xz | |
Merge branch 'resource' of git://uboot.jcrosoft.org/barebox into next
Diffstat (limited to 'arch/arm/boards/phycard-i.MX27')
| -rw-r--r-- | arch/arm/boards/phycard-i.MX27/pca100.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/arch/arm/boards/phycard-i.MX27/pca100.c b/arch/arm/boards/phycard-i.MX27/pca100.c index 74af774b57..9a10a9d28a 100644 --- a/arch/arm/boards/phycard-i.MX27/pca100.c +++ b/arch/arm/boards/phycard-i.MX27/pca100.c @@ -53,20 +53,6 @@ struct imx_nand_platform_data nand_info = { }; #ifdef CONFIG_USB -static struct device_d usbotg_dev = { - .id = -1, - .name = "ehci", - .map_base = IMX_OTG_BASE, - .size = 0x200, -}; - -static struct device_d usbh2_dev = { - .id = -1, - .name = "ehci", - .map_base = IMX_OTG_BASE + 0x400, - .size = 0x200, -}; - static void pca100_usb_register(void) { mdelay(10); @@ -77,9 +63,9 @@ static void pca100_usb_register(void) mdelay(10); isp1504_set_vbus_power((void *)(IMX_OTG_BASE + 0x170), 1); - register_device(&usbotg_dev); + add_generic_usb_ehci_device(-1, IMX_OTG_BASE, NULL); isp1504_set_vbus_power((void *)(IMX_OTG_BASE + 0x570), 1); - register_device(&usbh2_dev); + add_generic_usb_ehci_device(-1, IMX_OTG_BASE + 0x400, NULL); } #endif |