On Fri, Jan 13, 2012 at 03:02:01PM +0800, Roy Zang wrote:
[...]
> diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
> index 01e5f62..36caad3 100644
> --- a/drivers/mmc/host/sdhci-of-esdhc.c
> +++ b/drivers/mmc/host/sdhci-of-esdhc.c
> @@ -38,6 +38,22 @@ static u8 esdhc_readb(struct sdhci_host *host, int reg)
> int base = reg & ~0x3;
> int shift = (reg & 0x3) * 8;
> u8 ret = (in_be32(host->ioaddr + base) >> shift) & 0xff;
> +
> + /*
> + * "DMA select" locates at offset 0x28 in SD specification, but on
> + * P5020 or P3041, it locates at 0x29.
> + */
> + if (reg == SDHCI_HOST_CONTROL) {
> + u32 dma_bits;
Just a small nit: per coding style, here should be empty line.
> + dma_bits = in_be32(host->ioaddr + reg);
> + /* DMA select is 22,23 bits in Protocol Control Register*/
> + dma_bits = (dma_bits >> 5) & SDHCI_CTRL_DMA_MASK;
> +
> + /* fixup the result */
> + ret &= ~SDHCI_CTRL_DMA_MASK;
> + ret |= dma_bits;
> + }
> +
> return ret;
> }
>
> @@ -56,6 +72,20 @@ static void esdhc_writew(struct sdhci_host *host, u16 val, int reg)
>
> static void esdhc_writeb(struct sdhci_host *host, u8 val, int reg)
> {
> + /*
> + * "DMA select" locates at offset 0x28 in SD specification, but on
> + * P5020 or P3041, it locates at 0x29.
> + */
> + if (reg == SDHCI_HOST_CONTROL) {
> + u32 dma_bits;
Ditto. Empty line here.
> + /* DMA select is 22,23 bits in Protocol Control Register*/
> + dma_bits = (val & SDHCI_CTRL_DMA_MASK) << 5;
> + clrsetbits_be32(host->ioaddr + reg , SDHCI_CTRL_DMA_MASK << 5,
> + dma_bits);
> + val &= ~SDHCI_CTRL_DMA_MASK;
> + val |= (in_be32(host->ioaddr + reg) & SDHCI_CTRL_DMA_MASK);
No need for the outer parentheses.
Otherwise the patch looks perfect.
Acked-by: Anton Vorontsov <cbouatmailru@xxxxxxxxx>
Thanks!
--
Anton Vorontsov
Email: cbouatmailru@xxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
