From f421e972315429ce74e22052ebff41bd4dc1658a Mon Sep 17 00:00:00 2001 From: yxj Date: Sat, 8 Sep 2012 15:24:43 +0800 Subject: [PATCH] rename rk610 lvds config --- drivers/mfd/rk610-core.c | 2 +- drivers/video/display/Kconfig | 2 +- drivers/video/display/Makefile | 4 ++-- drivers/video/display/lcd/Makefile | 4 ---- drivers/video/display/screen/lcd_b101ew05.c | 16 ++++++++-------- drivers/video/display/screen/lcd_hdmi_1024x768.c | 4 ++-- drivers/video/display/screen/lcd_hdmi_1280x800.c | 2 +- drivers/video/display/screen/lcd_hdmi_800x480.c | 4 ++-- .../video/display/{lcd => transmitter}/Kconfig | 4 ++-- drivers/video/display/transmitter/Makefile | 4 ++++ .../display/{lcd => transmitter}/rk610_lcd.c | 0 .../display/{lcd => transmitter}/rk610_lcd.h | 0 drivers/video/rk29_fb.c | 2 +- 13 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 drivers/video/display/lcd/Makefile rename drivers/video/display/{lcd => transmitter}/Kconfig (60%) create mode 100644 drivers/video/display/transmitter/Makefile rename drivers/video/display/{lcd => transmitter}/rk610_lcd.c (100%) rename drivers/video/display/{lcd => transmitter}/rk610_lcd.h (100%) diff --git a/drivers/mfd/rk610-core.c b/drivers/mfd/rk610-core.c index e83f2de8823e..daad513a74c8 100755 --- a/drivers/mfd/rk610-core.c +++ b/drivers/mfd/rk610-core.c @@ -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){} diff --git a/drivers/video/display/Kconfig b/drivers/video/display/Kconfig index 98ea0494b6bb..8e8219538e26 100644 --- a/drivers/video/display/Kconfig +++ b/drivers/video/display/Kconfig @@ -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 diff --git a/drivers/video/display/Makefile b/drivers/video/display/Makefile index ad3bc7ff7c72..e1e7f14254ba 100644 --- a/drivers/video/display/Makefile +++ b/drivers/video/display/Makefile @@ -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/ \ No newline at end of file +obj-y += transmitter/ +obj-y += tve/ diff --git a/drivers/video/display/lcd/Makefile b/drivers/video/display/lcd/Makefile deleted file mode 100644 index a124d84e794f..000000000000 --- a/drivers/video/display/lcd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# -# Makefile for the jetta tv control. -# -obj-$(CONFIG_RK610_LCD) += rk610_lcd.o diff --git a/drivers/video/display/screen/lcd_b101ew05.c b/drivers/video/display/screen/lcd_b101ew05.c index b1d9bfef9b96..70bbdca72f27 100755 --- a/drivers/video/display/screen/lcd_b101ew05.c +++ b/drivers/video/display/screen/lcd_b101ew05.c @@ -6,15 +6,15 @@ #include #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 } diff --git a/drivers/video/display/screen/lcd_hdmi_1024x768.c b/drivers/video/display/screen/lcd_hdmi_1024x768.c index c4d7ea336dcf..ca64748ed13f 100644 --- a/drivers/video/display/screen/lcd_hdmi_1024x768.c +++ b/drivers/video/display/screen/lcd_hdmi_1024x768.c @@ -6,7 +6,7 @@ #include "screen.h" #include #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 } \ No newline at end of file diff --git a/drivers/video/display/screen/lcd_hdmi_1280x800.c b/drivers/video/display/screen/lcd_hdmi_1280x800.c index 43a3348d968e..a67e852c2b65 100644 --- a/drivers/video/display/screen/lcd_hdmi_1280x800.c +++ b/drivers/video/display/screen/lcd_hdmi_1280x800.c @@ -6,7 +6,7 @@ #include "screen.h" #include #include "../../rk29_fb.h" -#include "../lcd/rk610_lcd.h" +#include "../transmitter/rk610_lcd.h" /* Base */ diff --git a/drivers/video/display/screen/lcd_hdmi_800x480.c b/drivers/video/display/screen/lcd_hdmi_800x480.c index 7f71779938cc..66639130c964 100644 --- a/drivers/video/display/screen/lcd_hdmi_800x480.c +++ b/drivers/video/display/screen/lcd_hdmi_800x480.c @@ -6,7 +6,7 @@ #include "screen.h" #include #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 } diff --git a/drivers/video/display/lcd/Kconfig b/drivers/video/display/transmitter/Kconfig similarity index 60% rename from drivers/video/display/lcd/Kconfig rename to drivers/video/display/transmitter/Kconfig index 3d15a66d7974..5565f72d0cf8 100644 --- a/drivers/video/display/lcd/Kconfig +++ b/drivers/video/display/transmitter/Kconfig @@ -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 diff --git a/drivers/video/display/transmitter/Makefile b/drivers/video/display/transmitter/Makefile new file mode 100644 index 000000000000..75adab5b4151 --- /dev/null +++ b/drivers/video/display/transmitter/Makefile @@ -0,0 +1,4 @@ +# +# Makefile for the jetta tv control. +# +obj-$(CONFIG_RK610_LVDS) += rk610_lcd.o diff --git a/drivers/video/display/lcd/rk610_lcd.c b/drivers/video/display/transmitter/rk610_lcd.c similarity index 100% rename from drivers/video/display/lcd/rk610_lcd.c rename to drivers/video/display/transmitter/rk610_lcd.c diff --git a/drivers/video/display/lcd/rk610_lcd.h b/drivers/video/display/transmitter/rk610_lcd.h similarity index 100% rename from drivers/video/display/lcd/rk610_lcd.h rename to drivers/video/display/transmitter/rk610_lcd.h diff --git a/drivers/video/rk29_fb.c b/drivers/video/rk29_fb.c index c1d1981e871e..5dbe4a581b8f 100644 --- a/drivers/video/rk29_fb.c +++ b/drivers/video/rk29_fb.c @@ -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 -- 2.34.1