3 files changed, 46 insertions, 30 deletions

diff --git a/include/linux/mfd/mcp.h b/include/linux/mfd/mcp.h
index f88c1cc0cb0f..a9e8bd157673 100644
--- a/include/linux/mfd/mcp.h
+++ b/include/linux/mfd/mcp.h
@@ -10,8 +10,6 @@
 #ifndef MCP_H
 #define MCP_H
 
-#include <mach/dma.h>
-
 struct mcp_ops;
 
 struct mcp {
@@ -21,12 +19,7 @@ struct mcp {
         int             use_count;
         unsigned int    sclk_rate;
         unsigned int    rw_timeout;
-        dma_device_t    dma_audio_rd;
-        dma_device_t    dma_audio_wr;
-        dma_device_t    dma_telco_rd;
-        dma_device_t    dma_telco_wr;
         struct device   attached_device;
-        int             gpio_base;
 };
 
 struct mcp_ops {
@@ -47,15 +40,14 @@ void mcp_disable(struct mcp *);
 #define mcp_get_sclk_rate(mcp)  ((mcp)->sclk_rate)
 
 struct mcp *mcp_host_alloc(struct device *, size_t);
-int mcp_host_register(struct mcp *);
-void mcp_host_unregister(struct mcp *);
+int mcp_host_add(struct mcp *, void *);
+void mcp_host_del(struct mcp *);
+void mcp_host_free(struct mcp *);
 
 struct mcp_driver {
         struct device_driver drv;
         int (*probe)(struct mcp *);
         void (*remove)(struct mcp *);
-        int (*suspend)(struct mcp *, pm_message_t);
-        int (*resume)(struct mcp *);
 };
 
 int mcp_driver_register(struct mcp_driver *);
diff --git a/include/linux/mfd/ucb1x00.h b/include/linux/mfd/ucb1x00.h
index 4321f044d1e4..28af41756360 100644
--- a/include/linux/mfd/ucb1x00.h
+++ b/include/linux/mfd/ucb1x00.h
@@ -12,7 +12,7 @@
 
 #include <linux/mfd/mcp.h>
 #include <linux/gpio.h>
-#include <linux/semaphore.h>
+#include <linux/mutex.h>
 
 #define UCB_IO_DATA     0x00
 #define UCB_IO_DIR      0x01
@@ -104,17 +104,27 @@
 #define UCB_MODE_DYN_VFLAG_ENA  (1 << 12)
 #define UCB_MODE_AUD_OFF_CAN    (1 << 13)
 
+enum ucb1x00_reset {
+        UCB_RST_PROBE,
+        UCB_RST_RESUME,
+        UCB_RST_SUSPEND,
+        UCB_RST_REMOVE,
+        UCB_RST_PROBE_FAIL,
+};
 
-struct ucb1x00_irq {
-        void *devid;
-        void (*fn)(int, void *);
+struct ucb1x00_plat_data {
+        void                    (*reset)(enum ucb1x00_reset);
+        unsigned                irq_base;
+        int                     gpio_base;
+        unsigned                can_wakeup;
 };
 
 struct ucb1x00 {
-        spinlock_t              lock;
+        raw_spinlock_t          irq_lock;
         struct mcp              *mcp;
         unsigned int            irq;
-        struct semaphore        adc_sem;
+        int                     irq_base;
+        struct mutex            adc_mutex;
         spinlock_t              io_lock;
         u16                     id;
         u16                     io_dir;
@@ -122,7 +132,8 @@ struct ucb1x00 {
         u16                     adc_cr;
         u16                     irq_fal_enbl;
         u16                     irq_ris_enbl;
-        struct ucb1x00_irq      irq_handler[16];
+        u16                     irq_mask;
+        u16                     irq_wake;
         struct device           dev;
         struct list_head        node;
         struct list_head        devs;
@@ -144,7 +155,7 @@ struct ucb1x00_driver {
         struct list_head        devs;
         int     (*add)(struct ucb1x00_dev *dev);
         void    (*remove)(struct ucb1x00_dev *dev);
-        int     (*suspend)(struct ucb1x00_dev *dev, pm_message_t state);
+        int     (*suspend)(struct ucb1x00_dev *dev);
         int     (*resume)(struct ucb1x00_dev *dev);
 };
 
@@ -245,15 +256,4 @@ unsigned int ucb1x00_adc_read(struct ucb1x00 *ucb, int adc_channel, int sync);
 void ucb1x00_adc_enable(struct ucb1x00 *ucb);
 void ucb1x00_adc_disable(struct ucb1x00 *ucb);
 
-/*
- * Which edges of the IRQ do you want to control today?
- */
-#define UCB_RISING      (1 << 0)
-#define UCB_FALLING     (1 << 1)
-
-int ucb1x00_hook_irq(struct ucb1x00 *ucb, unsigned int idx, void (*fn)(int, void *), void *devid);
-void ucb1x00_enable_irq(struct ucb1x00 *ucb, unsigned int idx, int edges);
-void ucb1x00_disable_irq(struct ucb1x00 *ucb, unsigned int idx, int edges);
-int ucb1x00_free_irq(struct ucb1x00 *ucb, unsigned int idx, void *devid);
-
 #endif
diff --git a/include/linux/sa11x0-dma.h b/include/linux/sa11x0-dma.h
new file mode 100644
index 000000000000..65839a58b8e5
--- /dev/null
+++ b/include/linux/sa11x0-dma.h
@@ -0,0 +1,24 @@
+/*
+ * SA11x0 DMA Engine support
+ *
+ * Copyright (C) 2012 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __LINUX_SA11X0_DMA_H
+#define __LINUX_SA11X0_DMA_H
+
+struct dma_chan;
+
+#if defined(CONFIG_DMA_SA11X0) || defined(CONFIG_DMA_SA11X0_MODULE)
+bool sa11x0_dma_filter_fn(struct dma_chan *, void *);
+#else
+static inline bool sa11x0_dma_filter_fn(struct dma_chan *c, void *d)
+{
+        return false;
+}
+#endif
+
+#endif