android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: OMAP1: Pass dma request lines in platform data to MMC driver

Browse Source 
Pass dma request lines in platform data to MMC driver.

Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren 2012-04-23 15:56:37 -07:00
parent 5ff391d8ac
commit 6c432f72b2
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/mach-omap1/devices.c
View File

@ -22,6 +22,7 @@
#include <plat/tc.h> #include <plat/tc.h>
#include <plat/board.h> #include <plat/board.h>
#include <plat/mux.h> #include <plat/mux.h>
#include <plat/dma.h>
#include <plat/mmc.h> #include <plat/mmc.h>
#include <plat/omap7xx.h> #include <plat/omap7xx.h>
@ -144,13 +145,14 @@ static inline void omap1_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
} }
} }
#define OMAP_MMC_NR_RES 2 #define OMAP_MMC_NR_RES 4
/* /*
* Register MMC devices. * Register MMC devices.
*/ */
static int __init omap_mmc_add(const char *name, int id, unsigned long base, static int __init omap_mmc_add(const char *name, int id, unsigned long base,
unsigned long size, unsigned int irq, unsigned long size, unsigned int irq,
unsigned rx_req, unsigned tx_req,
struct omap_mmc_platform_data *data) struct omap_mmc_platform_data *data)
{ {
struct platform_device *pdev; struct platform_device *pdev;
@ -167,6 +169,12 @@ static int __init omap_mmc_add(const char *name, int id, unsigned long base,
res[0].flags = IORESOURCE_MEM; res[0].flags = IORESOURCE_MEM;
res[1].start = res[1].end = irq; res[1].start = res[1].end = irq;
res[1].flags = IORESOURCE_IRQ; res[1].flags = IORESOURCE_IRQ;
res[2].start = rx_req;
res[2].name = "rx";
res[2].flags = IORESOURCE_DMA;
res[3].start = tx_req;
res[3].name = "tx";
res[3].flags = IORESOURCE_DMA;
ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res)); ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res));
if (ret == 0) if (ret == 0)
@ -194,6 +202,7 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
for (i = 0; i < nr_controllers; i++) { for (i = 0; i < nr_controllers; i++) {
unsigned long base, size; unsigned long base, size;
unsigned rx_req, tx_req;
unsigned int irq = 0; unsigned int irq = 0;
if (!mmc_data[i]) if (!mmc_data[i])
@ -205,19 +214,24 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
case 0: case 0:
base = OMAP1_MMC1_BASE; base = OMAP1_MMC1_BASE;
irq = INT_MMC; irq = INT_MMC;
rx_req = OMAP_DMA_MMC_RX;
tx_req = OMAP_DMA_MMC_TX;
break; break;
case 1: case 1:
if (!cpu_is_omap16xx()) if (!cpu_is_omap16xx())
return; return;
base = OMAP1_MMC2_BASE; base = OMAP1_MMC2_BASE;
irq = INT_1610_MMC2; irq = INT_1610_MMC2;
rx_req = OMAP_DMA_MMC2_RX;
tx_req = OMAP_DMA_MMC2_TX;
break; break;
default: default:
continue; continue;
} }
size = OMAP1_MMC_SIZE; size = OMAP1_MMC_SIZE;
omap_mmc_add("mmci-omap", i, base, size, irq, mmc_data[i]); omap_mmc_add("mmci-omap", i, base, size, irq,
rx_req, tx_req, mmc_data[i]);
}; };
} }