Title: [7827] trunk: bfin_sport: push char-driver specific sport defines into the driver
- Revision
- 7827
- Author
- vapier
- Date
- 2009-11-16 23:26:22 -0500 (Mon, 16 Nov 2009)
Log Message
bfin_sport: push char-driver specific sport defines into the driver
Modified Paths
Diff
Modified: trunk/arch/blackfin/include/asm/bfin_sport.h (7826 => 7827)
--- trunk/arch/blackfin/include/asm/bfin_sport.h 2009-11-16 23:53:32 UTC (rev 7826)
+++ trunk/arch/blackfin/include/asm/bfin_sport.h 2009-11-17 04:26:22 UTC (rev 7827)
@@ -16,9 +16,6 @@
#include <linux/wait.h>
#endif
-#define SPORT_MAJOR 237
-#define SPORT_NR_DEVS 2
-
/* Sport mode: it can be set to TDM, i2s or others */
#define NORM_MODE 0x0
#define TDM_MODE 0x1
@@ -108,35 +105,6 @@
unsigned long mrcs3;
};
-struct sport_dev {
- struct cdev cdev; /* Char device structure */
-
- int sport_num;
-
- int dma_rx_chan;
- int dma_tx_chan;
-
- int rx_irq;
- unsigned char *rx_buf; /* Buffer store the received data */
- int rx_len; /* How many bytes will be received */
- int rx_received; /* How many bytes has been received */
-
- int tx_irq;
- const unsigned char *tx_buf;
- int tx_len;
- int tx_sent;
-
- int err_irq;
-
- struct mutex mutex; /* mutual exclusion semaphore */
- struct task_struct *task;
-
- wait_queue_head_t waitq;
- int wait_con;
- struct sport_register *regs;
- struct sport_config config;
-};
-
#endif
#define SPORT_TCR1 0
Modified: trunk/drivers/char/bfin_sport.c (7826 => 7827)
--- trunk/drivers/char/bfin_sport.c 2009-11-16 23:53:32 UTC (rev 7826)
+++ trunk/drivers/char/bfin_sport.c 2009-11-17 04:26:22 UTC (rev 7827)
@@ -28,6 +28,38 @@
#include <asm/system.h>
#include <asm/portmux.h>
+#define SPORT_MAJOR 237
+#define SPORT_NR_DEVS 2
+
+struct sport_dev {
+ struct cdev cdev; /* Char device structure */
+
+ int sport_num;
+
+ int dma_rx_chan;
+ int dma_tx_chan;
+
+ int rx_irq;
+ unsigned char *rx_buf; /* Buffer store the received data */
+ int rx_len; /* How many bytes will be received */
+ int rx_received; /* How many bytes has been received */
+
+ int tx_irq;
+ const unsigned char *tx_buf;
+ int tx_len;
+ int tx_sent;
+
+ int err_irq;
+
+ struct mutex mutex; /* mutual exclusion semaphore */
+ struct task_struct *task;
+
+ wait_queue_head_t waitq;
+ int wait_con;
+ struct sport_register *regs;
+ struct sport_config config;
+};
+
static int sport_major = SPORT_MAJOR;
static int sport_minor;
static int sport_nr_devs = SPORT_NR_DEVS; /* number of bare sport devices */
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits