sdio: introduce API for special power management features

[deliverable/linux.git] / drivers / mmc / host / sdhci.c

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index c279fbc4c2e54059d3c06fcec327b59df287bb84..6c866b43b03c7d1811c4125070128adbe19f7ae7 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -376,6 +376,20 @@ static void sdhci_kunmap_atomic(void *buffer, unsigned long *flags)
        local_irq_restore(*flags);
 }
 
+static void sdhci_set_adma_desc(u8 *desc, u32 addr, int len, unsigned cmd)
+{
+       __le32 *dataddr = (__le32 __force *)(desc + 4);
+       __le16 *cmdlen = (__le16 __force *)desc;
+
+       /* SDHCI specification says ADMA descriptors should be 4 byte
+        * aligned, so using 16 or 32bit operations should be safe. */
+
+       cmdlen[0] = cpu_to_le16(cmd);
+       cmdlen[1] = cpu_to_le16(len);
+
+       dataddr[0] = cpu_to_le32(addr);
+}
+
 static int sdhci_adma_table_pre(struct sdhci_host *host,
        struct mmc_data *data)
 {
@@ -443,19 +457,11 @@ static int sdhci_adma_table_pre(struct sdhci_host *host,
                                sdhci_kunmap_atomic(buffer, &flags);
                        }
 
-                       desc[7] = (align_addr >> 24) & 0xff;
-                       desc[6] = (align_addr >> 16) & 0xff;
-                       desc[5] = (align_addr >> 8) & 0xff;
-                       desc[4] = (align_addr >> 0) & 0xff;
+                       /* tran, valid */
+                       sdhci_set_adma_desc(desc, align_addr, offset, 0x21);
 
                        BUG_ON(offset > 65536);
 
-                       desc[3] = (offset >> 8) & 0xff;
-                       desc[2] = (offset >> 0) & 0xff;
-
-                       desc[1] = 0x00;
-                       desc[0] = 0x21; /* tran, valid */
-
                        align += 4;
                        align_addr += 4;
 
@@ -465,19 +471,10 @@ static int sdhci_adma_table_pre(struct sdhci_host *host,
                        len -= offset;
                }
 
-               desc[7] = (addr >> 24) & 0xff;
-               desc[6] = (addr >> 16) & 0xff;
-               desc[5] = (addr >> 8) & 0xff;
-               desc[4] = (addr >> 0) & 0xff;
-
                BUG_ON(len > 65536);
 
-               desc[3] = (len >> 8) & 0xff;
-               desc[2] = (len >> 0) & 0xff;
-
-               desc[1] = 0x00;
-               desc[0] = 0x21; /* tran, valid */
-
+               /* tran, valid */
+               sdhci_set_adma_desc(desc, addr, len, 0x21);
                desc += 8;
 
                /*
@@ -490,16 +487,9 @@ static int sdhci_adma_table_pre(struct sdhci_host *host,
        /*
         * Add a terminating entry.
         */
-       desc[7] = 0;
-       desc[6] = 0;
-       desc[5] = 0;
-       desc[4] = 0;
-
-       desc[3] = 0;
-       desc[2] = 0;
 
-       desc[1] = 0x00;
-       desc[0] = 0x03; /* nop, end, valid */
+       /* nop, end, valid */
+       sdhci_set_adma_desc(desc, 0, 0, 0x3);
 
        /*
         * Resync align buffer as we might have changed it.