* [PATCH v3] mmc-omap: Add support for 16-bit and 32-bit registers
@ 2009-11-22 21:16 Cory Maccarrone
2009-11-23 13:25 ` Ladislav Michl
0 siblings, 1 reply; 4+ messages in thread
From: Cory Maccarrone @ 2009-11-22 21:16 UTC (permalink / raw)
To: linux-mmc, linux-omap
The omap850 and omap730 use 16-bit registers instead of 32-bit, requiring
a modification of the register addresses in the mmc-omap driver. To resolve
this, a bit shift is performed on base register addresses, either by 1 or 2
bits depending on the CPU in use. This yields the correct registers for
each CPU.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Cory Maccarrone <darkstar6262@gmail.com>
---
drivers/mmc/host/omap.c | 63 +++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 5f970e2..78eb925 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -38,30 +38,30 @@
#include <plat/fpga.h>
#define OMAP_MMC_REG_CMD 0x00
-#define OMAP_MMC_REG_ARGL 0x04
-#define OMAP_MMC_REG_ARGH 0x08
-#define OMAP_MMC_REG_CON 0x0c
-#define OMAP_MMC_REG_STAT 0x10
-#define OMAP_MMC_REG_IE 0x14
-#define OMAP_MMC_REG_CTO 0x18
-#define OMAP_MMC_REG_DTO 0x1c
-#define OMAP_MMC_REG_DATA 0x20
-#define OMAP_MMC_REG_BLEN 0x24
-#define OMAP_MMC_REG_NBLK 0x28
-#define OMAP_MMC_REG_BUF 0x2c
-#define OMAP_MMC_REG_SDIO 0x34
-#define OMAP_MMC_REG_REV 0x3c
-#define OMAP_MMC_REG_RSP0 0x40
-#define OMAP_MMC_REG_RSP1 0x44
-#define OMAP_MMC_REG_RSP2 0x48
-#define OMAP_MMC_REG_RSP3 0x4c
-#define OMAP_MMC_REG_RSP4 0x50
-#define OMAP_MMC_REG_RSP5 0x54
-#define OMAP_MMC_REG_RSP6 0x58
-#define OMAP_MMC_REG_RSP7 0x5c
-#define OMAP_MMC_REG_IOSR 0x60
-#define OMAP_MMC_REG_SYSC 0x64
-#define OMAP_MMC_REG_SYSS 0x68
+#define OMAP_MMC_REG_ARGL 0x01
+#define OMAP_MMC_REG_ARGH 0x02
+#define OMAP_MMC_REG_CON 0x03
+#define OMAP_MMC_REG_STAT 0x04
+#define OMAP_MMC_REG_IE 0x05
+#define OMAP_MMC_REG_CTO 0x06
+#define OMAP_MMC_REG_DTO 0x07
+#define OMAP_MMC_REG_DATA 0x08
+#define OMAP_MMC_REG_BLEN 0x09
+#define OMAP_MMC_REG_NBLK 0x0a
+#define OMAP_MMC_REG_BUF 0x0b
+#define OMAP_MMC_REG_SDIO 0x0d
+#define OMAP_MMC_REG_REV 0x0f
+#define OMAP_MMC_REG_RSP0 0x10
+#define OMAP_MMC_REG_RSP1 0x11
+#define OMAP_MMC_REG_RSP2 0x12
+#define OMAP_MMC_REG_RSP3 0x13
+#define OMAP_MMC_REG_RSP4 0x14
+#define OMAP_MMC_REG_RSP5 0x15
+#define OMAP_MMC_REG_RSP6 0x16
+#define OMAP_MMC_REG_RSP7 0x17
+#define OMAP_MMC_REG_IOSR 0x18
+#define OMAP_MMC_REG_SYSC 0x19
+#define OMAP_MMC_REG_SYSS 0x1a
#define OMAP_MMC_STAT_CARD_ERR (1 << 14)
#define OMAP_MMC_STAT_CARD_IRQ (1 << 13)
@@ -77,8 +77,9 @@
#define OMAP_MMC_STAT_CARD_BUSY (1 << 2)
#define OMAP_MMC_STAT_END_OF_CMD (1 << 0)
-#define OMAP_MMC_READ(host, reg) __raw_readw((host)->virt_base + OMAP_MMC_REG_##reg)
-#define OMAP_MMC_WRITE(host, reg, val) __raw_writew((val), (host)->virt_base + OMAP_MMC_REG_##reg)
+#define OMAP_MMC_REG(host, reg) (OMAP_MMC_REG_##reg << (host)->reg_shift)
+#define OMAP_MMC_READ(host, reg) __raw_readw((host)->virt_base + OMAP_MMC_REG(host, reg))
+#define OMAP_MMC_WRITE(host, reg, val) __raw_writew((val), (host)->virt_base + OMAP_MMC_REG(host, reg))
/*
* Command types
@@ -167,6 +168,8 @@ struct mmc_omap_host {
spinlock_t clk_lock; /* for changing enabled state */
unsigned int fclk_enabled:1;
+ unsigned reg_shift:1;
+
struct omap_mmc_platform_data *pdata;
};
@@ -679,9 +682,9 @@ mmc_omap_xfer_data(struct mmc_omap_host *host, int write)
host->data->bytes_xfered += n;
if (write) {
- __raw_writesw(host->virt_base + OMAP_MMC_REG_DATA, host->buffer, n);
+ __raw_writesw(host->virt_base + OMAP_MMC_REG(host, DATA), host->buffer, n);
} else {
- __raw_readsw(host->virt_base + OMAP_MMC_REG_DATA, host->buffer, n);
+ __raw_readsw(host->virt_base + OMAP_MMC_REG(host, DATA), host->buffer, n);
}
}
@@ -899,7 +902,7 @@ mmc_omap_prepare_dma(struct mmc_omap_host *host, struct mmc_data *data)
int dst_port = 0;
int sync_dev = 0;
- data_addr = host->phys_base + OMAP_MMC_REG_DATA;
+ data_addr = host->phys_base + OMAP_MMC_REG(host, DATA);
frame = data->blksz;
count = sg_dma_len(sg);
@@ -1490,6 +1493,8 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
}
}
+ host->reg_shift = (cpu_is_omap7xx() ? 1 : 2);
+
return 0;
err_plat_cleanup:
--
1.6.3.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3] mmc-omap: Add support for 16-bit and 32-bit registers
2009-11-22 21:16 [PATCH v3] mmc-omap: Add support for 16-bit and 32-bit registers Cory Maccarrone
@ 2009-11-23 13:25 ` Ladislav Michl
2009-11-23 13:54 ` Alistair Buxton
2009-11-23 15:32 ` Cory Maccarrone
0 siblings, 2 replies; 4+ messages in thread
From: Ladislav Michl @ 2009-11-23 13:25 UTC (permalink / raw)
To: Cory Maccarrone; +Cc: linux-mmc, linux-omap
On Sun, Nov 22, 2009 at 01:16:25PM -0800, Cory Maccarrone wrote:
> The omap850 and omap730 use 16-bit registers instead of 32-bit, requiring
> a modification of the register addresses in the mmc-omap driver. To resolve
> this, a bit shift is performed on base register addresses, either by 1 or 2
> bits depending on the CPU in use. This yields the correct registers for
> each CPU.
[...]
> @@ -167,6 +168,8 @@ struct mmc_omap_host {
> spinlock_t clk_lock; /* for changing enabled state */
> unsigned int fclk_enabled:1;
>
> + unsigned reg_shift:1;
> +
[...]
Here you made reg_shift one bit wide variable...
> @@ -1490,6 +1493,8 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
> }
> }
>
> + host->reg_shift = (cpu_is_omap7xx() ? 1 : 2);
> +
...and here you are possibly trying to set second bit of that variable. It does
not work.
And sorry to ask again. This very driver works reliable and there are no
timeouts like this
mmci-omap mmci-omap.0: command timeout (CMD8)
mmci-omap mmci-omap.0: command timeout (CMD5)
mmci-omap mmci-omap.0: command timeout (CMD5)
mmci-omap mmci-omap.0: command timeout (CMD5)
mmci-omap mmci-omap.0: command timeout (CMD5)
mmci-omap mmci-omap.0: command timeout (CMD55)
mmci-omap mmci-omap.0: command timeout (CMD55)
mmci-omap mmci-omap.0: command timeout (CMD55)
mmci-omap mmci-omap.0: command timeout (CMD55)
while detecting MMC card on OMAP730? (because I can see them on 5910). This question
is unrelated to your patch.
ladis
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] mmc-omap: Add support for 16-bit and 32-bit registers
2009-11-23 13:25 ` Ladislav Michl
@ 2009-11-23 13:54 ` Alistair Buxton
2009-11-23 15:32 ` Cory Maccarrone
1 sibling, 0 replies; 4+ messages in thread
From: Alistair Buxton @ 2009-11-23 13:54 UTC (permalink / raw)
To: Ladislav Michl; +Cc: Cory Maccarrone, linux-mmc, linux-omap
2009/11/23 Ladislav Michl <Ladislav.Michl@seznam.cz>:
> And sorry to ask again. This very driver works reliable and there are no
> timeouts like this
> mmci-omap mmci-omap.0: command timeout (CMD8)
> mmci-omap mmci-omap.0: command timeout (CMD5)
> mmci-omap mmci-omap.0: command timeout (CMD5)
> mmci-omap mmci-omap.0: command timeout (CMD5)
> mmci-omap mmci-omap.0: command timeout (CMD5)
> mmci-omap mmci-omap.0: command timeout (CMD55)
> mmci-omap mmci-omap.0: command timeout (CMD55)
> mmci-omap mmci-omap.0: command timeout (CMD55)
> mmci-omap mmci-omap.0: command timeout (CMD55)
> while detecting MMC card on OMAP730? (because I can see them on 5910). This question
> is unrelated to your patch.
>
Yes, this driver (after patching) works reliably on OMAP7XX. The
CMD5/8 timeouts seem normal and non-fatal. CMD55 is the "init" command
that has to work. We had an old problem causing output just like what
you report - it turned out we missed a GPIO to power up the MMC card.
--
Alistair Buxton
a.j.buxton@gmail.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] mmc-omap: Add support for 16-bit and 32-bit registers
2009-11-23 13:25 ` Ladislav Michl
2009-11-23 13:54 ` Alistair Buxton
@ 2009-11-23 15:32 ` Cory Maccarrone
1 sibling, 0 replies; 4+ messages in thread
From: Cory Maccarrone @ 2009-11-23 15:32 UTC (permalink / raw)
To: Ladislav Michl; +Cc: linux-mmc, linux-omap
On Mon, Nov 23, 2009 at 5:25 AM, Ladislav Michl
<Ladislav.Michl@seznam.cz> wrote:
[...]
>> @@ -167,6 +168,8 @@ struct mmc_omap_host {
>> spinlock_t clk_lock; /* for changing enabled state */
>> unsigned int fclk_enabled:1;
>>
>> + unsigned reg_shift:1;
>> +
> [...]
> Here you made reg_shift one bit wide variable...
>
>> @@ -1490,6 +1493,8 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
>> }
>> }
>>
>> + host->reg_shift = (cpu_is_omap7xx() ? 1 : 2);
>> +
> ...and here you are possibly trying to set second bit of that variable. It does
> not work.
Ah, clumsy mistake, I'll fix it and resubmit.
> And sorry to ask again. This very driver works reliable and there are no
> timeouts like this
> mmci-omap mmci-omap.0: command timeout (CMD8)
> mmci-omap mmci-omap.0: command timeout (CMD5)
> mmci-omap mmci-omap.0: command timeout (CMD5)
> mmci-omap mmci-omap.0: command timeout (CMD5)
> mmci-omap mmci-omap.0: command timeout (CMD5)
> mmci-omap mmci-omap.0: command timeout (CMD55)
> mmci-omap mmci-omap.0: command timeout (CMD55)
> mmci-omap mmci-omap.0: command timeout (CMD55)
> mmci-omap mmci-omap.0: command timeout (CMD55)
> while detecting MMC card on OMAP730? (because I can see them on 5910). This question
> is unrelated to your patch.
When booting up, I see the first set of timeouts (CMD8 and CMD5), but
I don't get any timeouts on 55, and it starts up correctly for me,
detecting my SD card and mounting it. I've got an Angstrom
installation on my SD card and can boot all the way into it with this
patch.
Not sure if it matters, but this is against the linux-omap for-next branch.
- Cory
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-11-23 15:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-22 21:16 [PATCH v3] mmc-omap: Add support for 16-bit and 32-bit registers Cory Maccarrone
2009-11-23 13:25 ` Ladislav Michl
2009-11-23 13:54 ` Alistair Buxton
2009-11-23 15:32 ` Cory Maccarrone
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.