* Cory Maccarrone <darkstar6262@xxxxxxxxx> [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@xxxxxxxxxxxxxxx>
> Signed-off-by: Cory Maccarrone <darkstar6262@xxxxxxxxx>
Looks good to me.
Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
> ---
> 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@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
