提交 9587319b 编写于 作者: E Eric Miao

[ARM] pxa: convert legacy LCD setup of other boards to new one

Signed-off-by: NEric Miao <eric.miao@marvell.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Ian Molton <spyro@f2s.com>
Cc: pHilipp Zabel <philipp.zabel@gmail.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Juergen Schindele <linux@schindele.name>
Acked-by: NStefan Schmidt <stefan@datenfreihafen.org>
Acked-by: NMarc Zyngier <maz@misterjones.org>
Acked-by: NMike Rapoport <mike@compulab.co.il>
Acked-by: NJaya Kumar <jayakumar.lkml@gmail.com>
上级 51633048
...@@ -210,10 +210,8 @@ static struct pxafb_mode_info generic_stn_320x240_mode = { ...@@ -210,10 +210,8 @@ static struct pxafb_mode_info generic_stn_320x240_mode = {
static struct pxafb_mach_info generic_stn_320x240 = { static struct pxafb_mach_info generic_stn_320x240 = {
.modes = &generic_stn_320x240_mode, .modes = &generic_stn_320x240_mode,
.num_modes = 1, .num_modes = 1,
.lccr0 = 0, .lcd_conn = LCD_COLOR_STN_8BPP | LCD_PCLK_EDGE_FALL |\
.lccr3 = (LCCR3_PixClkDiv(0x03) | LCD_AC_BIAS_FREQ(0xff),
LCCR3_Acb(0xff) |
LCCR3_PCP),
.cmap_inverse = 0, .cmap_inverse = 0,
.cmap_static = 0, .cmap_static = 0,
}; };
...@@ -236,10 +234,8 @@ static struct pxafb_mode_info generic_tft_640x480_mode = { ...@@ -236,10 +234,8 @@ static struct pxafb_mode_info generic_tft_640x480_mode = {
static struct pxafb_mach_info generic_tft_640x480 = { static struct pxafb_mach_info generic_tft_640x480 = {
.modes = &generic_tft_640x480_mode, .modes = &generic_tft_640x480_mode,
.num_modes = 1, .num_modes = 1,
.lccr0 = (LCCR0_PAS), .lcd_conn = LCD_COLOR_TFT_8BPP | LCD_PCLK_EDGE_FALL |\
.lccr3 = (LCCR3_PixClkDiv(0x01) | LCD_AC_BIAS_FREQ(0xff),
LCCR3_Acb(0xff) |
LCCR3_PCP),
.cmap_inverse = 0, .cmap_inverse = 0,
.cmap_static = 0, .cmap_static = 0,
}; };
...@@ -263,9 +259,7 @@ static struct pxafb_mode_info generic_crt_640x480_mode = { ...@@ -263,9 +259,7 @@ static struct pxafb_mode_info generic_crt_640x480_mode = {
static struct pxafb_mach_info generic_crt_640x480 = { static struct pxafb_mach_info generic_crt_640x480 = {
.modes = &generic_crt_640x480_mode, .modes = &generic_crt_640x480_mode,
.num_modes = 1, .num_modes = 1,
.lccr0 = (LCCR0_PAS), .lcd_conn = LCD_COLOR_TFT_8BPP | LCD_AC_BIAS_FREQ(0xff),
.lccr3 = (LCCR3_PixClkDiv(0x01) |
LCCR3_Acb(0xff)),
.cmap_inverse = 0, .cmap_inverse = 0,
.cmap_static = 0, .cmap_static = 0,
}; };
...@@ -289,9 +283,7 @@ static struct pxafb_mode_info generic_crt_800x600_mode = { ...@@ -289,9 +283,7 @@ static struct pxafb_mode_info generic_crt_800x600_mode = {
static struct pxafb_mach_info generic_crt_800x600 = { static struct pxafb_mach_info generic_crt_800x600 = {
.modes = &generic_crt_800x600_mode, .modes = &generic_crt_800x600_mode,
.num_modes = 1, .num_modes = 1,
.lccr0 = (LCCR0_PAS), .lcd_conn = LCD_COLOR_TFT_8BPP | LCD_AC_BIAS_FREQ(0xff),
.lccr3 = (LCCR3_PixClkDiv(0x02) |
LCCR3_Acb(0xff)),
.cmap_inverse = 0, .cmap_inverse = 0,
.cmap_static = 0, .cmap_static = 0,
}; };
...@@ -314,10 +306,7 @@ static struct pxafb_mode_info generic_tft_320x240_mode = { ...@@ -314,10 +306,7 @@ static struct pxafb_mode_info generic_tft_320x240_mode = {
static struct pxafb_mach_info generic_tft_320x240 = { static struct pxafb_mach_info generic_tft_320x240 = {
.modes = &generic_tft_320x240_mode, .modes = &generic_tft_320x240_mode,
.num_modes = 1, .num_modes = 1,
.lccr0 = (LCCR0_PAS), .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_AC_BIAS_FREQ(0xff),
.lccr3 = (LCCR3_PixClkDiv(0x06) |
LCCR3_Acb(0xff) |
LCCR3_PCP),
.cmap_inverse = 0, .cmap_inverse = 0,
.cmap_static = 0, .cmap_static = 0,
}; };
...@@ -341,9 +330,7 @@ static struct pxafb_mode_info generic_stn_640x480_mode = { ...@@ -341,9 +330,7 @@ static struct pxafb_mode_info generic_stn_640x480_mode = {
static struct pxafb_mach_info generic_stn_640x480 = { static struct pxafb_mach_info generic_stn_640x480 = {
.modes = &generic_stn_640x480_mode, .modes = &generic_stn_640x480_mode,
.num_modes = 1, .num_modes = 1,
.lccr0 = 0, .lcd_conn = LCD_COLOR_STN_8BPP | LCD_AC_BIAS_FREQ(0xff),
.lccr3 = (LCCR3_PixClkDiv(0x02) |
LCCR3_Acb(0xff)),
.cmap_inverse = 0, .cmap_inverse = 0,
.cmap_static = 0, .cmap_static = 0,
}; };
......
...@@ -46,7 +46,7 @@ static struct pxafb_mode_info e400_pxafb_mode_info = { ...@@ -46,7 +46,7 @@ static struct pxafb_mode_info e400_pxafb_mode_info = {
static struct pxafb_mach_info e400_pxafb_mach_info = { static struct pxafb_mach_info e400_pxafb_mach_info = {
.modes = &e400_pxafb_mode_info, .modes = &e400_pxafb_mode_info,
.num_modes = 1, .num_modes = 1,
.lccr0 = LCCR0_Color | LCCR0_Sngl | LCCR0_Act, .lcd_conn = LCD_COLOR_TFT_16BPP,
.lccr3 = 0, .lccr3 = 0,
.pxafb_backlight_power = NULL, .pxafb_backlight_power = NULL,
}; };
......
...@@ -336,8 +336,7 @@ static struct pxafb_mach_info toppoly_info = { ...@@ -336,8 +336,7 @@ static struct pxafb_mach_info toppoly_info = {
.modes = toppoly_modes, .modes = toppoly_modes,
.num_modes = 1, .num_modes = 1,
.fixed_modes = 1, .fixed_modes = 1,
.lccr0 = LCCR0_Color | LCCR0_Sngl | LCCR0_Act, .lcd_conn = LCD_COLOR_TFT_16BPP,
.lccr3 = LCCR3_PixRsEdg,
.pxafb_lcd_power = toppoly_lcd_power, .pxafb_lcd_power = toppoly_lcd_power,
}; };
...@@ -345,8 +344,8 @@ static struct pxafb_mach_info samsung_info = { ...@@ -345,8 +344,8 @@ static struct pxafb_mach_info samsung_info = {
.modes = samsung_modes, .modes = samsung_modes,
.num_modes = 1, .num_modes = 1,
.fixed_modes = 1, .fixed_modes = 1,
.lccr0 = LCCR0_LDDALT | LCCR0_Color | LCCR0_Sngl | LCCR0_Act, .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL |\
.lccr3 = LCCR3_PixFlEdg, LCD_ALTERNATE_MAPPING,
.pxafb_lcd_power = samsung_lcd_power, .pxafb_lcd_power = samsung_lcd_power,
}; };
......
...@@ -104,8 +104,7 @@ static struct pxafb_mode_info fb_info_sharp_lq084v1dg21 = { ...@@ -104,8 +104,7 @@ static struct pxafb_mode_info fb_info_sharp_lq084v1dg21 = {
static struct pxafb_mach_info pcm990_fbinfo __initdata = { static struct pxafb_mach_info pcm990_fbinfo __initdata = {
.modes = &fb_info_sharp_lq084v1dg21, .modes = &fb_info_sharp_lq084v1dg21,
.num_modes = 1, .num_modes = 1,
.lccr0 = LCCR0_PAS, .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
.lccr3 = LCCR3_PCP,
.pxafb_lcd_power = pcm990_lcd_power, .pxafb_lcd_power = pcm990_lcd_power,
}; };
#elif defined(CONFIG_PCM990_DISPLAY_NEC) #elif defined(CONFIG_PCM990_DISPLAY_NEC)
...@@ -127,8 +126,7 @@ struct pxafb_mode_info fb_info_nec_nl6448bc20_18d = { ...@@ -127,8 +126,7 @@ struct pxafb_mode_info fb_info_nec_nl6448bc20_18d = {
static struct pxafb_mach_info pcm990_fbinfo __initdata = { static struct pxafb_mach_info pcm990_fbinfo __initdata = {
.modes = &fb_info_nec_nl6448bc20_18d, .modes = &fb_info_nec_nl6448bc20_18d,
.num_modes = 1, .num_modes = 1,
.lccr0 = LCCR0_Act, .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
.lccr3 = LCCR3_PixFlEdg,
.pxafb_lcd_power = pcm990_lcd_power, .pxafb_lcd_power = pcm990_lcd_power,
}; };
#endif #endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册