Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9587319b authored by Eric Miao's avatar Eric Miao
Browse files

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



Signed-off-by: default avatarEric 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: default avatarStefan Schmidt <stefan@datenfreihafen.org>
Acked-by: default avatarMarc Zyngier <maz@misterjones.org>
Acked-by: default avatarMike Rapoport <mike@compulab.co.il>
Acked-by: default avatarJaya Kumar <jayakumar.lkml@gmail.com>
parent 51633048

arch/arm/mach-pxa/cm-x2xx.c

+8 −21
Original line number Diff line number Diff line
@@ -210,10 +210,8 @@ static struct pxafb_mode_info generic_stn_320x240_mode = { 
static struct pxafb_mach_info generic_stn_320x240 = {

	.modes		= &generic_stn_320x240_mode,

	.num_modes	= 1,

	.lccr0		= 0,

	.lccr3		= (LCCR3_PixClkDiv(0x03) |

			   LCCR3_Acb(0xff) |

			   LCCR3_PCP),

	.lcd_conn	= LCD_COLOR_STN_8BPP | LCD_PCLK_EDGE_FALL |\

			  LCD_AC_BIAS_FREQ(0xff),

	.cmap_inverse	= 0,

	.cmap_static	= 0,

};
@@ -236,10 +234,8 @@ static struct pxafb_mode_info generic_tft_640x480_mode = { 
static struct pxafb_mach_info generic_tft_640x480 = {

	.modes		= &generic_tft_640x480_mode,

	.num_modes	= 1,

	.lccr0		= (LCCR0_PAS),

	.lccr3		= (LCCR3_PixClkDiv(0x01) |

			   LCCR3_Acb(0xff) |

			   LCCR3_PCP),

	.lcd_conn	= LCD_COLOR_TFT_8BPP | LCD_PCLK_EDGE_FALL |\

			  LCD_AC_BIAS_FREQ(0xff),

	.cmap_inverse	= 0,

	.cmap_static	= 0,

};
@@ -263,9 +259,7 @@ static struct pxafb_mode_info generic_crt_640x480_mode = { 
static struct pxafb_mach_info generic_crt_640x480 = {

	.modes		= &generic_crt_640x480_mode,

	.num_modes	= 1,

	.lccr0		= (LCCR0_PAS),

	.lccr3		= (LCCR3_PixClkDiv(0x01) |

			   LCCR3_Acb(0xff)),

	.lcd_conn	= LCD_COLOR_TFT_8BPP | LCD_AC_BIAS_FREQ(0xff),

	.cmap_inverse	= 0,

	.cmap_static	= 0,

};
@@ -289,9 +283,7 @@ static struct pxafb_mode_info generic_crt_800x600_mode = { 
static struct pxafb_mach_info generic_crt_800x600 = {

	.modes		= &generic_crt_800x600_mode,

	.num_modes	= 1,

	.lccr0		= (LCCR0_PAS),

	.lccr3		= (LCCR3_PixClkDiv(0x02) |

			   LCCR3_Acb(0xff)),

	.lcd_conn	= LCD_COLOR_TFT_8BPP | LCD_AC_BIAS_FREQ(0xff),

	.cmap_inverse	= 0,

	.cmap_static	= 0,

};
@@ -314,10 +306,7 @@ static struct pxafb_mode_info generic_tft_320x240_mode = { 
static struct pxafb_mach_info generic_tft_320x240 = {

	.modes		= &generic_tft_320x240_mode,

	.num_modes	= 1,

	.lccr0		= (LCCR0_PAS),

	.lccr3		= (LCCR3_PixClkDiv(0x06) |

			   LCCR3_Acb(0xff) |

			   LCCR3_PCP),

	.lcd_conn	= LCD_COLOR_TFT_16BPP | LCD_AC_BIAS_FREQ(0xff),

	.cmap_inverse	= 0,

	.cmap_static	= 0,

};
@@ -341,9 +330,7 @@ static struct pxafb_mode_info generic_stn_640x480_mode = { 
static struct pxafb_mach_info generic_stn_640x480 = {

	.modes		= &generic_stn_640x480_mode,

	.num_modes	= 1,

	.lccr0		= 0,

	.lccr3		= (LCCR3_PixClkDiv(0x02) |

			   LCCR3_Acb(0xff)),

	.lcd_conn	= LCD_COLOR_STN_8BPP | LCD_AC_BIAS_FREQ(0xff),

	.cmap_inverse	= 0,

	.cmap_static	= 0,

};

arch/arm/mach-pxa/e400.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static struct pxafb_mode_info e400_pxafb_mode_info = { 
static struct pxafb_mach_info e400_pxafb_mach_info = {

	.modes          = &e400_pxafb_mode_info,

	.num_modes      = 1,

	.lccr0          = LCCR0_Color | LCCR0_Sngl | LCCR0_Act,

	.lcd_conn	= LCD_COLOR_TFT_16BPP,

	.lccr3          = 0,

	.pxafb_backlight_power  = NULL,

};

arch/arm/mach-pxa/magician.c

+3 −4
Original line number Diff line number Diff line
@@ -336,8 +336,7 @@ static struct pxafb_mach_info toppoly_info = { 
	.modes           = toppoly_modes,

	.num_modes       = 1,

	.fixed_modes     = 1,

	.lccr0           = LCCR0_Color | LCCR0_Sngl | LCCR0_Act,

	.lccr3           = LCCR3_PixRsEdg,

	.lcd_conn	= LCD_COLOR_TFT_16BPP,

	.pxafb_lcd_power = toppoly_lcd_power,

};
@@ -345,8 +344,8 @@ static struct pxafb_mach_info samsung_info = { 
	.modes           = samsung_modes,

	.num_modes       = 1,

	.fixed_modes     = 1,

	.lccr0           = LCCR0_LDDALT | LCCR0_Color | LCCR0_Sngl | LCCR0_Act,

	.lccr3           = LCCR3_PixFlEdg,

	.lcd_conn	 = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL |\

			   LCD_ALTERNATE_MAPPING,

	.pxafb_lcd_power = samsung_lcd_power,

};

arch/arm/mach-pxa/pcm990-baseboard.c

+2 −4
Original line number Diff line number Diff line
@@ -104,8 +104,7 @@ static struct pxafb_mode_info fb_info_sharp_lq084v1dg21 = { 
static struct pxafb_mach_info pcm990_fbinfo __initdata = {

	.modes			= &fb_info_sharp_lq084v1dg21,

	.num_modes		= 1,

	.lccr0			= LCCR0_PAS,

	.lccr3			= LCCR3_PCP,

	.lcd_conn		= LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,

	.pxafb_lcd_power	= pcm990_lcd_power,

};

#elif defined(CONFIG_PCM990_DISPLAY_NEC)
@@ -127,8 +126,7 @@ struct pxafb_mode_info fb_info_nec_nl6448bc20_18d = { 
static struct pxafb_mach_info pcm990_fbinfo __initdata = {

	.modes			= &fb_info_nec_nl6448bc20_18d,

	.num_modes		= 1,

	.lccr0			= LCCR0_Act,

	.lccr3			= LCCR3_PixFlEdg,

	.lcd_conn		= LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,

	.pxafb_lcd_power	= pcm990_lcd_power,

};

#endif