karo: fdt: fix panel-dpi support

[karo-tx-uboot.git] / arch / arm / include / asm / global_data.h

diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index 438f128326a67a6c5237df32a0f392efdabee1c7..4713a7b7562523ee8427d1bbf61e1482669a3c3d 100644 (file)
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -8,10 +8,6 @@
 #ifndef        __ASM_GBL_DATA_H
 #define __ASM_GBL_DATA_H
 
-#ifdef CONFIG_OMAP
-#include <asm/omap_boot.h>
-#endif
-
 /* Architecture-specific global data */
 struct arch_global_data {
 #if defined(CONFIG_FSL_ESDHC)
@@ -25,6 +21,10 @@ struct arch_global_data {
        uint mp_alloc_top;
 #endif /* CONFIG_U_QE */
 
+#ifdef CONFIG_VIDEO_IPUV3
+       unsigned int    ipu_hw_rev;
+#endif
+
 #ifdef CONFIG_AT91FAMILY
        /* "static data" needed by at91's clock.c */
        unsigned long   cpu_clk_rate_hz;
@@ -45,8 +45,13 @@ struct arch_global_data {
        unsigned long tlb_size;
 #endif
 
-#ifdef CONFIG_OMAP
-       struct omap_boot_parameters omap_boot_params;
+#ifdef CONFIG_OMAP_COMMON
+       u32 omap_boot_device;
+       u32 omap_boot_mode;
+       u8 omap_ch_flags;
+#endif
+#ifdef CONFIG_FSL_LSCH3
+       unsigned long mem2_clk;
 #endif
 };