Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[deliverable/linux.git] / sound / soc / blackfin / bf5xx-sport.h

diff --git a/sound/soc/blackfin/bf5xx-sport.h b/sound/soc/blackfin/bf5xx-sport.h
index a86e8cc0b2d30ab45b36e7ab489e8cbc7d7e8f2f..5ab60bd613ea314cfc73b3219f07282b8945f8f2 100644 (file)
--- a/sound/soc/blackfin/bf5xx-sport.h
+++ b/sound/soc/blackfin/bf5xx-sport.h
@@ -1,5 +1,5 @@
 /*
- * File:         bf5xx_ac97_sport.h
+ * File:         bf5xx_sport.h
  * Based on:
  * Author:       Roy Huang <roy.huang@analog.com>
  *
@@ -33,15 +33,18 @@
 #include <linux/types.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
+#include <linux/platform_device.h>
 #include <asm/dma.h>
 #include <asm/bfin_sport.h>
 
 #define DESC_ELEMENT_COUNT 9
 
 struct sport_device {
+       int num;
        int dma_rx_chan;
        int dma_tx_chan;
        int err_irq;
+       const unsigned short *pin_req;
        struct sport_register *regs;
 
        unsigned char *rx_buf;
@@ -103,17 +106,20 @@ struct sport_device {
        void *private_data;
 };
 
-extern struct sport_device *sport_handle;
-
 struct sport_param {
+       int num;
        int dma_rx_chan;
        int dma_tx_chan;
        int err_irq;
+       const unsigned short *pin_req;
        struct sport_register *regs;
+       unsigned int wdsize;
+       unsigned int dummy_count;
+       void *private_data;
 };
 
-struct sport_device *sport_init(struct sport_param *param, unsigned wdsize,
-               unsigned dummy_count, void *private_data);
+struct sport_device *sport_init(struct platform_device *pdev,
+       unsigned int wdsize, unsigned int dummy_count, size_t priv_size);
 
 void sport_done(struct sport_device *sport);