All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v4] mmc-omap: Add support for 16-bit and 32-bit registers
@ 2009-11-23 16:23 Cory Maccarrone
  2009-11-23 17:18 ` Tony Lindgren
  2009-11-23 19:12 ` Ladislav Michl
  0 siblings, 2 replies; 4+ messages in thread
From: Cory Maccarrone @ 2009-11-23 16:23 UTC (permalink / raw)
  To: linux-omap, linux-mmc; +Cc: Cory Maccarrone, Marek Belisko

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..ca63e94 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:2;
+
 	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.0.4


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH v4] mmc-omap: Add support for 16-bit and 32-bit registers
  2009-11-23 16:23 [PATCH v4] mmc-omap: Add support for 16-bit and 32-bit registers Cory Maccarrone
@ 2009-11-23 17:18 ` Tony Lindgren
  2009-11-23 19:12 ` Ladislav Michl
  1 sibling, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2009-11-23 17:18 UTC (permalink / raw)
  To: Cory Maccarrone; +Cc: linux-omap, linux-mmc, Marek Belisko

* Cory Maccarrone <darkstar6262@gmail.com> [091123 08:23]:
> 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>

Looks good to me.

Acked-by: Tony Lindgren <tony@atomide.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..ca63e94 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:2;
> +
>  	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.0.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH v4] mmc-omap: Add support for 16-bit and 32-bit registers
  2009-11-23 19:12 ` Ladislav Michl
@ 2009-11-23 18:35   ` Cory Maccarrone
  0 siblings, 0 replies; 4+ messages in thread
From: Cory Maccarrone @ 2009-11-23 18:35 UTC (permalink / raw)
  To: Ladislav Michl; +Cc: linux-omap, linux-mmc, Marek Belisko

On Mon, Nov 23, 2009 at 11:12 AM, Ladislav Michl
<Ladislav.Michl@seznam.cz> wrote:
> Ah, there is no valid reason to make it bitfield, right? Whole struct is
> not well layed wtr alignment, but please do not make it any worse. That is
> my last complain, I swear ;-). Thank you for your patience.
>
> Other than that, tested on OMAP5910 and it works now (though it needs
> additional patch, see here:
> http://thread.gmane.org/gmane.linux.kernel.mmc/649).
>
> Tested-by: Ladislav Michl <ladis@linux-mips.org>

Heh, fair enough :)  Thanks for your patience too -- I'll convert it
to an unsigned int and resubmit.  Hopefully 5th time's the charm. :)

Glad to hear it's working with that patch too, that adds some
confidence to my changes.

Thanks
- Cory

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH v4] mmc-omap: Add support for 16-bit and 32-bit registers
  2009-11-23 16:23 [PATCH v4] mmc-omap: Add support for 16-bit and 32-bit registers Cory Maccarrone
  2009-11-23 17:18 ` Tony Lindgren
@ 2009-11-23 19:12 ` Ladislav Michl
  2009-11-23 18:35   ` Cory Maccarrone
  1 sibling, 1 reply; 4+ messages in thread
From: Ladislav Michl @ 2009-11-23 19:12 UTC (permalink / raw)
  To: Cory Maccarrone; +Cc: linux-omap, linux-mmc, Marek Belisko

On Mon, Nov 23, 2009 at 08:23:59AM -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:2;
Ah, there is no valid reason to make it bitfield, right? Whole struct is
not well layed wtr alignment, but please do not make it any worse. That is
my last complain, I swear ;-). Thank you for your patience.

Other than that, tested on OMAP5910 and it works now (though it needs
additional patch, see here:
http://thread.gmane.org/gmane.linux.kernel.mmc/649).

Tested-by: Ladislav Michl <ladis@linux-mips.org>

Best regards,
	ladis

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-11-23 19:12 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-23 16:23 [PATCH v4] mmc-omap: Add support for 16-bit and 32-bit registers Cory Maccarrone
2009-11-23 17:18 ` Tony Lindgren
2009-11-23 19:12 ` Ladislav Michl
2009-11-23 18:35   ` 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.