]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ARM: OMAP: DMA clean-up
authorTony Lindgren <tony@atomide.com>
Thu, 15 May 2008 23:39:22 +0000 (16:39 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 15 May 2008 23:51:26 +0000 (16:51 -0700)
DMA clean-up, mostly checkpatch.pl fixes.

Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/plat-omap/dma.c
include/asm-arm/arch-omap/dma.h

index e9f41f26841c8ba335792fb836a946f431b6e793..a90b0f7c9699d77417056e65cb66fe55131d576f 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * linux/arch/arm/plat-omap/dma.c
  *
- * Copyright (C) 2003 Nokia Corporation
+ * Copyright (C) 2003 - 2008 Nokia Corporation
  * Author: Juha Yrjölä <juha.yrjola@nokia.com>
  * DMA channel linking for 1610 by Samuel Ortiz <samuel.ortiz@nokia.com>
  * Graphics DMA and LCD DMA graphics tranformations
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/io.h>
 
 #include <asm/system.h>
 #include <asm/hardware.h>
 #include <asm/dma.h>
-#include <asm/io.h>
 
 #include <asm/arch/tc.h>
 
@@ -43,13 +43,13 @@ enum { DMA_CH_ALLOC_DONE, DMA_CH_PARAMS_SET_DONE, DMA_CH_STARTED,
 enum { DMA_CHAIN_STARTED, DMA_CHAIN_NOTSTARTED };
 #endif
 
-#define OMAP_DMA_ACTIVE                0x01
-#define OMAP_DMA_CCR_EN                (1 << 7)
+#define OMAP_DMA_ACTIVE                        0x01
+#define OMAP_DMA_CCR_EN                        (1 << 7)
 #define OMAP2_DMA_CSR_CLEAR_MASK       0xffe
 
-#define OMAP_FUNC_MUX_ARM_BASE (0xfffe1000 + 0xec)
+#define OMAP_FUNC_MUX_ARM_BASE         (0xfffe1000 + 0xec)
 
-static int enable_1510_mode = 0;
+static int enable_1510_mode;
 
 struct omap_dma_lch {
        int next_lch;
@@ -57,7 +57,7 @@ struct omap_dma_lch {
        u16 saved_csr;
        u16 enabled_irqs;
        const char *dev_name;
-       void (* callback)(int lch, u16 ch_status, void *data);
+       void (*callback)(int lch, u16 ch_status, void *data);
        void *data;
 
 #ifndef CONFIG_ARCH_OMAP1
@@ -245,6 +245,7 @@ void omap_set_dma_priority(int lch, int dst_port, int priority)
                dma_write(ccr, CCR(lch));
        }
 }
+EXPORT_SYMBOL(omap_set_dma_priority);
 
 void omap_set_dma_transfer_params(int lch, int data_type, int elem_count,
                                  int frame_count, int sync_mode,
@@ -307,6 +308,7 @@ void omap_set_dma_transfer_params(int lch, int data_type, int elem_count,
        dma_write(elem_count, CEN(lch));
        dma_write(frame_count, CFN(lch));
 }
+EXPORT_SYMBOL(omap_set_dma_transfer_params);
 
 void omap_set_dma_color_mode(int lch, enum omap_dma_color_mode mode, u32 color)
 {
@@ -346,6 +348,7 @@ void omap_set_dma_color_mode(int lch, enum omap_dma_color_mode mode, u32 color)
        }
        dma_write(w, LCH_CTRL(lch));
 }
+EXPORT_SYMBOL(omap_set_dma_color_mode);
 
 void omap_set_dma_write_mode(int lch, enum omap_dma_write_mode mode)
 {
@@ -358,12 +361,15 @@ void omap_set_dma_write_mode(int lch, enum omap_dma_write_mode mode)
                dma_write(csdp, CSDP(lch));
        }
 }
+EXPORT_SYMBOL(omap_set_dma_write_mode);
 
 /* Note that src_port is only for omap1 */
 void omap_set_dma_src_params(int lch, int src_port, int src_amode,
                             unsigned long src_start,
                             int src_ei, int src_fi)
 {
+       u32 l;
+
        if (cpu_class_is_omap1()) {
                u16 w;
 
@@ -371,34 +377,27 @@ void omap_set_dma_src_params(int lch, int src_port, int src_amode,
                w &= ~(0x1f << 2);
                w |= src_port << 2;
                dma_write(w, CSDP(lch));
+       }
 
-               w = dma_read(CCR(lch));
-               w &= ~(0x03 << 12);
-               w |= src_amode << 12;
-               dma_write(w, CCR(lch));
+       l = dma_read(CCR(lch));
+       l &= ~(0x03 << 12);
+       l |= src_amode << 12;
+       dma_write(l, CCR(lch));
 
+       if (cpu_class_is_omap1()) {
                dma_write(src_start >> 16, CSSA_U(lch));
                dma_write((u16)src_start, CSSA_L(lch));
-
-               dma_write(src_ei, CSEI(lch));
-               dma_write(src_fi, CSFI(lch));
        }
 
-       if (cpu_class_is_omap2()) {
-               u32 l;
-
-               l = dma_read(CCR(lch));
-               l &= ~(0x03 << 12);
-               l |= src_amode << 12;
-               dma_write(l, CCR(lch));
-
+       if (cpu_class_is_omap2())
                dma_write(src_start, CSSA(lch));
-               dma_write(src_ei, CSEI(lch));
-               dma_write(src_fi, CSFI(lch));
-       }
+
+       dma_write(src_ei, CSEI(lch));
+       dma_write(src_fi, CSFI(lch));
 }
+EXPORT_SYMBOL(omap_set_dma_src_params);
 
-void omap_set_dma_params(int lch, struct omap_dma_channel_params * params)
+void omap_set_dma_params(int lch, struct omap_dma_channel_params *params)
 {
        omap_set_dma_transfer_params(lch, params->data_type,
                                     params->elem_count, params->frame_count,
@@ -415,16 +414,17 @@ void omap_set_dma_params(int lch, struct omap_dma_channel_params * params)
                omap_dma_set_prio_lch(lch, params->read_prio,
                                      params->write_prio);
 }
+EXPORT_SYMBOL(omap_set_dma_params);
 
 void omap_set_dma_src_index(int lch, int eidx, int fidx)
 {
-       if (cpu_class_is_omap2()) {
-               REVISIT_24XX();
+       if (cpu_class_is_omap2())
                return;
-       }
+
        dma_write(eidx, CSEI(lch));
        dma_write(fidx, CSFI(lch));
 }
+EXPORT_SYMBOL(omap_set_dma_src_index);
 
 void omap_set_dma_src_data_pack(int lch, int enable)
 {
@@ -436,6 +436,7 @@ void omap_set_dma_src_data_pack(int lch, int enable)
                l |= (1 << 6);
        dma_write(l, CSDP(lch));
 }
+EXPORT_SYMBOL(omap_set_dma_src_data_pack);
 
 void omap_set_dma_src_burst_mode(int lch, enum omap_dma_burst_mode burst_mode)
 {
@@ -478,6 +479,7 @@ void omap_set_dma_src_burst_mode(int lch, enum omap_dma_burst_mode burst_mode)
        l |= (burst << 7);
        dma_write(l, CSDP(lch));
 }
+EXPORT_SYMBOL(omap_set_dma_src_burst_mode);
 
 /* Note that dest_port is only for OMAP1 */
 void omap_set_dma_dest_params(int lch, int dest_port, int dest_amode,
@@ -509,16 +511,17 @@ void omap_set_dma_dest_params(int lch, int dest_port, int dest_amode,
        dma_write(dst_ei, CDEI(lch));
        dma_write(dst_fi, CDFI(lch));
 }
+EXPORT_SYMBOL(omap_set_dma_dest_params);
 
 void omap_set_dma_dest_index(int lch, int eidx, int fidx)
 {
-       if (cpu_class_is_omap2()) {
-               REVISIT_24XX();
+       if (cpu_class_is_omap2())
                return;
-       }
+
        dma_write(eidx, CDEI(lch));
        dma_write(fidx, CDFI(lch));
 }
+EXPORT_SYMBOL(omap_set_dma_dest_index);
 
 void omap_set_dma_dest_data_pack(int lch, int enable)
 {
@@ -530,6 +533,7 @@ void omap_set_dma_dest_data_pack(int lch, int enable)
                l |= 1 << 13;
        dma_write(l, CSDP(lch));
 }
+EXPORT_SYMBOL(omap_set_dma_dest_data_pack);
 
 void omap_set_dma_dest_burst_mode(int lch, enum omap_dma_burst_mode burst_mode)
 {
@@ -570,6 +574,7 @@ void omap_set_dma_dest_burst_mode(int lch, enum omap_dma_burst_mode burst_mode)
        l |= (burst << 14);
        dma_write(l, CSDP(lch));
 }
+EXPORT_SYMBOL(omap_set_dma_dest_burst_mode);
 
 static inline void omap_enable_channel_irq(int lch)
 {
@@ -595,11 +600,13 @@ void omap_enable_dma_irq(int lch, u16 bits)
 {
        dma_chan[lch].enabled_irqs |= bits;
 }
+EXPORT_SYMBOL(omap_enable_dma_irq);
 
 void omap_disable_dma_irq(int lch, u16 bits)
 {
        dma_chan[lch].enabled_irqs &= ~bits;
 }
+EXPORT_SYMBOL(omap_disable_dma_irq);
 
 static inline void enable_lnk(int lch)
 {
@@ -615,8 +622,9 @@ static inline void enable_lnk(int lch)
                l = dma_chan[lch].next_lch | (1 << 15);
 
 #ifndef CONFIG_ARCH_OMAP1
-       if (dma_chan[lch].next_linked_ch != -1)
-               l = dma_chan[lch].next_linked_ch | (1 << 15);
+       if (cpu_class_is_omap2())
+               if (dma_chan[lch].next_linked_ch != -1)
+                       l = dma_chan[lch].next_linked_ch | (1 << 15);
 #endif
 
        dma_write(l, CLNK_CTRL(lch));
@@ -658,7 +666,7 @@ static inline void omap2_enable_irq_lch(int lch)
 }
 
 int omap_request_dma(int dev_id, const char *dev_name,
-                    void (* callback)(int lch, u16 ch_status, void *data),
+                    void (*callback)(int lch, u16 ch_status, void *data),
                     void *data, int *dma_ch_out)
 {
        int ch, free_ch = -1;
@@ -691,10 +699,14 @@ int omap_request_dma(int dev_id, const char *dev_name,
        chan->dev_name = dev_name;
        chan->callback = callback;
        chan->data = data;
+
 #ifndef CONFIG_ARCH_OMAP1
-       chan->chain_id = -1;
-       chan->next_linked_ch = -1;
+       if (cpu_class_is_omap2()) {
+               chan->chain_id = -1;
+               chan->next_linked_ch = -1;
+       }
 #endif
+
        chan->enabled_irqs = OMAP_DMA_DROP_IRQ | OMAP_DMA_BLOCK_IRQ;
 
        if (cpu_class_is_omap1())
@@ -709,8 +721,10 @@ int omap_request_dma(int dev_id, const char *dev_name,
                        set_gdma_dev(free_ch + 1, dev_id);
                        dev_id = free_ch + 1;
                }
-               /* Disable the 1510 compatibility mode and set the sync device
-                * id. */
+               /*
+                * Disable the 1510 compatibility mode and set the sync device
+                * id.
+                */
                dma_write(dev_id | (1 << 10), CCR(free_ch));
        } else if (cpu_is_omap730() || cpu_is_omap15xx()) {
                dma_write(dev_id, CCR(free_ch));
@@ -718,7 +732,6 @@ int omap_request_dma(int dev_id, const char *dev_name,
 
        if (cpu_class_is_omap2()) {
                omap2_enable_irq_lch(free_ch);
-
                omap_enable_channel_irq(free_ch);
                /* Clear the CSR register and IRQ status register */
                dma_write(OMAP2_DMA_CSR_CLEAR_MASK, CSR(free_ch));
@@ -729,6 +742,7 @@ int omap_request_dma(int dev_id, const char *dev_name,
 
        return 0;
 }
+EXPORT_SYMBOL(omap_request_dma);
 
 void omap_free_dma(int lch)
 {
@@ -736,11 +750,12 @@ void omap_free_dma(int lch)
 
        spin_lock_irqsave(&dma_chan_lock, flags);
        if (dma_chan[lch].dev_id == -1) {
-               printk("omap_dma: trying to free nonallocated DMA channel %d\n",
+               pr_err("omap_dma: trying to free unallocated DMA channel %d\n",
                       lch);
                spin_unlock_irqrestore(&dma_chan_lock, flags);
                return;
        }
+
        dma_chan[lch].dev_id = -1;
        dma_chan[lch].next_lch = -1;
        dma_chan[lch].callback = NULL;
@@ -772,6 +787,7 @@ void omap_free_dma(int lch)
                omap_clear_dma(lch);
        }
 }
+EXPORT_SYMBOL(omap_free_dma);
 
 /**
  * @brief omap_dma_set_global_params : Set global priority settings for dma
@@ -865,6 +881,7 @@ void omap_clear_dma(int lch)
 
        local_irq_restore(flags);
 }
+EXPORT_SYMBOL(omap_clear_dma);
 
 void omap_start_dma(int lch)
 {
@@ -903,8 +920,10 @@ void omap_start_dma(int lch)
 
        l = dma_read(CCR(lch));
 
-       /* Errata: On ES2.0 BUFFERING disable must be set.
-        * This will always fail on ES1.0 */
+       /*
+        * Errata: On ES2.0 BUFFERING disable must be set.
+        * This will always fail on ES1.0
+        */
        if (cpu_is_omap24xx())
                l |= OMAP_DMA_CCR_EN;
 
@@ -913,6 +932,7 @@ void omap_start_dma(int lch)
 
        dma_chan[lch].flags |= OMAP_DMA_ACTIVE;
 }
+EXPORT_SYMBOL(omap_start_dma);
 
 void omap_stop_dma(int lch)
 {
@@ -949,13 +969,14 @@ void omap_stop_dma(int lch)
 
        dma_chan[lch].flags &= ~OMAP_DMA_ACTIVE;
 }
+EXPORT_SYMBOL(omap_stop_dma);
 
 /*
  * Allows changing the DMA callback function or data. This may be needed if
  * the driver shares a single DMA channel for multiple dma triggers.
  */
 int omap_set_dma_callback(int lch,
-                         void (* callback)(int lch, u16 ch_status, void *data),
+                         void (*callback)(int lch, u16 ch_status, void *data),
                          void *data)
 {
        unsigned long flags;
@@ -975,6 +996,7 @@ int omap_set_dma_callback(int lch,
 
        return 0;
 }
+EXPORT_SYMBOL(omap_set_dma_callback);
 
 /*
  * Returns current physical source address for the given DMA channel.
@@ -1005,6 +1027,7 @@ dma_addr_t omap_get_dma_src_pos(int lch)
 
        return offset;
 }
+EXPORT_SYMBOL(omap_get_dma_src_pos);
 
 /*
  * Returns current physical destination address for the given DMA channel.
@@ -1035,6 +1058,7 @@ dma_addr_t omap_get_dma_dst_pos(int lch)
 
        return offset;
 }
+EXPORT_SYMBOL(omap_get_dma_dst_pos);
 
 /*
  * Returns current source transfer counting for the given DMA channel.
@@ -1045,6 +1069,7 @@ int omap_get_dma_src_addr_counter(int lch)
 {
        return (dma_addr_t)dma_read(CSAC(lch));
 }
+EXPORT_SYMBOL(omap_get_dma_src_addr_counter);
 
 int omap_get_dma_active_status(int lch)
 {
@@ -1073,7 +1098,7 @@ int omap_dma_running(void)
  * For this DMA link to start, you still need to start (see omap_start_dma)
  * the first one. That will fire up the entire queue.
  */
-void omap_dma_link_lch (int lch_head, int lch_queue)
+void omap_dma_link_lch(int lch_head, int lch_queue)
 {
        if (omap_dma_in_1510_mode()) {
                printk(KERN_ERR "DMA linking is not supported in 1510 mode\n");
@@ -1090,11 +1115,12 @@ void omap_dma_link_lch (int lch_head, int lch_queue)
 
        dma_chan[lch_head].next_lch = lch_queue;
 }
+EXPORT_SYMBOL(omap_dma_link_lch);
 
 /*
  * Once the DMA queue is stopped, we can destroy it.
  */
-void omap_dma_unlink_lch (int lch_head, int lch_queue)
+void omap_dma_unlink_lch(int lch_head, int lch_queue)
 {
        if (omap_dma_in_1510_mode()) {
                printk(KERN_ERR "DMA linking is not supported in 1510 mode\n");
@@ -1109,7 +1135,6 @@ void omap_dma_unlink_lch (int lch_head, int lch_queue)
                dump_stack();
        }
 
-
        if ((dma_chan[lch_head].flags & OMAP_DMA_ACTIVE) ||
            (dma_chan[lch_head].flags & OMAP_DMA_ACTIVE)) {
                printk(KERN_ERR "omap_dma: You need to stop the DMA channels "
@@ -1119,6 +1144,9 @@ void omap_dma_unlink_lch (int lch_head, int lch_queue)
 
        dma_chan[lch_head].next_lch = -1;
 }
+EXPORT_SYMBOL(omap_dma_unlink_lch);
+
+/*----------------------------------------------------------------------------*/
 
 #ifndef CONFIG_ARCH_OMAP1
 /* Create chain of DMA channesls */
@@ -1242,6 +1270,7 @@ int omap_request_dma_chain(int dev_id, const char *dev_name,
                for (i = 0; i < (no_of_chans - 1); i++)
                        create_dma_lch_chain(channels[i], channels[i + 1]);
        }
+
        return 0;
 }
 EXPORT_SYMBOL(omap_request_dma_chain);
@@ -1284,6 +1313,7 @@ int omap_modify_dma_chain_params(int chain_id,
                 */
                omap_set_dma_params(channels[i], &params);
        }
+
        return 0;
 }
 EXPORT_SYMBOL(omap_modify_dma_chain_params);
@@ -1327,6 +1357,7 @@ int omap_free_dma_chain(int chain_id)
        dma_linked_lch[chain_id].linked_dmach_q = NULL;
        dma_linked_lch[chain_id].chain_mode = -1;
        dma_linked_lch[chain_id].chain_state = -1;
+
        return (0);
 }
 EXPORT_SYMBOL(omap_free_dma_chain);
@@ -1357,6 +1388,7 @@ int omap_dma_chain_status(int chain_id)
 
        if (OMAP_DMA_CHAIN_QEMPTY(chain_id))
                return OMAP_DMA_CHAIN_INACTIVE;
+
        return OMAP_DMA_CHAIN_ACTIVE;
 }
 EXPORT_SYMBOL(omap_dma_chain_status);
@@ -1382,8 +1414,10 @@ int omap_dma_chain_a_transfer(int chain_id, int src_start, int dest_start,
        u32 l, lch;
        int start_dma = 0;
 
-       /* if buffer size is less than 1 then there is
-        * no use of starting the chain */
+       /*
+        * if buffer size is less than 1 then there is
+        * no use of starting the chain
+        */
        if (elem_count < 1) {
                printk(KERN_ERR "Invalid buffer size\n");
                return -EINVAL;
@@ -1428,12 +1462,16 @@ int omap_dma_chain_a_transfer(int chain_id, int src_start, int dest_start,
        dma_write(elem_count, CEN(lch));
        dma_write(frame_count, CFN(lch));
 
-       /* If the chain is dynamically linked,
-        * then we may have to start the chain if its not active */
+       /*
+        * If the chain is dynamically linked,
+        * then we may have to start the chain if its not active
+        */
        if (dma_linked_lch[chain_id].chain_mode == OMAP_DMA_DYNAMIC_CHAIN) {
 
-               /* In Dynamic chain, if the chain is not started,
-                * queue the channel */
+               /*
+                * In Dynamic chain, if the chain is not started,
+                * queue the channel
+                */
                if (dma_linked_lch[chain_id].chain_state ==
                                                DMA_CHAIN_NOTSTARTED) {
                        /* Enable the link in previous channel */
@@ -1443,8 +1481,10 @@ int omap_dma_chain_a_transfer(int chain_id, int src_start, int dest_start,
                        dma_chan[lch].state = DMA_CH_QUEUED;
                }
 
-               /* Chain is already started, make sure its active,
-                * if not then start the chain */
+               /*
+                * Chain is already started, make sure its active,
+                * if not then start the chain
+                */
                else {
                        start_dma = 1;
 
@@ -1491,6 +1531,7 @@ int omap_dma_chain_a_transfer(int chain_id, int src_start, int dest_start,
                        dma_chan[lch].flags |= OMAP_DMA_ACTIVE;
                }
        }
+
        return 0;
 }
 EXPORT_SYMBOL(omap_dma_chain_a_transfer);
@@ -1542,6 +1583,7 @@ int omap_start_dma_chain_transfers(int chain_id)
        dma_write(l, CCR(channels[0]));
 
        dma_chan[channels[0]].flags |= OMAP_DMA_ACTIVE;
+
        return 0;
 }
 EXPORT_SYMBOL(omap_start_dma_chain_transfers);
@@ -1573,7 +1615,8 @@ int omap_stop_dma_chain_transfers(int chain_id)
        }
        channels = dma_linked_lch[chain_id].linked_dmach_q;
 
-       /* DMA Errata:
+       /*
+        * DMA Errata:
         * Special programming model needed to disable DMA before end of block
         */
        sys_cf = dma_read(OCP_SYSCONFIG);
@@ -1601,6 +1644,7 @@ int omap_stop_dma_chain_transfers(int chain_id)
 
        /* Errata - put in the old value */
        dma_write(sys_cf, OCP_SYSCONFIG);
+
        return 0;
 }
 EXPORT_SYMBOL(omap_stop_dma_chain_transfers);
@@ -1716,7 +1760,7 @@ int omap_get_dma_chain_src_pos(int chain_id)
        return dma_read(CSAC(lch));
 }
 EXPORT_SYMBOL(omap_get_dma_chain_src_pos);
-#endif
+#endif /* ifndef CONFIG_ARCH_OMAP1 */
 
 /*----------------------------------------------------------------------------*/
 
@@ -1752,6 +1796,7 @@ static int omap1_dma_handle_ch(int ch)
                dma_chan[ch].flags &= ~OMAP_DMA_ACTIVE;
        if (likely(dma_chan[ch].callback != NULL))
                dma_chan[ch].callback(ch, csr, dma_chan[ch].data);
+
        return 1;
 }
 
@@ -1786,7 +1831,8 @@ static int omap2_dma_handle_ch(int ch)
 
        if (!status) {
                if (printk_ratelimit())
-                       printk(KERN_WARNING "Spurious DMA IRQ for lch %d\n", ch);
+                       printk(KERN_WARNING "Spurious DMA IRQ for lch %d\n",
+                               ch);
                dma_write(1 << ch, IRQSTATUS_L0);
                return 0;
        }
@@ -1874,7 +1920,7 @@ static struct irqaction omap24xx_dma_irq;
 static struct lcd_dma_info {
        spinlock_t lock;
        int reserved;
-       void (* callback)(u16 status, void *data);
+       void (*callback)(u16 status, void *data);
        void *cb_data;
 
        int active;
@@ -1896,6 +1942,7 @@ void omap_set_lcd_dma_b1(unsigned long addr, u16 fb_xres, u16 fb_yres,
        lcd_dma.xres = fb_xres;
        lcd_dma.yres = fb_yres;
 }
+EXPORT_SYMBOL(omap_set_lcd_dma_b1);
 
 void omap_set_lcd_dma_src_port(int port)
 {
@@ -1906,12 +1953,13 @@ void omap_set_lcd_dma_ext_controller(int external)
 {
        lcd_dma.ext_ctrl = external;
 }
+EXPORT_SYMBOL(omap_set_lcd_dma_ext_controller);
 
 void omap_set_lcd_dma_single_transfer(int single)
 {
        lcd_dma.single_transfer = single;
 }
-
+EXPORT_SYMBOL(omap_set_lcd_dma_single_transfer);
 
 void omap_set_lcd_dma_b1_rotation(int rotate)
 {
@@ -1922,6 +1970,7 @@ void omap_set_lcd_dma_b1_rotation(int rotate)
        }
        lcd_dma.rotate = rotate;
 }
+EXPORT_SYMBOL(omap_set_lcd_dma_b1_rotation);
 
 void omap_set_lcd_dma_b1_mirror(int mirror)
 {
@@ -1931,6 +1980,7 @@ void omap_set_lcd_dma_b1_mirror(int mirror)
        }
        lcd_dma.mirror = mirror;
 }
+EXPORT_SYMBOL(omap_set_lcd_dma_b1_mirror);
 
 void omap_set_lcd_dma_b1_vxres(unsigned long vxres)
 {
@@ -1941,6 +1991,7 @@ void omap_set_lcd_dma_b1_vxres(unsigned long vxres)
        }
        lcd_dma.vxres = vxres;
 }
+EXPORT_SYMBOL(omap_set_lcd_dma_b1_vxres);
 
 void omap_set_lcd_dma_b1_scale(unsigned int xscale, unsigned int yscale)
 {
@@ -1951,6 +2002,7 @@ void omap_set_lcd_dma_b1_scale(unsigned int xscale, unsigned int yscale)
        lcd_dma.xscale = xscale;
        lcd_dma.yscale = yscale;
 }
+EXPORT_SYMBOL(omap_set_lcd_dma_b1_scale);
 
 static void set_b1_regs(void)
 {
@@ -1981,8 +2033,11 @@ static void set_b1_regs(void)
        xscale = lcd_dma.xscale ? lcd_dma.xscale : 1;
        yscale = lcd_dma.yscale ? lcd_dma.yscale : 1;
        BUG_ON(vxres < lcd_dma.xres);
-#define PIXADDR(x,y) (lcd_dma.addr + ((y) * vxres * yscale + (x) * xscale) * es)
+
+#define PIXADDR(x, y) (lcd_dma.addr +                                  \
+               ((y) * vxres * yscale + (x) * xscale) * es)
 #define PIXSTEP(sx, sy, dx, dy) (PIXADDR(dx, dy) - PIXADDR(sx, sy) - es + 1)
+
        switch (lcd_dma.rotate) {
        case 0:
                if (!lcd_dma.mirror) {
@@ -1991,8 +2046,8 @@ static void set_b1_regs(void)
                        /* 1510 DMA requires the bottom address to be 2 more
                         * than the actual last memory access location. */
                        if (omap_dma_in_1510_mode() &&
-                           lcd_dma.data_type == OMAP_DMA_DATA_TYPE_S32)
-                               bottom += 2;
+                               lcd_dma.data_type == OMAP_DMA_DATA_TYPE_S32)
+                                       bottom += 2;
                        ei = PIXSTEP(0, 0, 1, 0);
                        fi = PIXSTEP(lcd_dma.xres - 1, 0, 0, 1);
                } else {
@@ -2119,7 +2174,7 @@ static irqreturn_t lcd_dma_irq_handler(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-int omap_request_lcd_dma(void (* callback)(u16 status, void *data),
+int omap_request_lcd_dma(void (*callback)(u16 status, void *data),
                         void *data)
 {
        spin_lock_irq(&lcd_dma.lock);
@@ -2145,6 +2200,7 @@ int omap_request_lcd_dma(void (* callback)(u16 status, void *data),
 
        return 0;
 }
+EXPORT_SYMBOL(omap_request_lcd_dma);
 
 void omap_free_lcd_dma(void)
 {
@@ -2161,12 +2217,14 @@ void omap_free_lcd_dma(void)
        lcd_dma.reserved = 0;
        spin_unlock(&lcd_dma.lock);
 }
+EXPORT_SYMBOL(omap_free_lcd_dma);
 
 void omap_enable_lcd_dma(void)
 {
        u16 w;
 
-       /* Set the Enable bit only if an external controller is
+       /*
+        * Set the Enable bit only if an external controller is
         * connected. Otherwise the OMAP internal controller will
         * start the transfer when it gets enabled.
         */
@@ -2183,6 +2241,7 @@ void omap_enable_lcd_dma(void)
        w |= 1 << 7;
        omap_writew(w, OMAP1610_DMA_LCD_CCR);
 }
+EXPORT_SYMBOL(omap_enable_lcd_dma);
 
 void omap_setup_lcd_dma(void)
 {
@@ -2198,16 +2257,18 @@ void omap_setup_lcd_dma(void)
                u16 w;
 
                w = omap_readw(OMAP1610_DMA_LCD_CCR);
-               /* If DMA was already active set the end_prog bit to have
+               /*
+                * If DMA was already active set the end_prog bit to have
                 * the programmed register set loaded into the active
                 * register set.
                 */
                w |= 1 << 11;           /* End_prog */
                if (!lcd_dma.single_transfer)
-                       w |= (3 << 8);  /* Auto_init, repeat */
+                       w |= (3 << 8);  /* Auto_init, repeat */
                omap_writew(w, OMAP1610_DMA_LCD_CCR);
        }
 }
+EXPORT_SYMBOL(omap_setup_lcd_dma);
 
 void omap_stop_lcd_dma(void)
 {
@@ -2225,6 +2286,7 @@ void omap_stop_lcd_dma(void)
        w &= ~(1 << 8);
        omap_writew(w, OMAP1610_DMA_LCD_CTRL);
 }
+EXPORT_SYMBOL(omap_stop_lcd_dma);
 
 /*----------------------------------------------------------------------------*/
 
@@ -2314,8 +2376,10 @@ static int __init omap_init_dma(void)
                        continue;
 
                if (cpu_class_is_omap1()) {
-                       /* request_irq() doesn't like dev_id (ie. ch) being
-                        * zero, so we have to kludge around this. */
+                       /*
+                        * request_irq() doesn't like dev_id (ie. ch) being
+                        * zero, so we have to kludge around this.
+                        */
                        r = request_irq(omap1_dma_irq[ch],
                                        omap1_dma_irq_handler, 0, "DMA",
                                        (void *) (ch + 1));
@@ -2360,48 +2424,4 @@ static int __init omap_init_dma(void)
 
 arch_initcall(omap_init_dma);
 
-EXPORT_SYMBOL(omap_get_dma_src_pos);
-EXPORT_SYMBOL(omap_get_dma_dst_pos);
-EXPORT_SYMBOL(omap_get_dma_src_addr_counter);
-EXPORT_SYMBOL(omap_clear_dma);
-EXPORT_SYMBOL(omap_set_dma_priority);
-EXPORT_SYMBOL(omap_request_dma);
-EXPORT_SYMBOL(omap_free_dma);
-EXPORT_SYMBOL(omap_start_dma);
-EXPORT_SYMBOL(omap_stop_dma);
-EXPORT_SYMBOL(omap_set_dma_callback);
-EXPORT_SYMBOL(omap_enable_dma_irq);
-EXPORT_SYMBOL(omap_disable_dma_irq);
-
-EXPORT_SYMBOL(omap_set_dma_transfer_params);
-EXPORT_SYMBOL(omap_set_dma_color_mode);
-EXPORT_SYMBOL(omap_set_dma_write_mode);
-
-EXPORT_SYMBOL(omap_set_dma_src_params);
-EXPORT_SYMBOL(omap_set_dma_src_index);
-EXPORT_SYMBOL(omap_set_dma_src_data_pack);
-EXPORT_SYMBOL(omap_set_dma_src_burst_mode);
-
-EXPORT_SYMBOL(omap_set_dma_dest_params);
-EXPORT_SYMBOL(omap_set_dma_dest_index);
-EXPORT_SYMBOL(omap_set_dma_dest_data_pack);
-EXPORT_SYMBOL(omap_set_dma_dest_burst_mode);
-
-EXPORT_SYMBOL(omap_set_dma_params);
-
-EXPORT_SYMBOL(omap_dma_link_lch);
-EXPORT_SYMBOL(omap_dma_unlink_lch);
-
-EXPORT_SYMBOL(omap_request_lcd_dma);
-EXPORT_SYMBOL(omap_free_lcd_dma);
-EXPORT_SYMBOL(omap_enable_lcd_dma);
-EXPORT_SYMBOL(omap_setup_lcd_dma);
-EXPORT_SYMBOL(omap_stop_lcd_dma);
-EXPORT_SYMBOL(omap_set_lcd_dma_b1);
-EXPORT_SYMBOL(omap_set_lcd_dma_single_transfer);
-EXPORT_SYMBOL(omap_set_lcd_dma_ext_controller);
-EXPORT_SYMBOL(omap_set_lcd_dma_b1_rotation);
-EXPORT_SYMBOL(omap_set_lcd_dma_b1_vxres);
-EXPORT_SYMBOL(omap_set_lcd_dma_b1_scale);
-EXPORT_SYMBOL(omap_set_lcd_dma_b1_mirror);
 
index e62eb6ec0cce1b509a2d8f20a3fe1a5977a98aef..00b1f68e0f1cd13b5619cae52ee57087adc29ff5 100644 (file)
@@ -435,18 +435,21 @@ struct omap_dma_channel_params {
        int frame_count;        /* number of frames in a element */
 
        int src_port;           /* Only on OMAP1 REVISIT: Is this needed? */
-       int src_amode;          /* constant , post increment, indexed , double indexed */
+       int src_amode;          /* constant, post increment, indexed,
+                                       double indexed */
        unsigned long src_start;        /* source address : physical */
        int src_ei;             /* source element index */
        int src_fi;             /* source frame index */
 
        int dst_port;           /* Only on OMAP1 REVISIT: Is this needed? */
-       int dst_amode;          /* constant , post increment, indexed , double indexed */
+       int dst_amode;          /* constant, post increment, indexed,
+                                       double indexed */
        unsigned long dst_start;        /* source address : physical */
        int dst_ei;             /* source element index */
        int dst_fi;             /* source frame index */
 
-       int trigger;            /* trigger attached if the channel is synchronized */
+       int trigger;            /* trigger attached if the channel is
+                                       synchronized */
        int sync_mode;          /* sycn on element, frame , block or packet */
        int src_or_dst_synch;   /* source synch(1) or destination synch(0) */
 
@@ -463,8 +466,8 @@ struct omap_dma_channel_params {
 
 extern void omap_set_dma_priority(int lch, int dst_port, int priority);
 extern int omap_request_dma(int dev_id, const char *dev_name,
-                           void (* callback)(int lch, u16 ch_status, void *data),
-                           void *data, int *dma_ch);
+                               void (*callback)(int lch, u16 ch_status,
+                               void *data), void *data, int *dma_ch);
 extern void omap_enable_dma_irq(int ch, u16 irq_bits);
 extern void omap_disable_dma_irq(int ch, u16 irq_bits);
 extern void omap_free_dma(int ch);
@@ -495,13 +498,13 @@ extern void omap_set_dma_dest_burst_mode(int lch,
                                         enum omap_dma_burst_mode burst_mode);
 
 extern void omap_set_dma_params(int lch,
-                               struct omap_dma_channel_params * params);
+                               struct omap_dma_channel_params *params);
 
-extern void omap_dma_link_lch (int lch_head, int lch_queue);
-extern void omap_dma_unlink_lch (int lch_head, int lch_queue);
+extern void omap_dma_link_lch(int lch_head, int lch_queue);
+extern void omap_dma_unlink_lch(int lch_head, int lch_queue);
 
 extern int omap_set_dma_callback(int lch,
-                       void (* callback)(int lch, u16 ch_status, void *data),
+                       void (*callback)(int lch, u16 ch_status, void *data),
                        void *data);
 extern dma_addr_t omap_get_dma_src_pos(int lch);
 extern dma_addr_t omap_get_dma_dst_pos(int lch);
@@ -541,7 +544,7 @@ extern int omap_dma_chain_status(int chain_id);
 #endif
 
 /* LCD DMA functions */
-extern int omap_request_lcd_dma(void (* callback)(u16 status, void *data),
+extern int omap_request_lcd_dma(void (*callback)(u16 status, void *data),
                                void *data);
 extern void omap_free_lcd_dma(void);
 extern void omap_setup_lcd_dma(void);