mmc-omap: Add support for 16-bit and 32-bit registers
Subsystems (2)
PATCH v5 1/1 mmc-omap: Add support for 16-bit and 32-bit registers
From: Marek Belisko <[email protected]>
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.
--- drivers/mmc/host/omap.c | 63 +++++++++++++++++++++++++--------------------- 1 files changed, 34 insertions(+), 29 deletions(-)
I am submitting this patch again, as it has been a long time since any activity was on it, and I fear it may have been lost in the mailing list history. This change is required for mmc card functionality to work on omap7xx devices.
drivers/mmc/host/omap.c +34 -29
@@ -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);
@@ -1492,6 +1495,8 @@ static int __init mmc_omap_probe(struct platform_device *pdev) } } + host->reg_shift = (cpu_is_omap7xx () ?1 :2 ); +return 0 ; err_plat_cleanup:
Signature · 1 line
1.6.3.3
Quoted 10 lines · Cory Maccarrone
From: Marek Belisko <[email protected]>
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 <[email protected]>Signed-off-by Cory Maccarrone <[email protected]>
Quoted 8 lines
--- drivers/mmc/host/omap.c | 63 +++++++++++++++++++++++++--------------------- 1 files changed, 34 insertions(+), 29 deletions(-)I am submitting this patch again, as it has been a long time since any activity was on it, and I fear it may have been lost in the mailing list history. This change is required for mmc card functionality to work on omap7xx devices.
This patch differs from v5 you sent earlier:
Subject: [PATCH v5] mmc-omap: Add support for 16-bit and 32-bit registers
Date: Mon, 23 Nov 2009 10:37:28 -0800
Message-Id: <[email protected]>
Patch below is not going to work with 32-bit wide registers. Whoever is going to apply it, please don't. Use original version referred above.
Quoted 72 lines
drivers/mmc/host/omap.c +27
-26@@ -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
drivers/mmc/host/omap.c struct mmc_omap_host { · line 172
Quoted 5 lines
drivers/mmc/host/omap.c +2
-0@@ -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; +
This is not going to work ^^^^^^^^^^^^
Quoted 40 lines
drivers/mmc/host/omap.c +5
-3struct 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);@@ -1492,6 +1495,8 @@ static int __init mmc_omap_probe(struct platform_device *pdev) } } + host->reg_shift = (cpu_is_omap7xx () ?1 :2 ); +return 0 ; err_plat_cleanup:Signature · 6 lines
1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 6 lines · Ladislav Michl
This patch differs from v5 you sent earlier:
Subject: [PATCH v5] mmc-omap: Add support for 16-bit and 32-bit registers
Date: Mon, 23 Nov 2009 10:37:28 -0800
Message-Id: <[email protected]>
Quoted 6 lines
Patch below is not going to work with 32-bit wide registers. Whoever is going to apply it, please don't. Use original version referred above.
<snip>
This is not going to work ^^^^^^^^^^^^
Ah, right, good catch. I thought I got the same one submitted -- this is an older one. Sorry about that.
- Cory
Quoted 11 lines · Cory Maccarrone
Quoted 9 lines · Ladislav Michl
This patch differs from v5 you sent earlier:
Subject: [PATCH v5] mmc-omap: Add support for 16-bit and 32-bit registers
Date: Mon, 23 Nov 2009 10:37:28 -0800
Message-Id: <[email protected]>Patch below is not going to work with 32-bit wide registers. Whoever is going to apply it, please don't. Use original version referred above.
Quoted 6 lines
Quoted 3 lines
<snip>
This is not going to work ^^^^^^^^^^^^
Ah, right, good catch. I thought I got the same one submitted -- this is an older one. Sorry about that.
I'll add the working v5 into omap-testing so we can make sure it works with other omaps. Will not merge it further, it still needs to get to mainline via linux-mmc list.
Regards,
Tony