Merge branch 'topic/beep-rename' into topic/hda

[deliverable/linux.git] / drivers / mmc / host / s3cmci.h

diff --git a/drivers/mmc/host/s3cmci.h b/drivers/mmc/host/s3cmci.h
index 37d9c60010c90d260b8e8fae077693824241828d..c76b53dbeb6179a3545bbb26b7aa87d50302477e 100644 (file)
--- a/drivers/mmc/host/s3cmci.h
+++ b/drivers/mmc/host/s3cmci.h
@@ -8,9 +8,6 @@
  * published by the Free Software Foundation.
  */
 
-/* FIXME: DMA Resource management ?! */
-#define S3CMCI_DMA 0
-
 enum s3cmci_waitfor {
        COMPLETION_NONE,
        COMPLETION_FINALIZE,
@@ -42,6 +39,11 @@ struct s3cmci_host {
        int                     dodma;
        int                     dmatogo;
 
+       bool                    irq_disabled;
+       bool                    irq_enabled;
+       bool                    irq_state;
+       int                     sdio_irqen;
+
        struct mmc_request      *mrq;
        int                     cmd_is_stop;
 
@@ -51,7 +53,7 @@ struct s3cmci_host {
        int                     dma_complete;
 
        u32                     pio_sgptr;
-       u32                     pio_words;
+       u32                     pio_bytes;
        u32                     pio_count;
        u32                     *pio_ptr;
 #define XFER_NONE 0
@@ -67,4 +69,14 @@ struct s3cmci_host {
 
        unsigned int            ccnt, dcnt;
        struct tasklet_struct   pio_tasklet;
+
+#ifdef CONFIG_DEBUG_FS
+       struct dentry           *debug_root;
+       struct dentry           *debug_state;
+       struct dentry           *debug_regs;
+#endif
+
+#ifdef CONFIG_CPU_FREQ
+       struct notifier_block   freq_transition;
+#endif
 };