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

Commit 625030e5 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: xgifb: delete LCD_SetFlag 



Delete redundant XGI330_LCDCapStruct field.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 84a0b9b9

drivers/staging/xgifb/vb_def.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -62,10 +62,6 @@ 
#define EnableVBCLKDRVLOW    0x4000

#define EnableVBCLKDRVLOW    0x4000

#define EnablePLLSPLOW       0x8000

#define EnablePLLSPLOW       0x8000





#define LCDBToA              0x20   /* LCD SetFlag */

#define StLCDBToA            0x40

#define LockLCDBToA          0x80

#define   LCDToFull          0x10

#define AVIDEOSense          0x01   /* CR32 */

#define AVIDEOSense          0x01   /* CR32 */

#define SVIDEOSense          0x02

#define SVIDEOSense          0x02

#define SCARTSense           0x04

#define SCARTSense           0x04

drivers/staging/xgifb/vb_struct.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -81,7 +81,6 @@ struct XGI_XG21CRT1Struct { 
struct XGI330_LCDCapStruct {

struct XGI330_LCDCapStruct {

	unsigned char	LCD_ID;

	unsigned char	LCD_ID;

	unsigned short	LCD_Capability;

	unsigned short	LCD_Capability;

	unsigned char	LCD_SetFlag;

	unsigned char	LCD_HSyncWidth;

	unsigned char	LCD_HSyncWidth;

	unsigned char	LCD_VSyncWidth;

	unsigned char	LCD_VSyncWidth;

	unsigned char	LCD_VCLK;

	unsigned char	LCD_VCLK;

drivers/staging/xgifb/vb_table.h

+14 −14
Original line number Original line Diff line number Diff line
@@ -1867,70 +1867,70 @@ static const struct XGI330_TVDataTablStruct XGI_TVDataTable[] = { 
/* Dual link only */

/* Dual link only */

static const struct XGI330_LCDCapStruct XGI_LCDDLCapList[] = {

static const struct XGI330_LCDCapStruct XGI_LCDDLCapList[] = {

/* LCDCap1024x768 */

/* LCDCap1024x768 */

	{Panel_1024x768, DefaultLCDCap, 0, 0x88, 0x06, VCLK65_315,

	{Panel_1024x768, DefaultLCDCap, 0x88, 0x06, VCLK65_315,

	0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,

	0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,

	0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},

	0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},

/* LCDCap1280x1024 */

/* LCDCap1280x1024 */

	{Panel_1280x1024, XGI_LCDDualLink+DefaultLCDCap, StLCDBToA,

	{Panel_1280x1024, XGI_LCDDualLink+DefaultLCDCap,

	0x70, 0x03, VCLK108_2_315,

	0x70, 0x03, VCLK108_2_315,

	0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,

	0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,

	0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

	0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

/* LCDCap1400x1050 */

/* LCDCap1400x1050 */

	{Panel_1400x1050, XGI_LCDDualLink+DefaultLCDCap, StLCDBToA,

	{Panel_1400x1050, XGI_LCDDualLink+DefaultLCDCap,

	0x70, 0x03, VCLK108_2_315,

	0x70, 0x03, VCLK108_2_315,

	 0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

/* LCDCap1600x1200 */

/* LCDCap1600x1200 */

	{Panel_1600x1200, XGI_LCDDualLink+DefaultLCDCap, LCDToFull,

	{Panel_1600x1200, XGI_LCDDualLink+DefaultLCDCap,

	0xC0, 0x03, VCLK162,

	0xC0, 0x03, VCLK162,

	 0x43, 0x22, 0x70, 0x24, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x43, 0x22, 0x70, 0x24, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

/* LCDCap1024x768x75 */

/* LCDCap1024x768x75 */

	{Panel_1024x768x75, DefaultLCDCap, 0, 0x60, 0, VCLK78_75,

	{Panel_1024x768x75, DefaultLCDCap, 0x60, 0, VCLK78_75,

	 0x2B, 0x61, 0x2B, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x2B, 0x61, 0x2B, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},

/* LCDCap1280x1024x75 */

/* LCDCap1280x1024x75 */

	{Panel_1280x1024x75, XGI_LCDDualLink+DefaultLCDCap, StLCDBToA,

	{Panel_1280x1024x75, XGI_LCDDualLink+DefaultLCDCap,

	 0x90, 0x03, VCLK135_5,

	 0x90, 0x03, VCLK135_5,

	 0x54, 0x42, 0x4A, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x54, 0x42, 0x4A, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

/* LCDCapDefault */

/* LCDCapDefault */

	{0xFF, DefaultLCDCap, 0, 0x88, 0x06, VCLK65_315,

	{0xFF, DefaultLCDCap, 0x88, 0x06, VCLK65_315,

	0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,

	0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,

	0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10}

	0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10}

};

};





static const struct XGI330_LCDCapStruct XGI_LCDCapList[] = {

static const struct XGI330_LCDCapStruct XGI_LCDCapList[] = {

/* LCDCap1024x768 */

/* LCDCap1024x768 */

	{Panel_1024x768, DefaultLCDCap, 0, 0x88, 0x06, VCLK65_315,

	{Panel_1024x768, DefaultLCDCap, 0x88, 0x06, VCLK65_315,

	0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,

	0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,

	0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},

	0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},

/* LCDCap1280x1024 */

/* LCDCap1280x1024 */

	{Panel_1280x1024, DefaultLCDCap, StLCDBToA,

	{Panel_1280x1024, DefaultLCDCap,

	0x70, 0x03, VCLK108_2_315,

	0x70, 0x03, VCLK108_2_315,

	0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,

	0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,

	0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

	0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

/* LCDCap1400x1050 */

/* LCDCap1400x1050 */

	{Panel_1400x1050, DefaultLCDCap, StLCDBToA,

	{Panel_1400x1050, DefaultLCDCap,

	 0x70, 0x03, VCLK108_2_315,

	 0x70, 0x03, VCLK108_2_315,

	 0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

/* LCDCap1600x1200 */

/* LCDCap1600x1200 */

	{Panel_1600x1200, DefaultLCDCap, LCDToFull,

	{Panel_1600x1200, DefaultLCDCap,

	 0xC0, 0x03, VCLK162,

	 0xC0, 0x03, VCLK162,

	 0x5A, 0x23, 0x5A, 0x23, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x5A, 0x23, 0x5A, 0x23, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

/* LCDCap1024x768x75 */

/* LCDCap1024x768x75 */

	{Panel_1024x768x75, DefaultLCDCap, 0, 0x60, 0, VCLK78_75,

	{Panel_1024x768x75, DefaultLCDCap, 0x60, 0, VCLK78_75,

	 0x2B, 0x61, 0x2B, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x2B, 0x61, 0x2B, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},

/* LCDCap1280x1024x75 */

/* LCDCap1280x1024x75 */

	{Panel_1280x1024x75, DefaultLCDCap, StLCDBToA,

	{Panel_1280x1024x75, DefaultLCDCap,

	 0x90, 0x03, VCLK135_5,

	 0x90, 0x03, VCLK135_5,

	 0x54, 0x42, 0x4A, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x54, 0x42, 0x4A, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

/* LCDCapDefault */

/* LCDCapDefault */

	{0xFF, DefaultLCDCap, 0, 0x88, 0x06, VCLK65_315,

	{0xFF, DefaultLCDCap, 0x88, 0x06, VCLK65_315,

	0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,

	0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,

	0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10}

	0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10}

};

};