Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-mx5 / devices.c

diff --git a/arch/arm/mach-mx5/devices.c b/arch/arm/mach-mx5/devices.c
index 4c7be87a7c9d17e57857e0376ce2ddc9fd53a6e7..153ada53e575aaf37acef19c53776c519beb2916 100644 (file)
--- a/arch/arm/mach-mx5/devices.c
+++ b/arch/arm/mach-mx5/devices.c
@@ -97,38 +97,27 @@ struct platform_device mxc_usbh1_device = {
        },
 };
 
-static struct resource mxc_wdt_resources[] = {
+static struct resource usbh2_resources[] = {
        {
-               .start = MX51_WDOG_BASE_ADDR,
-               .end = MX51_WDOG_BASE_ADDR + SZ_16K - 1,
+               .start = MX51_OTG_BASE_ADDR + 0x400,
+               .end = MX51_OTG_BASE_ADDR + 0x400 + 0x1ff,
                .flags = IORESOURCE_MEM,
        },
-};
-
-struct platform_device mxc_wdt = {
-       .name = "imx2-wdt",
-       .id = 0,
-       .num_resources = ARRAY_SIZE(mxc_wdt_resources),
-       .resource = mxc_wdt_resources,
-};
-
-static struct resource mxc_kpp_resources[] = {
        {
-               .start = MX51_MXC_INT_KPP,
-               .end = MX51_MXC_INT_KPP,
+               .start = MX51_MXC_INT_USB_H2,
                .flags = IORESOURCE_IRQ,
-       } , {
-               .start = MX51_KPP_BASE_ADDR,
-               .end = MX51_KPP_BASE_ADDR + 0x8 - 1,
-               .flags = IORESOURCE_MEM,
        },
 };
 
-struct platform_device mxc_keypad_device = {
-       .name = "imx-keypad",
-       .id = 0,
-       .num_resources = ARRAY_SIZE(mxc_kpp_resources),
-       .resource = mxc_kpp_resources,
+struct platform_device mxc_usbh2_device = {
+       .name = "mxc-ehci",
+       .id = 2,
+       .num_resources = ARRAY_SIZE(usbh2_resources),
+       .resource = usbh2_resources,
+       .dev = {
+               .dma_mask = &usb_dma_mask,
+               .coherent_dma_mask = DMA_BIT_MASK(32),
+       },
 };
 
 static struct mxc_gpio_port mxc_gpio_ports[] = {
@@ -160,9 +149,36 @@ static struct mxc_gpio_port mxc_gpio_ports[] = {
                .irq_high = MX51_MXC_INT_GPIO4_HIGH,
                .virtual_irq_start = MXC_GPIO_IRQ_START + 32 * 3
        },
+       {
+               .chip.label = "gpio-4",
+               .base = MX53_IO_ADDRESS(MX53_GPIO5_BASE_ADDR),
+               .irq = MX53_INT_GPIO5_LOW,
+               .irq_high = MX53_INT_GPIO5_HIGH,
+               .virtual_irq_start = MXC_GPIO_IRQ_START + 32 * 4
+       },
+       {
+               .chip.label = "gpio-5",
+               .base = MX53_IO_ADDRESS(MX53_GPIO6_BASE_ADDR),
+               .irq = MX53_INT_GPIO6_LOW,
+               .irq_high = MX53_INT_GPIO6_HIGH,
+               .virtual_irq_start = MXC_GPIO_IRQ_START + 32 * 5
+       },
+       {
+               .chip.label = "gpio-6",
+               .base = MX53_IO_ADDRESS(MX53_GPIO7_BASE_ADDR),
+               .irq = MX53_INT_GPIO7_LOW,
+               .irq_high = MX53_INT_GPIO7_HIGH,
+               .virtual_irq_start = MXC_GPIO_IRQ_START + 32 * 6
+       },
 };
 
 int __init imx51_register_gpios(void)
+{
+       return mxc_gpio_init(mxc_gpio_ports, 4);
+}
+
+int __init imx53_register_gpios(void)
 {
        return mxc_gpio_init(mxc_gpio_ports, ARRAY_SIZE(mxc_gpio_ports));
 }
+