Cleanup glamo platform_data.

SVN-Revision: 16863

2 files changed, 56 insertions, 15 deletions

diff --git a/target/linux/s3c24xx/files-2.6.30/include/linux/mfd/glamo.h b/target/linux/s3c24xx/files-2.6.30/include/linux/mfd/glamo.h
new file mode 100644
index 0000000000..47d9fd257e
--- /dev/null
+++ b/target/linux/s3c24xx/files-2.6.30/include/linux/mfd/glamo.h
@@ -0,0 +1,49 @@
+#ifndef __GLAMO_MFD_H
+#define __GLAMO_MFD_H
+
+struct glamo_core;
+struct glamo_spigpio_platform_data;
+struct glamo_fb_platform_data;
+
+struct glamo_mmc_platform_data {
+	int	(*glamo_mmc_use_slow)(void);
+
+    struct glamo_core *core;
+};
+
+struct glamo_platform_data {
+    struct glamo_fb_platform_data      *fb_data;
+    struct glamo_spigpio_platform_data *spigpio_data;
+    struct glamo_mmc_platform_data     *mmc_data;
+
+    unsigned int osci_clock_rate;
+
+    int (*glamo_irq_is_wired)(void);
+    void (*glamo_external_reset)(int);
+};
+
+enum glamo_engine {
+	GLAMO_ENGINE_CAPTURE = 0,
+	GLAMO_ENGINE_ISP = 1,
+	GLAMO_ENGINE_JPEG = 2,
+	GLAMO_ENGINE_MPEG_ENC = 3,
+	GLAMO_ENGINE_MPEG_DEC = 4,
+	GLAMO_ENGINE_LCD = 5,
+	GLAMO_ENGINE_CMDQ = 6,
+	GLAMO_ENGINE_2D = 7,
+	GLAMO_ENGINE_3D = 8,
+	GLAMO_ENGINE_MMC = 9,
+	GLAMO_ENGINE_MICROP0 = 10,
+	GLAMO_ENGINE_RISC = 11,
+	GLAMO_ENGINE_MICROP1_MPEG_ENC = 12,
+	GLAMO_ENGINE_MICROP1_MPEG_DEC = 13,
+#if 0
+	GLAMO_ENGINE_H264_DEC = 14,
+	GLAMO_ENGINE_RISC1 = 15,
+	GLAMO_ENGINE_SPI = 16,
+#endif
+	__NUM_GLAMO_ENGINES
+};
+
+
+#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/include/linux/spi/glamo.h b/target/linux/s3c24xx/files-2.6.30/include/linux/spi/glamo.h
index 05b8cd7573..cef9bcb67c 100644
--- a/target/linux/s3c24xx/files-2.6.30/include/linux/spi/glamo.h
+++ b/target/linux/s3c24xx/files-2.6.30/include/linux/spi/glamo.h
@@ -3,24 +3,16 @@
 
 #include <linux/glamo-gpio.h>
 
-struct spi_board_info;
-struct glamofb_handle;
 struct glamo_core;
 
-struct glamo_spi_info {
-	unsigned long 		board_size;
-	struct spi_board_info	*board_info;
-	struct glamofb_handle	*glamofb_handle;
-};
-
-struct glamo_spigpio_info {
-	unsigned int		pin_clk;
-	unsigned int		pin_mosi;
-	unsigned int		pin_miso;
-	unsigned int 		pin_cs;
-	int 			bus_num;
+struct glamo_spigpio_platform_data {
+	unsigned int pin_clk;
+	unsigned int pin_mosi;
+	unsigned int pin_miso;
+	unsigned int pin_cs;
+	int          bus_num;
 
-	struct glamo_core	*glamo;
+	struct glamo_core *core;
 };