From f7018c21350204c4cf628462f229d44d03545254 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 13 Feb 2014 15:31:38 +0200 Subject: video: move fbdev to drivers/video/fbdev The drivers/video directory is a mess. It contains generic video related files, directories for backlight, console, linux logo, lots of fbdev device drivers, fbdev framework files. Make some order into the chaos by creating drivers/video/fbdev directory, and move all fbdev related files there. No functionality is changed, although I guess it is possible that some subtle Makefile build order related issue could be created by this patch. Signed-off-by: Tomi Valkeinen Acked-by: Laurent Pinchart Acked-by: Geert Uytterhoeven Acked-by: Rob Clark Acked-by: Jingoo Han Acked-by: Daniel Vetter --- drivers/video/sa1100fb.h | 96 ------------------------------------------------ 1 file changed, 96 deletions(-) delete mode 100644 drivers/video/sa1100fb.h (limited to 'drivers/video/sa1100fb.h') diff --git a/drivers/video/sa1100fb.h b/drivers/video/sa1100fb.h deleted file mode 100644 index fc5d4292fad6..000000000000 --- a/drivers/video/sa1100fb.h +++ /dev/null @@ -1,96 +0,0 @@ -/* - * linux/drivers/video/sa1100fb.h - * -- StrongARM 1100 LCD Controller Frame Buffer Device - * - * Copyright (C) 1999 Eric A. Thomas - * Based on acornfb.c Copyright (C) Russell King. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of this archive - * for more details. - */ - -#define LCCR0 0x0000 /* LCD Control Reg. 0 */ -#define LCSR 0x0004 /* LCD Status Reg. */ -#define DBAR1 0x0010 /* LCD DMA Base Address Reg. channel 1 */ -#define DCAR1 0x0014 /* LCD DMA Current Address Reg. channel 1 */ -#define DBAR2 0x0018 /* LCD DMA Base Address Reg. channel 2 */ -#define DCAR2 0x001C /* LCD DMA Current Address Reg. channel 2 */ -#define LCCR1 0x0020 /* LCD Control Reg. 1 */ -#define LCCR2 0x0024 /* LCD Control Reg. 2 */ -#define LCCR3 0x0028 /* LCD Control Reg. 3 */ - -/* Shadows for LCD controller registers */ -struct sa1100fb_lcd_reg { - unsigned long lccr0; - unsigned long lccr1; - unsigned long lccr2; - unsigned long lccr3; -}; - -struct sa1100fb_info { - struct fb_info fb; - struct device *dev; - const struct sa1100fb_rgb *rgb[NR_RGB]; - void __iomem *base; - - /* - * These are the addresses we mapped - * the framebuffer memory region to. - */ - dma_addr_t map_dma; - u_char * map_cpu; - u_int map_size; - - u_char * screen_cpu; - dma_addr_t screen_dma; - u16 * palette_cpu; - dma_addr_t palette_dma; - u_int palette_size; - - dma_addr_t dbar1; - dma_addr_t dbar2; - - u_int reg_lccr0; - u_int reg_lccr1; - u_int reg_lccr2; - u_int reg_lccr3; - - volatile u_char state; - volatile u_char task_state; - struct mutex ctrlr_lock; - wait_queue_head_t ctrlr_wait; - struct work_struct task; - -#ifdef CONFIG_CPU_FREQ - struct notifier_block freq_transition; - struct notifier_block freq_policy; -#endif - - const struct sa1100fb_mach_info *inf; -}; - -#define TO_INF(ptr,member) container_of(ptr,struct sa1100fb_info,member) - -#define SA1100_PALETTE_MODE_VAL(bpp) (((bpp) & 0x018) << 9) - -/* - * These are the actions for set_ctrlr_state - */ -#define C_DISABLE (0) -#define C_ENABLE (1) -#define C_DISABLE_CLKCHANGE (2) -#define C_ENABLE_CLKCHANGE (3) -#define C_REENABLE (4) -#define C_DISABLE_PM (5) -#define C_ENABLE_PM (6) -#define C_STARTUP (7) - -#define SA1100_NAME "SA1100" - -/* - * Minimum X and Y resolutions - */ -#define MIN_XRES 64 -#define MIN_YRES 64 - -- cgit v1.2.3