Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 185213
b: refs/heads/master
c: 4e0fa90
h: refs/heads/master
i:
  185211: 553cca9
v: v3
  • Loading branch information
Martin Fuzzey authored and Greg Kroah-Hartman committed Mar 2, 2010
1 parent 7de1b1b commit 847ccb0
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3eb352c73c99602fd379782284ea2de1476c4f9d
refs/heads/master: 4e0fa90d1de10d68429afa9353e10bb9436455db
27 changes: 27 additions & 0 deletions trunk/arch/arm/mach-mx2/devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -643,3 +643,30 @@ int __init mxc_register_gpios(void)
{
return mxc_gpio_init(imx_gpio_ports, ARRAY_SIZE(imx_gpio_ports));
}

#ifdef CONFIG_MACH_MX21
static struct resource mx21_usbhc_resources[] = {
{
.start = USBOTG_BASE_ADDR,
.end = USBOTG_BASE_ADDR + 0x1FFF,
.flags = IORESOURCE_MEM,
},
{
.start = MXC_INT_USBHOST,
.end = MXC_INT_USBHOST,
.flags = IORESOURCE_IRQ,
},
};

struct platform_device mx21_usbhc_device = {
.name = "imx21-hcd",
.id = 0,
.dev = {
.dma_mask = &mx21_usbhc_device.dev.coherent_dma_mask,
.coherent_dma_mask = DMA_BIT_MASK(32),
},
.num_resources = ARRAY_SIZE(mx21_usbhc_resources),
.resource = mx21_usbhc_resources,
};
#endif

1 change: 1 addition & 0 deletions trunk/arch/arm/mach-mx2/devices.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@ extern struct platform_device mxc_usbh2;
extern struct platform_device mxc_spi_device0;
extern struct platform_device mxc_spi_device1;
extern struct platform_device mxc_spi_device2;
extern struct platform_device mx21_usbhc_device;
extern struct platform_device imx_ssi_device0;
extern struct platform_device imx_ssi_device1;

0 comments on commit 847ccb0

Please sign in to comment.