diff options
Diffstat (limited to 'arch/arm/mach-imx/devices.c')
-rw-r--r-- | arch/arm/mach-imx/devices.c | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/arch/arm/mach-imx/devices.c b/arch/arm/mach-imx/devices.c index 9ee0e0924f55..7609e8a8f13c 100644 --- a/arch/arm/mach-imx/devices.c +++ b/arch/arm/mach-imx/devices.c | |||
@@ -76,40 +76,6 @@ int __init imx1_register_gpios(void) | |||
76 | } | 76 | } |
77 | #endif | 77 | #endif |
78 | 78 | ||
79 | #if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27) | ||
80 | #define DEFINE_MXC_MMC_DEVICE(n, baseaddr, irq, dmareq) \ | ||
81 | static struct resource mxc_sdhc_resources ## n[] = { \ | ||
82 | { \ | ||
83 | .start = baseaddr, \ | ||
84 | .end = baseaddr + SZ_4K - 1, \ | ||
85 | .flags = IORESOURCE_MEM, \ | ||
86 | }, { \ | ||
87 | .start = irq, \ | ||
88 | .end = irq, \ | ||
89 | .flags = IORESOURCE_IRQ, \ | ||
90 | }, { \ | ||
91 | .start = dmareq, \ | ||
92 | .end = dmareq, \ | ||
93 | .flags = IORESOURCE_DMA, \ | ||
94 | }, \ | ||
95 | }; \ | ||
96 | \ | ||
97 | static u64 mxc_sdhc ## n ## _dmamask = DMA_BIT_MASK(32); \ | ||
98 | \ | ||
99 | struct platform_device mxc_sdhc_device ## n = { \ | ||
100 | .name = "mxc-mmc", \ | ||
101 | .id = n, \ | ||
102 | .dev = { \ | ||
103 | .dma_mask = &mxc_sdhc ## n ## _dmamask, \ | ||
104 | .coherent_dma_mask = DMA_BIT_MASK(32), \ | ||
105 | }, \ | ||
106 | .num_resources = ARRAY_SIZE(mxc_sdhc_resources ## n), \ | ||
107 | .resource = mxc_sdhc_resources ## n, \ | ||
108 | } | ||
109 | |||
110 | DEFINE_MXC_MMC_DEVICE(0, MX2x_SDHC1_BASE_ADDR, MX2x_INT_SDHC1, MX2x_DMA_REQ_SDHC1); | ||
111 | DEFINE_MXC_MMC_DEVICE(1, MX2x_SDHC2_BASE_ADDR, MX2x_INT_SDHC2, MX2x_DMA_REQ_SDHC2); | ||
112 | |||
113 | #ifdef CONFIG_MACH_MX27 | 79 | #ifdef CONFIG_MACH_MX27 |
114 | static struct resource otg_resources[] = { | 80 | static struct resource otg_resources[] = { |
115 | { | 81 | { |
@@ -203,6 +169,7 @@ struct platform_device mxc_usbh2 = { | |||
203 | }; | 169 | }; |
204 | #endif | 170 | #endif |
205 | 171 | ||
172 | #if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27) | ||
206 | /* GPIO port description */ | 173 | /* GPIO port description */ |
207 | #define DEFINE_MXC_GPIO_PORT_IRQ(SOC, n, _irq) \ | 174 | #define DEFINE_MXC_GPIO_PORT_IRQ(SOC, n, _irq) \ |
208 | { \ | 175 | { \ |