ARM: imx: remove now empty devices.h
[pandora-kernel.git] / arch / arm / mach-imx / devices.c
index fba5047..cfc6891 100644 (file)
 #include <mach/common.h>
 #include <mach/mmc.h>
 
-#include "devices.h"
-
 #if defined(CONFIG_ARCH_MX1)
-static struct resource imx1_camera_resources[] = {
-       {
-               .start  = 0x00224000,
-               .end    = 0x00224010,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .start  = MX1_CSI_INT,
-               .end    = MX1_CSI_INT,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static u64 imx1_camera_dmamask = DMA_BIT_MASK(32);
-
-struct platform_device imx1_camera_device = {
-       .name           = "mx1-camera",
-       .id             = 0, /* This is used to put cameras on this interface */
-       .dev            = {
-               .dma_mask = &imx1_camera_dmamask,
-               .coherent_dma_mask = DMA_BIT_MASK(32),
-       },
-       .resource       = imx1_camera_resources,
-       .num_resources  = ARRAY_SIZE(imx1_camera_resources),
-};
-
-static struct resource imx_rtc_resources[] = {
-       {
-               .start  = 0x00204000,
-               .end    = 0x00204024,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .start  = MX1_RTC_INT,
-               .end    = MX1_RTC_INT,
-               .flags  = IORESOURCE_IRQ,
-       }, {
-               .start  = MX1_RTC_SAMINT,
-               .end    = MX1_RTC_SAMINT,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-struct platform_device imx_rtc_device = {
-       .name           = "rtc-imx",
-       .id             = 0,
-       .resource       = imx_rtc_resources,
-       .num_resources  = ARRAY_SIZE(imx_rtc_resources),
-};
-
-static struct resource imx_wdt_resources[] = {
-       {
-               .start  = 0x00201000,
-               .end    = 0x00201008,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .start  = MX1_WDT_INT,
-               .end    = MX1_WDT_INT,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-struct platform_device imx_wdt_device = {
-       .name           = "imx-wdt",
-       .id             = 0,
-       .resource       = imx_wdt_resources,
-       .num_resources  = ARRAY_SIZE(imx_wdt_resources),
-};
-
-static struct resource imx_usb_resources[] = {
-       {
-               .start  = 0x00212000,
-               .end    = 0x00212148,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .start  = MX1_USBD_INT0,
-               .end    = MX1_USBD_INT0,
-               .flags  = IORESOURCE_IRQ,
-       }, {
-               .start  = MX1_USBD_INT1,
-               .end    = MX1_USBD_INT1,
-               .flags  = IORESOURCE_IRQ,
-       }, {
-               .start  = MX1_USBD_INT2,
-               .end    = MX1_USBD_INT2,
-               .flags  = IORESOURCE_IRQ,
-       }, {
-               .start  = MX1_USBD_INT3,
-               .end    = MX1_USBD_INT3,
-               .flags  = IORESOURCE_IRQ,
-       }, {
-               .start  = MX1_USBD_INT4,
-               .end    = MX1_USBD_INT4,
-               .flags  = IORESOURCE_IRQ,
-       }, {
-               .start  = MX1_USBD_INT5,
-               .end    = MX1_USBD_INT5,
-               .flags  = IORESOURCE_IRQ,
-       }, {
-               .start  = MX1_USBD_INT6,
-               .end    = MX1_USBD_INT6,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-struct platform_device imx_usb_device = {
-       .name           = "imx_udc",
-       .id             = 0,
-       .num_resources  = ARRAY_SIZE(imx_usb_resources),
-       .resource       = imx_usb_resources,
-};
-
 /* GPIO port description */
 static struct mxc_gpio_port imx_gpio_ports[] = {
        {
                .chip.label = "gpio-0",
-               .base = (void __iomem *)MX1_IO_ADDRESS(MX1_GPIO_BASE_ADDR),
+               .base = MX1_IO_ADDRESS(MX1_GPIO_BASE_ADDR),
                .irq = MX1_GPIO_INT_PORTA,
                .virtual_irq_start = MXC_GPIO_IRQ_START,
        }, {
                .chip.label = "gpio-1",
-               .base = (void __iomem *)MX1_IO_ADDRESS(MX1_GPIO_BASE_ADDR + 0x100),
+               .base = MX1_IO_ADDRESS(MX1_GPIO_BASE_ADDR + 0x100),
                .irq = MX1_GPIO_INT_PORTB,
                .virtual_irq_start = MXC_GPIO_IRQ_START + 32,
        }, {
                .chip.label = "gpio-2",
-               .base = (void __iomem *)MX1_IO_ADDRESS(MX1_GPIO_BASE_ADDR + 0x200),
+               .base = MX1_IO_ADDRESS(MX1_GPIO_BASE_ADDR + 0x200),
                .irq = MX1_GPIO_INT_PORTC,
                .virtual_irq_start = MXC_GPIO_IRQ_START + 64,
        }, {
                .chip.label = "gpio-3",
-               .base = (void __iomem *)MX1_IO_ADDRESS(MX1_GPIO_BASE_ADDR + 0x300),
+               .base = MX1_IO_ADDRESS(MX1_GPIO_BASE_ADDR + 0x300),
                .irq = MX1_GPIO_INT_PORTD,
                .virtual_irq_start = MXC_GPIO_IRQ_START + 96,
        }
@@ -187,278 +75,6 @@ int __init imx1_register_gpios(void)
 #endif
 
 #if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27)
-
-#ifdef CONFIG_MACH_MX27
-static struct resource mx27_camera_resources[] = {
-       {
-              .start = MX27_CSI_BASE_ADDR,
-              .end = MX27_CSI_BASE_ADDR + 0x1f,
-              .flags = IORESOURCE_MEM,
-       }, {
-              .start = MX27_EMMA_PRP_BASE_ADDR,
-              .end = MX27_EMMA_PRP_BASE_ADDR + 0x1f,
-              .flags = IORESOURCE_MEM,
-       }, {
-              .start = MX27_INT_CSI,
-              .end = MX27_INT_CSI,
-              .flags = IORESOURCE_IRQ,
-       },{
-              .start = MX27_INT_EMMAPRP,
-              .end = MX27_INT_EMMAPRP,
-              .flags = IORESOURCE_IRQ,
-       },
-};
-struct platform_device mx27_camera_device = {
-       .name = "mx2-camera",
-       .id = 0,
-       .num_resources = ARRAY_SIZE(mx27_camera_resources),
-       .resource = mx27_camera_resources,
-       .dev = {
-               .coherent_dma_mask = 0xffffffff,
-       },
-};
-#endif
-
-/*
- * General Purpose Timer
- * - i.MX21: 3 timers
- * - i.MX27: 6 timers
- */
-#define DEFINE_IMX_GPT_DEVICE(n, baseaddr, irq)                                \
-       static struct resource timer ## n ##_resources[] = {            \
-               {                                                       \
-                       .start = baseaddr,                              \
-                       .end = baseaddr + SZ_4K - 1,                    \
-                       .flags = IORESOURCE_MEM,                        \
-               }, {                                                    \
-                       .start = irq,                                   \
-                       .end = irq,                                     \
-                       .flags = IORESOURCE_IRQ,                        \
-               }                                                       \
-       };                                                              \
-                                                                       \
-       struct platform_device mxc_gpt ## n = {                         \
-               .name = "imx_gpt",                                      \
-               .id = n,                                                \
-               .num_resources = ARRAY_SIZE(timer ## n ## _resources),  \
-               .resource = timer ## n ## _resources,                   \
-       }
-
-/* We use gpt1 as system timer, so do not add a device for this one */
-DEFINE_IMX_GPT_DEVICE(1, MX2x_GPT2_BASE_ADDR, MX2x_INT_GPT2);
-DEFINE_IMX_GPT_DEVICE(2, MX2x_GPT3_BASE_ADDR, MX2x_INT_GPT3);
-
-#ifdef CONFIG_MACH_MX27
-DEFINE_IMX_GPT_DEVICE(3, MX27_GPT4_BASE_ADDR, MX27_INT_GPT4);
-DEFINE_IMX_GPT_DEVICE(4, MX27_GPT5_BASE_ADDR, MX27_INT_GPT5);
-DEFINE_IMX_GPT_DEVICE(5, MX27_GPT6_BASE_ADDR, MX27_INT_GPT6);
-#endif
-
-/* Watchdog: i.MX1 has seperate driver, i.MX21 and i.MX27 are equal */
-static struct resource mxc_wdt_resources[] = {
-       {
-               .start = MX2x_WDOG_BASE_ADDR,
-               .end = MX2x_WDOG_BASE_ADDR + SZ_4K - 1,
-               .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_w1_master_resources[] = {
-       {
-               .start = MX2x_OWIRE_BASE_ADDR,
-               .end = MX2x_OWIRE_BASE_ADDR + SZ_4K - 1,
-               .flags = IORESOURCE_MEM,
-       },
-};
-
-struct platform_device mxc_w1_master_device = {
-       .name = "mxc_w1",
-       .id = 0,
-       .num_resources = ARRAY_SIZE(mxc_w1_master_resources),
-       .resource = mxc_w1_master_resources,
-};
-
-/*
- * lcdc:
- * - i.MX1: the basic controller
- * - i.MX21: to be checked
- * - i.MX27: like i.MX1, with slightly variations
- */
-static struct resource mxc_fb[] = {
-       {
-               .start = MX2x_LCDC_BASE_ADDR,
-               .end = MX2x_LCDC_BASE_ADDR + SZ_4K - 1,
-               .flags = IORESOURCE_MEM,
-       }, {
-               .start = MX2x_INT_LCDC,
-               .end = MX2x_INT_LCDC,
-               .flags = IORESOURCE_IRQ,
-       }
-};
-
-/* mxc lcd driver */
-struct platform_device mxc_fb_device = {
-       .name = "imx-fb",
-       .id = 0,
-       .num_resources = ARRAY_SIZE(mxc_fb),
-       .resource = mxc_fb,
-       .dev = {
-               .coherent_dma_mask = DMA_BIT_MASK(32),
-       },
-};
-
-static struct resource mxc_pwm_resources[] = {
-       {
-               .start = MX2x_PWM_BASE_ADDR,
-               .end = MX2x_PWM_BASE_ADDR + SZ_4K - 1,
-               .flags = IORESOURCE_MEM,
-       }, {
-               .start = MX2x_INT_PWM,
-               .end = MX2x_INT_PWM,
-               .flags = IORESOURCE_IRQ,
-       }
-};
-
-struct platform_device mxc_pwm_device = {
-       .name = "mxc_pwm",
-       .id = 0,
-       .num_resources = ARRAY_SIZE(mxc_pwm_resources),
-       .resource = mxc_pwm_resources,
-};
-
-#define DEFINE_MXC_MMC_DEVICE(n, baseaddr, irq, dmareq)                        \
-       static struct resource mxc_sdhc_resources ## n[] = {            \
-               {                                                       \
-                       .start = baseaddr,                              \
-                       .end = baseaddr + SZ_4K - 1,                    \
-                       .flags = IORESOURCE_MEM,                        \
-               }, {                                                    \
-                       .start = irq,                                   \
-                       .end = irq,                                     \
-                       .flags = IORESOURCE_IRQ,                        \
-               }, {                                                    \
-                       .start = dmareq,                                \
-                       .end = dmareq,                                  \
-                       .flags = IORESOURCE_DMA,                        \
-               },                                                      \
-       };                                                              \
-                                                                       \
-       static u64 mxc_sdhc ## n ## _dmamask = DMA_BIT_MASK(32);        \
-                                                                       \
-       struct platform_device mxc_sdhc_device ## n = {                 \
-               .name = "mxc-mmc",                                      \
-               .id = n,                                                \
-               .dev = {                                                \
-                       .dma_mask = &mxc_sdhc ## n ## _dmamask,         \
-                       .coherent_dma_mask = DMA_BIT_MASK(32),          \
-               },                                                      \
-               .num_resources = ARRAY_SIZE(mxc_sdhc_resources ## n),   \
-               .resource = mxc_sdhc_resources ## n,            \
-       }
-
-DEFINE_MXC_MMC_DEVICE(0, MX2x_SDHC1_BASE_ADDR, MX2x_INT_SDHC1, MX2x_DMA_REQ_SDHC1);
-DEFINE_MXC_MMC_DEVICE(1, MX2x_SDHC2_BASE_ADDR, MX2x_INT_SDHC2, MX2x_DMA_REQ_SDHC2);
-
-#ifdef CONFIG_MACH_MX27
-static struct resource otg_resources[] = {
-       {
-               .start = MX27_USBOTG_BASE_ADDR,
-               .end = MX27_USBOTG_BASE_ADDR + 0x1ff,
-               .flags = IORESOURCE_MEM,
-       }, {
-               .start = MX27_INT_USB3,
-               .end = MX27_INT_USB3,
-               .flags = IORESOURCE_IRQ,
-       },
-};
-
-static u64 otg_dmamask = DMA_BIT_MASK(32);
-
-/* OTG gadget device */
-struct platform_device mxc_otg_udc_device = {
-       .name           = "fsl-usb2-udc",
-       .id             = -1,
-       .dev            = {
-               .dma_mask               = &otg_dmamask,
-               .coherent_dma_mask      = DMA_BIT_MASK(32),
-       },
-       .resource       = otg_resources,
-       .num_resources  = ARRAY_SIZE(otg_resources),
-};
-
-/* OTG host */
-struct platform_device mxc_otg_host = {
-       .name = "mxc-ehci",
-       .id = 0,
-       .dev = {
-               .coherent_dma_mask = DMA_BIT_MASK(32),
-               .dma_mask = &otg_dmamask,
-       },
-       .resource = otg_resources,
-       .num_resources = ARRAY_SIZE(otg_resources),
-};
-
-/* USB host 1 */
-
-static u64 usbh1_dmamask = DMA_BIT_MASK(32);
-
-static struct resource mxc_usbh1_resources[] = {
-       {
-               .start = MX27_USBOTG_BASE_ADDR + 0x200,
-               .end = MX27_USBOTG_BASE_ADDR + 0x3ff,
-               .flags = IORESOURCE_MEM,
-       }, {
-               .start = MX27_INT_USB1,
-               .end = MX27_INT_USB1,
-               .flags = IORESOURCE_IRQ,
-       },
-};
-
-struct platform_device mxc_usbh1 = {
-       .name = "mxc-ehci",
-       .id = 1,
-       .dev = {
-               .coherent_dma_mask = DMA_BIT_MASK(32),
-               .dma_mask = &usbh1_dmamask,
-       },
-       .resource = mxc_usbh1_resources,
-       .num_resources = ARRAY_SIZE(mxc_usbh1_resources),
-};
-
-/* USB host 2 */
-static u64 usbh2_dmamask = DMA_BIT_MASK(32);
-
-static struct resource mxc_usbh2_resources[] = {
-       {
-               .start = MX27_USBOTG_BASE_ADDR + 0x400,
-               .end = MX27_USBOTG_BASE_ADDR + 0x5ff,
-               .flags = IORESOURCE_MEM,
-       }, {
-               .start = MX27_INT_USB2,
-               .end = MX27_INT_USB2,
-               .flags = IORESOURCE_IRQ,
-       },
-};
-
-struct platform_device mxc_usbh2 = {
-       .name = "mxc-ehci",
-       .id = 2,
-       .dev = {
-               .coherent_dma_mask = DMA_BIT_MASK(32),
-               .dma_mask = &usbh2_dmamask,
-       },
-       .resource = mxc_usbh2_resources,
-       .num_resources = ARRAY_SIZE(mxc_usbh2_resources),
-};
-#endif
-
 /* GPIO port description */
 #define DEFINE_MXC_GPIO_PORT_IRQ(SOC, n, _irq)                         \
        {                                                               \
@@ -505,49 +121,4 @@ int __init imx27_register_gpios(void)
 }
 #endif
 
-#ifdef CONFIG_MACH_MX21
-static struct resource mx21_usbhc_resources[] = {
-       {
-               .start  = MX21_USBOTG_BASE_ADDR,
-               .end    = MX21_USBOTG_BASE_ADDR + SZ_8K - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .start          = MX21_INT_USBHOST,
-               .end            = MX21_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
-
-static struct resource imx_kpp_resources[] = {
-       {
-               .start  = MX2x_KPP_BASE_ADDR,
-               .end    = MX2x_KPP_BASE_ADDR + 0xf,
-               .flags  = IORESOURCE_MEM
-       }, {
-               .start  = MX2x_INT_KPP,
-               .end    = MX2x_INT_KPP,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-struct platform_device imx_kpp_device = {
-       .name = "imx-keypad",
-       .id = -1,
-       .num_resources = ARRAY_SIZE(imx_kpp_resources),
-       .resource = imx_kpp_resources,
-};
-
 #endif