lkml.org 
[lkml]   [2006]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectMMC: 1/2 Make OMAP MMC work

    This patch makes OMAP MMC work again:

    - Fix compile errors
    - Do not ioremap base as it is already statically mapped
    - Clean-up platform device handling
    - Fix compile warnings

    Signed-off-by: Tony Lindgren <tony@atomide.com>

    --- a/arch/arm/plat-omap/devices.c
    +++ b/arch/arm/plat-omap/devices.c
    @@ -162,8 +162,8 @@ static u64 mmc1_dmamask = 0xffffffff;

    static struct resource mmc1_resources[] = {
    {
    - .start = IO_ADDRESS(OMAP_MMC1_BASE),
    - .end = IO_ADDRESS(OMAP_MMC1_BASE) + 0x7f,
    + .start = OMAP_MMC1_BASE,
    + .end = OMAP_MMC1_BASE + 0x7f,
    .flags = IORESOURCE_MEM,
    },
    {
    @@ -191,8 +191,8 @@ static u64 mmc2_dmamask = 0xffffffff;

    static struct resource mmc2_resources[] = {
    {
    - .start = IO_ADDRESS(OMAP_MMC2_BASE),
    - .end = IO_ADDRESS(OMAP_MMC2_BASE) + 0x7f,
    + .start = OMAP_MMC2_BASE,
    + .end = OMAP_MMC2_BASE + 0x7f,
    .flags = IORESOURCE_MEM,
    },
    {
    diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c
    index becb3c6..7c8b6ce 100644
    --- a/drivers/mmc/omap.c
    +++ b/drivers/mmc/omap.c
    @@ -61,6 +61,7 @@ struct mmc_omap_host {
    unsigned char id; /* 16xx chips have 2 MMC blocks */
    struct clk * iclk;
    struct clk * fclk;
    + struct resource *res;
    void __iomem *base;
    int irq;
    unsigned char bus_mode;
    @@ -340,8 +341,6 @@ static void
    mmc_omap_xfer_data(struct mmc_omap_host *host, int write)
    {
    int n;
    - void __iomem *reg;
    - u16 *p;

    if (host->buffer_bytes_left == 0) {
    host->sg_idx++;
    @@ -658,8 +657,8 @@ static void mmc_omap_dma_cb(int lch, u16
    struct mmc_data *mmcdat = host->data;

    if (unlikely(host->dma_ch < 0)) {
    - dev_err(mmc_dev(host->mmc), "DMA callback while DMA not
    - enabled\n");
    + dev_err(mmc_dev(host->mmc),
    + "DMA callback while DMA not enabled\n");
    return;
    }
    /* FIXME: We really should do something to _handle_ the errors */
    @@ -973,20 +972,20 @@ static int __init mmc_omap_probe(struct
    struct omap_mmc_conf *minfo = pdev->dev.platform_data;
    struct mmc_host *mmc;
    struct mmc_omap_host *host = NULL;
    + struct resource *r;
    int ret = 0;
    + int irq;

    - if (platform_get_resource(pdev, IORESOURCE_MEM, 0) ||
    - platform_get_irq(pdev, IORESOURCE_IRQ, 0)) {
    - dev_err(&pdev->dev, "mmc_omap_probe: invalid resource type\n");
    - return -ENODEV;
    - }
    + r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
    + irq = platform_get_irq(pdev, 0);
    + if (!r || irq < 0)
    + return -ENXIO;

    - if (!request_mem_region(pdev->resource[0].start,
    + r = request_mem_region(pdev->resource[0].start,
    pdev->resource[0].end - pdev->resource[0].start + 1,
    - pdev->name)) {
    - dev_dbg(&pdev->dev, "request_mem_region failed\n");
    + pdev->name);
    + if (!r)
    return -EBUSY;
    - }

    mmc = mmc_alloc_host(sizeof(struct mmc_omap_host), &pdev->dev);
    if (!mmc) {
    @@ -1003,6 +1002,8 @@ static int __init mmc_omap_probe(struct
    host->dma_timer.data = (unsigned long) host;

    host->id = pdev->id;
    + host->res = r;
    + host->irq = irq;

    if (cpu_is_omap24xx()) {
    host->iclk = clk_get(&pdev->dev, "mmc_ick");
    @@ -1032,13 +1033,9 @@ static int __init mmc_omap_probe(struct
    host->dma_ch = -1;

    host->irq = pdev->resource[1].start;
    - host->base = ioremap(pdev->res.start, SZ_4K);
    - if (!host->base) {
    - ret = -ENOMEM;
    - goto out;
    - }
    + host->base = (void __iomem*)IO_ADDRESS(r->start);

    - if (minfo->wire4)
    + if (minfo->wire4)
    mmc->caps |= MMC_CAP_4_BIT_DATA;

    mmc->ops = &mmc_omap_ops;
    @@ -1057,8 +1054,8 @@ static int __init mmc_omap_probe(struct

    if (host->power_pin >= 0) {
    if ((ret = omap_request_gpio(host->power_pin)) != 0) {
    - dev_err(mmc_dev(host->mmc), "Unable to get GPIO
    - pin for MMC power\n");
    + dev_err(mmc_dev(host->mmc),
    + "Unable to get GPIO pin for MMC power\n");
    goto out;
    }
    omap_set_gpio_direction(host->power_pin, 0);
    @@ -1100,7 +1097,7 @@ static int __init mmc_omap_probe(struct
    device_remove_file(&pdev->dev, &dev_attr_cover_switch);
    }
    if (ret) {
    - dev_wan(mmc_dev(host->mmc), "Unable to create sysfs attributes\n");
    + dev_warn(mmc_dev(host->mmc), "Unable to create sysfs attributes\n");
    free_irq(OMAP_GPIO_IRQ(host->switch_pin), host);
    omap_free_gpio(host->switch_pin);
    host->switch_pin = -1;
    \
     
     \ /
      Last update: 2006-05-04 09:27    [W:0.038 / U:0.216 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site