Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

OMAP: DSS2: Move display.h to include/video/

arch/arm/plat-omap/include/plat/display.h is an include for the OMAP DSS
driver. A more logical place for it is in include/video.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

+48 -49
+1 -1
arch/arm/mach-omap2/board-3430sdp.c
··· 37 37 #include <plat/common.h> 38 38 #include <plat/dma.h> 39 39 #include <plat/gpmc.h> 40 - #include <plat/display.h> 40 + #include <video/omapdss.h> 41 41 #include <plat/panel-generic-dpi.h> 42 42 43 43 #include <plat/gpmc-smc91x.h>
+1 -1
arch/arm/mach-omap2/board-4430sdp.c
··· 36 36 #include <plat/usb.h> 37 37 #include <plat/mmc.h> 38 38 #include <plat/omap4-keypad.h> 39 - #include <plat/display.h> 39 + #include <video/omapdss.h> 40 40 41 41 #include "mux.h" 42 42 #include "hsmmc.h"
+1 -1
arch/arm/mach-omap2/board-am3517evm.c
··· 34 34 #include <plat/board.h> 35 35 #include <plat/common.h> 36 36 #include <plat/usb.h> 37 - #include <plat/display.h> 37 + #include <video/omapdss.h> 38 38 #include <plat/panel-generic-dpi.h> 39 39 40 40 #include "mux.h"
+1 -1
arch/arm/mach-omap2/board-cm-t35.c
··· 45 45 #include <plat/nand.h> 46 46 #include <plat/gpmc.h> 47 47 #include <plat/usb.h> 48 - #include <plat/display.h> 48 + #include <video/omapdss.h> 49 49 #include <plat/panel-generic-dpi.h> 50 50 #include <plat/mcspi.h> 51 51
+1 -1
arch/arm/mach-omap2/board-devkit8000.c
··· 45 45 #include <plat/gpmc.h> 46 46 #include <plat/nand.h> 47 47 #include <plat/usb.h> 48 - #include <plat/display.h> 48 + #include <video/omapdss.h> 49 49 #include <plat/panel-generic-dpi.h> 50 50 51 51 #include <plat/mcspi.h>
+1 -1
arch/arm/mach-omap2/board-igep0020.c
··· 31 31 #include <plat/common.h> 32 32 #include <plat/gpmc.h> 33 33 #include <plat/usb.h> 34 - #include <plat/display.h> 34 + #include <video/omapdss.h> 35 35 #include <plat/panel-generic-dpi.h> 36 36 #include <plat/onenand.h> 37 37
+1 -1
arch/arm/mach-omap2/board-omap3beagle.c
··· 41 41 42 42 #include <plat/board.h> 43 43 #include <plat/common.h> 44 - #include <plat/display.h> 44 + #include <video/omapdss.h> 45 45 #include <plat/panel-generic-dpi.h> 46 46 #include <plat/gpmc.h> 47 47 #include <plat/nand.h>
+1 -1
arch/arm/mach-omap2/board-omap3evm.c
··· 44 44 #include <plat/usb.h> 45 45 #include <plat/common.h> 46 46 #include <plat/mcspi.h> 47 - #include <plat/display.h> 47 + #include <video/omapdss.h> 48 48 #include <plat/panel-generic-dpi.h> 49 49 50 50 #include "mux.h"
+1 -1
arch/arm/mach-omap2/board-omap3pandora.c
··· 46 46 #include <mach/hardware.h> 47 47 #include <plat/mcspi.h> 48 48 #include <plat/usb.h> 49 - #include <plat/display.h> 49 + #include <video/omapdss.h> 50 50 #include <plat/nand.h> 51 51 52 52 #include "mux.h"
+1 -1
arch/arm/mach-omap2/board-omap3stalker.c
··· 39 39 #include <plat/gpmc.h> 40 40 #include <plat/nand.h> 41 41 #include <plat/usb.h> 42 - #include <plat/display.h> 42 + #include <video/omapdss.h> 43 43 #include <plat/panel-generic-dpi.h> 44 44 45 45 #include <plat/mcspi.h>
+1 -1
arch/arm/mach-omap2/board-omap4panda.c
··· 34 34 #include <asm/mach-types.h> 35 35 #include <asm/mach/arch.h> 36 36 #include <asm/mach/map.h> 37 - #include <plat/display.h> 37 + #include <video/omapdss.h> 38 38 39 39 #include <plat/board.h> 40 40 #include <plat/common.h>
+1 -1
arch/arm/mach-omap2/board-overo.c
··· 43 43 44 44 #include <plat/board.h> 45 45 #include <plat/common.h> 46 - #include <plat/display.h> 46 + #include <video/omapdss.h> 47 47 #include <plat/panel-generic-dpi.h> 48 48 #include <mach/gpio.h> 49 49 #include <plat/gpmc.h>
+1 -1
arch/arm/mach-omap2/board-rx51-video.c
··· 15 15 #include <linux/spi/spi.h> 16 16 #include <linux/mm.h> 17 17 #include <asm/mach-types.h> 18 - #include <plat/display.h> 18 + #include <video/omapdss.h> 19 19 #include <plat/vram.h> 20 20 #include <plat/mcspi.h> 21 21
+1 -1
arch/arm/mach-omap2/board-zoom-display.c
··· 15 15 #include <linux/i2c/twl.h> 16 16 #include <linux/spi/spi.h> 17 17 #include <plat/mcspi.h> 18 - #include <plat/display.h> 18 + #include <video/omapdss.h> 19 19 20 20 #define LCD_PANEL_RESET_GPIO_PROD 96 21 21 #define LCD_PANEL_RESET_GPIO_PILOT 55
+1 -1
arch/arm/mach-omap2/display.c
··· 22 22 #include <linux/clk.h> 23 23 #include <linux/err.h> 24 24 25 - #include <plat/display.h> 25 + #include <video/omapdss.h> 26 26 #include <plat/omap_hwmod.h> 27 27 #include <plat/omap_device.h> 28 28
+1 -1
arch/arm/mach-omap2/include/mach/board-zoom.h
··· 1 1 /* 2 2 * Defines for zoom boards 3 3 */ 4 - #include <plat/display.h> 4 + #include <video/omapdss.h> 5 5 6 6 #define ZOOM_NAND_CS 0 7 7
+2 -4
arch/arm/plat-omap/include/plat/display.h include/video/omapdss.h
··· 1 1 /* 2 - * linux/include/asm-arm/arch-omap/display.h 3 - * 4 2 * Copyright (C) 2008 Nokia Corporation 5 3 * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com> 6 4 * ··· 15 17 * this program. If not, see <http://www.gnu.org/licenses/>. 16 18 */ 17 19 18 - #ifndef __ASM_ARCH_OMAP_DISPLAY_H 19 - #define __ASM_ARCH_OMAP_DISPLAY_H 20 + #ifndef __OMAP_OMAPDSS_H 21 + #define __OMAP_OMAPDSS_H 20 22 21 23 #include <linux/list.h> 22 24 #include <linux/kobject.h>
+1 -1
arch/arm/plat-omap/include/plat/nokia-dsi-panel.h
··· 1 1 #ifndef __ARCH_ARM_PLAT_OMAP_NOKIA_DSI_PANEL_H 2 2 #define __ARCH_ARM_PLAT_OMAP_NOKIA_DSI_PANEL_H 3 3 4 - #include "display.h" 4 + struct omap_dss_device; 5 5 6 6 /** 7 7 * struct nokia_dsi_panel_data - Nokia DSI panel driver configuration
+1 -1
arch/arm/plat-omap/include/plat/panel-generic-dpi.h
··· 20 20 #ifndef __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H 21 21 #define __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H 22 22 23 - #include "display.h" 23 + struct omap_dss_device; 24 24 25 25 /** 26 26 * struct panel_generic_dpi_data - panel driver configuration data
+1 -1
drivers/media/video/omap/omap_vout.c
··· 47 47 #include <plat/dma.h> 48 48 #include <plat/vram.h> 49 49 #include <plat/vrfb.h> 50 - #include <plat/display.h> 50 + #include <video/omapdss.h> 51 51 52 52 #include "omap_voutlib.h" 53 53 #include "omap_voutdef.h"
+1 -1
drivers/media/video/omap/omap_voutdef.h
··· 11 11 #ifndef OMAP_VOUTDEF_H 12 12 #define OMAP_VOUTDEF_H 13 13 14 - #include <plat/display.h> 14 + #include <video/omapdss.h> 15 15 16 16 #define YUYV_BPP 2 17 17 #define RGB565_BPP 2
+1 -1
drivers/video/omap2/displays/panel-acx565akm.c
··· 30 30 #include <linux/backlight.h> 31 31 #include <linux/fb.h> 32 32 33 - #include <plat/display.h> 33 + #include <video/omapdss.h> 34 34 35 35 #define MIPID_CMD_READ_DISP_ID 0x04 36 36 #define MIPID_CMD_READ_RED 0x06
+1
drivers/video/omap2/displays/panel-generic-dpi.c
··· 33 33 #include <linux/module.h> 34 34 #include <linux/delay.h> 35 35 #include <linux/slab.h> 36 + #include <video/omapdss.h> 36 37 37 38 #include <plat/panel-generic-dpi.h> 38 39
+1 -1
drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
··· 21 21 #include <linux/spi/spi.h> 22 22 #include <linux/mutex.h> 23 23 24 - #include <plat/display.h> 24 + #include <video/omapdss.h> 25 25 26 26 struct lb035q02_data { 27 27 struct mutex lock;
+1 -1
drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
··· 22 22 #include <linux/backlight.h> 23 23 #include <linux/fb.h> 24 24 25 - #include <plat/display.h> 25 + #include <video/omapdss.h> 26 26 27 27 #define LCD_XRES 800 28 28 #define LCD_YRES 480
+1 -1
drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
··· 25 25 #include <linux/err.h> 26 26 #include <linux/slab.h> 27 27 28 - #include <plat/display.h> 28 + #include <video/omapdss.h> 29 29 30 30 struct sharp_data { 31 31 struct backlight_device *bl;
+1 -1
drivers/video/omap2/displays/panel-taal.c
··· 33 33 #include <linux/regulator/consumer.h> 34 34 #include <linux/mutex.h> 35 35 36 - #include <plat/display.h> 36 + #include <video/omapdss.h> 37 37 #include <plat/nokia-dsi-panel.h> 38 38 39 39 /* DSI Virtual channel. Hardcoded for now. */
+1 -1
drivers/video/omap2/displays/panel-tpo-td043mtea1.c
··· 17 17 #include <linux/err.h> 18 18 #include <linux/slab.h> 19 19 20 - #include <plat/display.h> 20 + #include <video/omapdss.h> 21 21 22 22 #define TPO_R02_MODE(x) ((x) & 7) 23 23 #define TPO_R02_MODE_800x480 7
+1 -1
drivers/video/omap2/dss/core.c
··· 33 33 #include <linux/device.h> 34 34 #include <linux/regulator/consumer.h> 35 35 36 - #include <plat/display.h> 36 + #include <video/omapdss.h> 37 37 38 38 #include "dss.h" 39 39 #include "dss_features.h"
+1 -1
drivers/video/omap2/dss/dispc.c
··· 37 37 #include <plat/sram.h> 38 38 #include <plat/clock.h> 39 39 40 - #include <plat/display.h> 40 + #include <video/omapdss.h> 41 41 42 42 #include "dss.h" 43 43 #include "dss_features.h"
+1 -1
drivers/video/omap2/dss/display.c
··· 27 27 #include <linux/jiffies.h> 28 28 #include <linux/platform_device.h> 29 29 30 - #include <plat/display.h> 30 + #include <video/omapdss.h> 31 31 #include "dss.h" 32 32 33 33 static ssize_t display_enabled_show(struct device *dev,
+1 -1
drivers/video/omap2/dss/dpi.c
··· 30 30 #include <linux/platform_device.h> 31 31 #include <linux/regulator/consumer.h> 32 32 33 - #include <plat/display.h> 33 + #include <video/omapdss.h> 34 34 #include <plat/cpu.h> 35 35 36 36 #include "dss.h"
+1 -1
drivers/video/omap2/dss/dsi.c
··· 34 34 #include <linux/wait.h> 35 35 #include <linux/workqueue.h> 36 36 37 - #include <plat/display.h> 37 + #include <video/omapdss.h> 38 38 #include <plat/clock.h> 39 39 40 40 #include "dss.h"
+1 -1
drivers/video/omap2/dss/dss.c
··· 29 29 #include <linux/seq_file.h> 30 30 #include <linux/clk.h> 31 31 32 - #include <plat/display.h> 32 + #include <video/omapdss.h> 33 33 #include <plat/clock.h> 34 34 #include "dss.h" 35 35 #include "dss_features.h"
+1 -1
drivers/video/omap2/dss/dss_features.c
··· 22 22 #include <linux/err.h> 23 23 #include <linux/slab.h> 24 24 25 - #include <plat/display.h> 25 + #include <video/omapdss.h> 26 26 #include <plat/cpu.h> 27 27 28 28 #include "dss.h"
+1 -1
drivers/video/omap2/dss/hdmi.c
··· 29 29 #include <linux/mutex.h> 30 30 #include <linux/delay.h> 31 31 #include <linux/string.h> 32 - #include <plat/display.h> 32 + #include <video/omapdss.h> 33 33 34 34 #include "dss.h" 35 35 #include "hdmi.h"
+1 -1
drivers/video/omap2/dss/hdmi.h
··· 22 22 #define _OMAP4_DSS_HDMI_H_ 23 23 24 24 #include <linux/string.h> 25 - #include <plat/display.h> 25 + #include <video/omapdss.h> 26 26 27 27 #define HDMI_WP 0x0 28 28 #define HDMI_CORE_SYS 0x400
+1 -1
drivers/video/omap2/dss/hdmi_omap4_panel.c
··· 24 24 #include <linux/io.h> 25 25 #include <linux/mutex.h> 26 26 #include <linux/module.h> 27 - #include <plat/display.h> 27 + #include <video/omapdss.h> 28 28 29 29 #include "dss.h" 30 30
+1 -1
drivers/video/omap2/dss/manager.c
··· 29 29 #include <linux/spinlock.h> 30 30 #include <linux/jiffies.h> 31 31 32 - #include <plat/display.h> 32 + #include <video/omapdss.h> 33 33 #include <plat/cpu.h> 34 34 35 35 #include "dss.h"
+1 -1
drivers/video/omap2/dss/overlay.c
··· 31 31 #include <linux/delay.h> 32 32 #include <linux/slab.h> 33 33 34 - #include <plat/display.h> 34 + #include <video/omapdss.h> 35 35 #include <plat/cpu.h> 36 36 37 37 #include "dss.h"
+1 -1
drivers/video/omap2/dss/rfbi.c
··· 33 33 #include <linux/hrtimer.h> 34 34 #include <linux/seq_file.h> 35 35 36 - #include <plat/display.h> 36 + #include <video/omapdss.h> 37 37 #include "dss.h" 38 38 39 39 struct rfbi_reg { u16 idx; };
+1 -1
drivers/video/omap2/dss/sdi.c
··· 25 25 #include <linux/err.h> 26 26 #include <linux/regulator/consumer.h> 27 27 28 - #include <plat/display.h> 28 + #include <video/omapdss.h> 29 29 #include <plat/cpu.h> 30 30 #include "dss.h" 31 31
+1 -1
drivers/video/omap2/dss/venc.c
··· 34 34 #include <linux/platform_device.h> 35 35 #include <linux/regulator/consumer.h> 36 36 37 - #include <plat/display.h> 37 + #include <video/omapdss.h> 38 38 #include <plat/cpu.h> 39 39 40 40 #include "dss.h"
+1 -1
drivers/video/omap2/omapfb/omapfb-ioctl.c
··· 28 28 #include <linux/omapfb.h> 29 29 #include <linux/vmalloc.h> 30 30 31 - #include <plat/display.h> 31 + #include <video/omapdss.h> 32 32 #include <plat/vrfb.h> 33 33 #include <plat/vram.h> 34 34
+1 -1
drivers/video/omap2/omapfb/omapfb-main.c
··· 30 30 #include <linux/platform_device.h> 31 31 #include <linux/omapfb.h> 32 32 33 - #include <plat/display.h> 33 + #include <video/omapdss.h> 34 34 #include <plat/vram.h> 35 35 #include <plat/vrfb.h> 36 36
+1 -1
drivers/video/omap2/omapfb/omapfb-sysfs.c
··· 29 29 #include <linux/mm.h> 30 30 #include <linux/omapfb.h> 31 31 32 - #include <plat/display.h> 32 + #include <video/omapdss.h> 33 33 #include <plat/vrfb.h> 34 34 35 35 #include "omapfb.h"
+1 -1
drivers/video/omap2/omapfb/omapfb.h
··· 29 29 30 30 #include <linux/rwsem.h> 31 31 32 - #include <plat/display.h> 32 + #include <video/omapdss.h> 33 33 34 34 #ifdef DEBUG 35 35 extern unsigned int omapfb_debug;