shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

rename rk610 lvds config

Browse Source
This commit is contained in:
yxj
2012-09-08 15:24:43 +08:00
parent 2ea6f7331f
commit f421e97231
13 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mfd/rk610-core.c
View File

@@ -28,7 +28,7 @@
#endif
static struct i2c_client *rk610_control_client = NULL;
#ifdef CONFIG_RK610_LCD
#ifdef CONFIG_RK610_LVDS
extern int rk610_lcd_init(struct rk610_core_info *rk610_core_info);
#else
int rk610_lcd_init(struct rk610_core_info *rk610_core_info){}

2
drivers/video/display/Kconfig
View File

@@ -22,7 +22,7 @@ config DISPLAY_SUPPORT
comment "Display hardware drivers"
depends on DISPLAY_SUPPORT
source "drivers/video/display/screen/Kconfig"
source "drivers/video/display/lcd/Kconfig"
source "drivers/video/display/transmitter/Kconfig"
source "drivers/video/display/tve/Kconfig"
endmenu

4
drivers/video/display/Makefile
View File

@@ -4,5 +4,5 @@ display-objs := display-sys.o
obj-$(CONFIG_DISPLAY_SUPPORT) += display.o
obj-$(CONFIG_DISPLAY_SUPPORT) += screen/
obj-y += lcd/
obj-y += tve/
obj-y += transmitter/
obj-y += tve/

4
drivers/video/display/lcd/Makefile
View File

@@ -1,4 +0,0 @@
#
# Makefile for the jetta tv control.
#
obj-$(CONFIG_RK610_LCD) += rk610_lcd.o

16
drivers/video/display/screen/lcd_b101ew05.c
View File

@@ -6,15 +6,15 @@
#include <mach/board.h>
#include "screen.h"
#ifdef CONFIG_RK610_LCD
#include "../lcd/rk610_lcd.h"
#ifdef CONFIG_RK610_LVDS
#include "../transmitter/rk610_lcd.h"
#endif
/* Base */
#ifdef CONFIG_RK610_LCD
#define OUT_TYPE SCREEN_LVDS
#define OUT_FORMAT LVDS_8BIT_2
#ifdef CONFIG_RK610_LVDS
#define OUT_TYPE SCREEN_LVDS
#define OUT_FORMAT LVDS_8BIT_2
#else
#define OUT_TYPE SCREEN_RGB
#endif
@@ -39,12 +39,12 @@
#define LCD_WIDTH 216
#define LCD_HEIGHT 135
/* Other */
#ifdef CONFIG_RK610_LCD
#ifdef CONFIG_RK610_LVDS
#define DCLK_POL 1
#else
#define DCLK_POL 0
#endif
#define SWAP_RB 0
int dsp_lut[256] ={
@@ -124,7 +124,7 @@ void set_lcd_info(struct rk29fb_screen *screen, struct rk29lcd_info *lcd_info )
screen->standby = NULL;
screen->dsp_lut = dsp_lut;
screen->sscreen_get = NULL;//set_scaler_info;
#ifdef CONFIG_RK610_LCD
#ifdef CONFIG_RK610_LVDS
screen->sscreen_set = rk610_lcd_scaler_set_param;
#endif
}

4
drivers/video/display/screen/lcd_hdmi_1024x768.c
View File

@@ -6,7 +6,7 @@
#include "screen.h"
#include <linux/hdmi.h>
#include "../../rk29_fb.h"
#include "../lcd/rk610_lcd.h"
/* Base */
#define OUT_TYPE SCREEN_LVDS
@@ -272,7 +272,7 @@ void set_lcd_info(struct rk29fb_screen *screen, struct rk29lcd_info *lcd_info )
screen->init = NULL;
screen->standby = NULL;
screen->sscreen_get = set_scaler_info;
#ifdef CONFIG_RK610_LCD
#ifdef CONFIG_RK610_LVDS
screen->sscreen_set = rk610_lcd_scaler_set_param;
#endif
}

2
drivers/video/display/screen/lcd_hdmi_1280x800.c
View File

@@ -6,7 +6,7 @@
#include "screen.h"
#include <linux/hdmi.h>
#include "../../rk29_fb.h"
#include "../lcd/rk610_lcd.h"
#include "../transmitter/rk610_lcd.h"
/* Base */

4
drivers/video/display/screen/lcd_hdmi_800x480.c
View File

@@ -6,7 +6,7 @@
#include "screen.h"
#include <linux/hdmi.h>
#include "../../rk29_fb.h"
#include "../lcd/rk610_lcd.h"
#include "../transmitter/rk610_lcd.h"
/* Base */
#define OUT_TYPE SCREEN_RGB
@@ -269,7 +269,7 @@ void set_lcd_info(struct rk29fb_screen *screen, struct rk29lcd_info *lcd_info )
screen->init = NULL;
screen->standby = NULL;
screen->sscreen_get = set_scaler_info;
#ifdef CONFIG_RK610_LCD
#ifdef CONFIG_RK610_LVDS
screen->sscreen_set = rk610_lcd_scaler_set_param;
#endif
}

4
drivers/video/display/lcd/Kconfig → drivers/video/display/transmitter/Kconfig
View File

@@ -1,5 +1,5 @@
config RK610_LCD
bool "RK610(Jetta) lcd support"
config RK610_LVDS
bool "RK610(Jetta) lvds transmitter support"
depends on MFD_RK610
default y if MFD_RK610
help

4
drivers/video/display/transmitter/Makefile Normal file
View File

@@ -0,0 +1,4 @@
#
# Makefile for the jetta tv control.
#
obj-$(CONFIG_RK610_LVDS) += rk610_lcd.o

0
drivers/video/display/lcd/rk610_lcd.c → drivers/video/display/transmitter/rk610_lcd.c
View File

0
drivers/video/display/lcd/rk610_lcd.h → drivers/video/display/transmitter/rk610_lcd.h
View File

2
drivers/video/rk29_fb.c
View File

@@ -63,7 +63,7 @@
#include "./display/screen/screen.h"
#ifdef CONFIG_MFD_RK610
#include "./display/lcd/rk610_lcd.h"
#include "./display/transmitter/rk610_lcd.h"
#endif
#define ANDROID_USE_THREE_BUFS 0 //android use three buffers to accelerate UI display in rgb plane
#define CURSOR_BUF_SIZE 256 //RK2818 cursor need 256B buf