X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/fb189822fcab111e55d1c7e83c482dc2c144500a..a0d848ed9dde978ad40ef8b752ff2d651c00091b:/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-core.h?ds=inline

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 8e09564bc..f0c2ec3ee 100644
--- 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
@@ -16,6 +17,11 @@
 #define GLAMO_MMC_BUFFER_SIZE (64 * 1024)
 #define GLAMO_FB_SIZE	(GLAMO_INTERNAL_RAM_SIZE - GLAMO_MMC_BUFFER_SIZE)
 
+enum glamo_pll {
+    GLAMO_PLL1,
+    GLAMO_PLL2,
+};
+
 struct glamo_core {
 	int irq;
 	int irq_works; /* 0 means PCB does not support Glamo IRQ */
@@ -23,7 +29,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;
@@ -37,45 +43,14 @@ struct glamo_script {
 	u_int16_t val;
 };
 
-int glamo_run_script(struct glamo_core *glamo,
-		     struct glamo_script *script, int len, int may_sleep);
+void glamo_engine_div_enable(struct glamo_core *glamo, enum glamo_engine engine);
+void glamo_engine_div_disable(struct glamo_core *glamo, enum glamo_engine engine);
 
-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_pll_rate(struct glamo_core *glamo, enum glamo_pll pll);
 
-};
+int glamo_run_script(struct glamo_core *glamo,
+		     const struct glamo_script *script, int len, int may_sleep);
 
 int glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine);
 int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine);