Merge branch 'core/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / powerpc / sysdev / fsl_soc.h

diff --git a/arch/powerpc/sysdev/fsl_soc.h b/arch/powerpc/sysdev/fsl_soc.h
index 74c4a96..0242998 100644 (file)
--- a/arch/powerpc/sysdev/fsl_soc.h
+++ b/arch/powerpc/sysdev/fsl_soc.h
@@ -10,6 +10,7 @@ extern u32 get_baudrate(void);
 extern u32 fsl_get_sys_freq(void);
 
 struct spi_board_info;
+struct device_node;
 
 extern int fsl_spi_init(struct spi_board_info *board_infos,
                        unsigned int num_board_infos,
@@ -17,5 +18,28 @@ extern int fsl_spi_init(struct spi_board_info *board_infos,
                        void (*deactivate_cs)(u8 cs, u8 polarity));
 
 extern void fsl_rstcr_restart(char *cmd);
+
+#if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
+#include <linux/bootmem.h>
+#include <asm/rheap.h>
+struct platform_diu_data_ops {
+       rh_block_t diu_rh_block[16];
+       rh_info_t diu_rh_info;
+       unsigned long diu_size;
+       void *diu_mem;
+
+       unsigned int (*get_pixel_format) (unsigned int bits_per_pixel,
+               int monitor_port);
+       void (*set_gamma_table) (int monitor_port, char *gamma_table_base);
+       void (*set_monitor_port) (int monitor_port);
+       void (*set_pixel_clock) (unsigned int pixclock);
+       ssize_t (*show_monitor_port) (int monitor_port, char *buf);
+       int (*set_sysfs_monitor_port) (int val);
+};
+
+extern struct platform_diu_data_ops diu_ops;
+int __init preallocate_diu_videomemory(void);
+#endif
+
 #endif
 #endif