From: yxj Date: Wed, 23 Jan 2013 14:35:05 +0000 (+0800) Subject: rk2928 lvds,rk610 lvds:move lvds connect MACRO to rk_screen.h X-Git-Tag: firefly_0821_release~7828 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3e7acefa9473aa323f749595544f235fbd50e5df;p=firefly-linux-kernel-4.4.55.git rk2928 lvds,rk610 lvds:move lvds connect MACRO to rk_screen.h --- diff --git a/drivers/video/display/transmitter/rk610_lcd.h b/drivers/video/display/transmitter/rk610_lcd.h index 427417c9ab4e..7cafff82778d 100644 --- a/drivers/video/display/transmitter/rk610_lcd.h +++ b/drivers/video/display/transmitter/rk610_lcd.h @@ -1,52 +1,10 @@ #ifndef _RK610_LCD_H #define _RK610_LCD_H #include -#include "../screen/screen.h" #include #define ENABLE 1 #define DISABLE 0 -/* LVDS config */ -/* LVDS ÍⲿÁ¬Ïß½Ó·¨ */ -/* LVDS_8BIT_1 LVDS_8BIT_2 LVDS_8BIT_3 LVDS_6BIT ----------------------------------------------------------------------- - TX0 R0 R2 R2 R0 - TX1 R1 R3 R3 R1 - TX2 R2 R4 R4 R2 -Y TX3 R3 R5 R5 R3 -0 TX4 R4 R6 R6 R4 - TX6 R5 R7 R7 R5 - TX7 G0 G2 G2 G0 ----------------------------------------------------------------------- - TX8 G1 G3 G3 G1 - TX9 G2 G4 G4 G2 -Y TX12 G3 G5 G5 G3 -1 TX13 G4 G6 G6 G4 - TX14 G5 G7 G7 G5 - TX15 B0 B2 B2 B0 - TX18 B1 B3 B3 B1 ----------------------------------------------------------------------- - TX19 B2 B4 B4 B2 - TX20 B3 B5 B5 B3 - TX21 B4 B6 B6 B4 -Y TX22 B5 B7 B7 B5 -2 TX24 HSYNC HSYNC HSYNC HSYNC - TX25 VSYNC VSYNC VSYNC VSYNC - TX26 ENABLE ENABLE ENABLE ENABLE ----------------------------------------------------------------------- - TX27 R6 R0 GND GND - TX5 R7 R1 GND GND - TX10 G6 G0 GND GND -Y TX11 G7 G1 GND GND -3 TX16 B6 B0 GND GND - TX17 B7 B1 GND GND - TX23 RSVD RSVD RSVD RSVD ----------------------------------------------------------------------- -*/ -#define LVDS_8BIT_1 0 -#define LVDS_8BIT_2 1 -#define LVDS_8BIT_3 2 -#define LVDS_6BIT 3 //LVDS lane input format #define DATA_D0_MSB 0 #define DATA_D7_MSB 1 diff --git a/drivers/video/rockchip/lvds/rk_lvds.h b/drivers/video/rockchip/lvds/rk_lvds.h index 3e07d8359235..6cd2f889afd6 100644 --- a/drivers/video/rockchip/lvds/rk_lvds.h +++ b/drivers/video/rockchip/lvds/rk_lvds.h @@ -45,49 +45,5 @@ enum{ #define FROM_LCDC0 0 #define FROM_LCDC1 1 - -#define LVDS_8BIT_1 0 -#define LVDS_8BIT_2 1 -#define LVDS_8BIT_3 2 -#define LVDS_6BIT 3 -/* LVDS config - * LVDS 外部连线接法 - * LVDS_8BIT_1 LVDS_8BIT_2 LVDS_8BIT_3 LVDS_6BIT ----------------------------------------------------------------------- - TX0 R0 R2 R2 R0 - TX1 R1 R3 R3 R1 - TX2 R2 R4 R4 R2 -Y TX3 R3 R5 R5 R3 -0 TX4 R4 R6 R6 R4 - TX6 R5 R7 R7 R5 - TX7 G0 G2 G2 G0 ----------------------------------------------------------------------- - TX8 G1 G3 G3 G1 - TX9 G2 G4 G4 G2 -Y TX12 G3 G5 G5 G3 -1 TX13 G4 G6 G6 G4 - TX14 G5 G7 G7 G5 - TX15 B0 B2 B2 B0 - TX18 B1 B3 B3 B1 ----------------------------------------------------------------------- - TX19 B2 B4 B4 B2 - TX20 B3 B5 B5 B3 - TX21 B4 B6 B6 B4 -Y TX22 B5 B7 B7 B5 -2 TX24 HSYNC HSYNC HSYNC HSYNC - TX25 VSYNC VSYNC VSYNC VSYNC - TX26 ENABLE ENABLE ENABLE ENABLE ----------------------------------------------------------------------- - TX27 R6 R0 GND GND - TX5 R7 R1 GND GND - TX10 G6 G0 GND GND -Y TX11 G7 G1 GND GND -3 TX16 B6 B0 GND GND - TX17 B7 B1 GND GND - TX23 RSVD RSVD RSVD RSVD ----------------------------------------------------------------------- -*/ - - extern int rk_lvds_register(rk_screen *screen); #endif diff --git a/include/linux/rk_screen.h b/include/linux/rk_screen.h index 700a157eca3b..7a9dfd7867e2 100644 --- a/include/linux/rk_screen.h +++ b/include/linux/rk_screen.h @@ -1,6 +1,48 @@ #ifndef _SCREEN_H #define _SCREEN_H +#define LVDS_8BIT_1 0 +#define LVDS_8BIT_2 1 +#define LVDS_8BIT_3 2 +#define LVDS_6BIT 3 +/* lvds connect config + * + * LVDS_8BIT_1 LVDS_8BIT_2 LVDS_8BIT_3 LVDS_6BIT +---------------------------------------------------------------------- + TX0 R0 R2 R2 R0 + TX1 R1 R3 R3 R1 + TX2 R2 R4 R4 R2 +Y TX3 R3 R5 R5 R3 +0 TX4 R4 R6 R6 R4 + TX6 R5 R7 R7 R5 + TX7 G0 G2 G2 G0 +---------------------------------------------------------------------- + TX8 G1 G3 G3 G1 + TX9 G2 G4 G4 G2 +Y TX12 G3 G5 G5 G3 +1 TX13 G4 G6 G6 G4 + TX14 G5 G7 G7 G5 + TX15 B0 B2 B2 B0 + TX18 B1 B3 B3 B1 +---------------------------------------------------------------------- + TX19 B2 B4 B4 B2 + TX20 B3 B5 B5 B3 + TX21 B4 B6 B6 B4 +Y TX22 B5 B7 B7 B5 +2 TX24 HSYNC HSYNC HSYNC HSYNC + TX25 VSYNC VSYNC VSYNC VSYNC + TX26 ENABLE ENABLE ENABLE ENABLE +---------------------------------------------------------------------- + TX27 R6 R0 GND GND + TX5 R7 R1 GND GND + TX10 G6 G0 GND GND +Y TX11 G7 G1 GND GND +3 TX16 B6 B0 GND GND + TX17 B7 B1 GND GND + TX23 RSVD RSVD RSVD RSVD +---------------------------------------------------------------------- +*/ + typedef enum _SCREEN_TYPE { SCREEN_NULL = 0, SCREEN_RGB,