[s3c24xx] glamo mmc regulator fixes.

[openwrt.git] / target / linux / s3c24xx / files-2.6.30 / drivers / mfd / glamo / glamo-core.h

diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-core.h b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-core.h
index 8e09564..4675371 100644 (file)
--- a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-core.h
+++ b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-core.h
@@ -2,6 +2,7 @@
 #define __GLAMO_CORE_H
 
 #include <asm/system.h>
+#include <linux/mfd/glamo.h>
 
 /* for the time being, we put the on-screen framebuffer into the lowest
  * VRAM space.  This should make the code easily compatible with the various
@@ -23,7 +24,7 @@ struct glamo_core {
        struct resource *mem_core;
        void __iomem *base;
        struct platform_device *pdev;
-       struct glamofb_platform_data *pdata;
+       struct glamo_platform_data *pdata;
        u_int16_t type;
        u_int16_t revision;
        spinlock_t lock;
@@ -40,43 +41,6 @@ struct glamo_script {
 int glamo_run_script(struct glamo_core *glamo,
                     struct glamo_script *script, int len, int may_sleep);
 
-enum glamo_engine {
-       GLAMO_ENGINE_CAPTURE,
-       GLAMO_ENGINE_ISP,
-       GLAMO_ENGINE_JPEG,
-       GLAMO_ENGINE_MPEG_ENC,
-       GLAMO_ENGINE_MPEG_DEC,
-       GLAMO_ENGINE_LCD,
-       GLAMO_ENGINE_CMDQ,
-       GLAMO_ENGINE_2D,
-       GLAMO_ENGINE_3D,
-       GLAMO_ENGINE_MMC,
-       GLAMO_ENGINE_MICROP0,
-       GLAMO_ENGINE_RISC,
-       GLAMO_ENGINE_MICROP1_MPEG_ENC,
-       GLAMO_ENGINE_MICROP1_MPEG_DEC,
-#if 0
-       GLAMO_ENGINE_H264_DEC,
-       GLAMO_ENGINE_RISC1,
-       GLAMO_ENGINE_SPI,
-#endif
-       __NUM_GLAMO_ENGINES
-};
-
-struct glamo_mci_pdata {
-       struct glamo_core * pglamo;
-       unsigned int    gpio_detect;
-       unsigned int    gpio_wprotect;
-       unsigned long   ocr_avail;
-       int             (*glamo_can_set_mci_power)(void);
-       /* glamo-mci asking if it should use the slow clock to card */
-       int             (*glamo_mci_use_slow)(void);
-       int             (*glamo_irq_is_wired)(void);
-       void            (*mci_suspending)(struct platform_device *dev);
-       int             (*mci_all_dependencies_resumed)(struct platform_device *dev);
-
-};
-
 int glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine);
 int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine);
 void glamo_engine_reset(struct glamo_core *glamo, enum glamo_engine engine);