diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-06-15 14:51:02 +0300 |
|---|---|---|
| committer | Sebastien Jan <s-jan@ti.com> | 2011-10-10 15:07:50 +0200 |
| commit | 69c05b525db41506534204ac273d89dca839d88b (patch) | |
| tree | b3a1b8d04b0e4e4e9907cfbf779ce1334702001f | |
| parent | 99b26239c276ecb00efcbd9522a595ac33b4b4b0 (diff) | |
OMAP: DSS: Move omap_display_init declaration to common-board-devices.h
omap_display_init() resides in arch/arm/mach-omap2/display.c and is used
only by the board files. Thus move the declaration to
common-board-devices.h.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/board-am3517evm.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51-video.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-zoom-display.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/common-board-devices.h | 12 | ||||
| -rw-r--r-- | include/video/omapdss.h | 10 |
5 files changed, 16 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index 3500748507bf..32a542fa4361 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c @@ -39,6 +39,7 @@ #include "mux.h" #include "control.h" +#include "common-board-devices.h" #define AM35XX_EVM_MDIO_FREQUENCY (1000000) diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c index 2c1289bd5e6a..7c152fc29025 100644 --- a/arch/arm/mach-omap2/board-rx51-video.c +++ b/arch/arm/mach-omap2/board-rx51-video.c @@ -22,6 +22,7 @@ #include <mach/board-rx51.h> #include "mux.h" +#include "common-board-devices.h" #define RX51_LCD_RESET_GPIO 90 diff --git a/arch/arm/mach-omap2/board-zoom-display.c b/arch/arm/mach-omap2/board-zoom-display.c index d4683ba5f721..cd3e48584e7e 100644 --- a/arch/arm/mach-omap2/board-zoom-display.c +++ b/arch/arm/mach-omap2/board-zoom-display.c @@ -17,6 +17,8 @@ #include <plat/mcspi.h> #include <video/omapdss.h> +#include "common-board-devices.h" + #define LCD_PANEL_RESET_GPIO_PROD 96 #define LCD_PANEL_RESET_GPIO_PILOT 55 #define LCD_PANEL_QVGA_GPIO 56 diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h index e3cac357415e..90a44800a3f8 100644 --- a/arch/arm/mach-omap2/common-board-devices.h +++ b/arch/arm/mach-omap2/common-board-devices.h @@ -73,4 +73,16 @@ void omap4_pmic_get_config(struct twl4030_platform_data *pmic_data, #define OMAP_DSS_VENC_SUPPLIES \ REGULATOR_SUPPLY("vdda_dac", "omapdss_venc") +struct omap_dss_board_info; + +#if defined(CONFIG_OMAP2_DSS_MODULE) || defined(CONFIG_OMAP2_DSS) +/* Init with the board info */ +extern int omap_display_init(struct omap_dss_board_info *board_data); +#else +static inline int omap_display_init(struct omap_dss_board_info *board_data) +{ + return 0; +} +#endif + #endif /* __OMAP_COMMON_BOARD_DEVICES__ */ diff --git a/include/video/omapdss.h b/include/video/omapdss.h index 49e3b7bdc3fe..47b6baa9402d 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h @@ -250,16 +250,6 @@ struct omap_dss_board_info { void (*dsi_mux_pads)(bool enable); }; -#if defined(CONFIG_OMAP2_DSS_MODULE) || defined(CONFIG_OMAP2_DSS) -/* Init with the board info */ -extern int omap_display_init(struct omap_dss_board_info *board_data); -#else -static inline int omap_display_init(struct omap_dss_board_info *board_data) -{ - return 0; -} -#endif - struct omap_display_platform_data { struct omap_dss_board_info *board_data; /* TODO: Additional members to be added when PM is considered */ |