diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2013-03-27 23:53:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-28 16:10:16 -0700 |
| commit | 597d96b63b81873c91b0cee93ca890d52b531102 (patch) | |
| tree | 5cf49f6ccbb09a7165a7e6073bf58a74d8bc9732 | |
| parent | d8e7567e537e32a9309f10e59c72abfb1e6645d8 (diff) | |
| download | linux-3.10-597d96b63b81873c91b0cee93ca890d52b531102.tar.gz linux-3.10-597d96b63b81873c91b0cee93ca890d52b531102.tar.bz2 linux-3.10-597d96b63b81873c91b0cee93ca890d52b531102.zip | |
staging: xgifb: rename SR15/SR13 arrays to SR18
Since we are programming SR register 18, better name structs/arrays
accordingly to avoid confusion.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/xgifb/vb_init.c | 8 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 4 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_struct.h | 2 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_table.h | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index 6e2c6b40c31..19ce5a978ca 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -90,14 +90,14 @@ static void XGINew_DDR1x_MRS_340(unsigned long P3c4, xgifb_reg_set(P3c4, 0x16, 0x80); udelay(60); - xgifb_reg_set(P3c4, 0x18, pVBInfo->SR15[pVBInfo->ram_type]); /* SR18 */ + xgifb_reg_set(P3c4, 0x18, pVBInfo->SR18[pVBInfo->ram_type]); /* SR18 */ xgifb_reg_set(P3c4, 0x19, 0x01); xgifb_reg_set(P3c4, 0x16, 0x03); xgifb_reg_set(P3c4, 0x16, 0x83); mdelay(1); xgifb_reg_set(P3c4, 0x1B, 0x03); udelay(500); - xgifb_reg_set(P3c4, 0x18, pVBInfo->SR15[pVBInfo->ram_type]); /* SR18 */ + xgifb_reg_set(P3c4, 0x18, pVBInfo->SR18[pVBInfo->ram_type]); /* SR18 */ xgifb_reg_set(P3c4, 0x19, 0x00); xgifb_reg_set(P3c4, 0x16, 0x03); xgifb_reg_set(P3c4, 0x16, 0x83); @@ -261,14 +261,14 @@ static void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, xgifb_reg_set(P3c4, 0x16, 0x00); xgifb_reg_set(P3c4, 0x16, 0x80); udelay(60); - xgifb_reg_set(P3c4, 0x18, pVBInfo->SR15[pVBInfo->ram_type]); /* SR18 */ + xgifb_reg_set(P3c4, 0x18, pVBInfo->SR18[pVBInfo->ram_type]); /* SR18 */ xgifb_reg_set(P3c4, 0x19, 0x01); xgifb_reg_set(P3c4, 0x16, 0x03); xgifb_reg_set(P3c4, 0x16, 0x83); mdelay(1); xgifb_reg_set(P3c4, 0x1B, 0x03); udelay(500); - xgifb_reg_set(P3c4, 0x18, pVBInfo->SR15[pVBInfo->ram_type]); /* SR18 */ + xgifb_reg_set(P3c4, 0x18, pVBInfo->SR18[pVBInfo->ram_type]); /* SR18 */ xgifb_reg_set(P3c4, 0x19, 0x00); xgifb_reg_set(P3c4, 0x16, 0x03); xgifb_reg_set(P3c4, 0x16, 0x83); diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index dfa5303379e..3adec3f1846 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -32,7 +32,7 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo) pVBInfo->VBInfo = 0; pVBInfo->TVInfo = 0; - pVBInfo->SR15 = XGI340_SR13; + pVBInfo->SR18 = XGI340_SR18; pVBInfo->CR40 = XGI340_cr41; /* 310 customization related */ @@ -49,7 +49,7 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo) pVBInfo->MCLKData = XGI27New_MCLKData; pVBInfo->CR40 = XGI27_cr41; pVBInfo->XGINew_CR97 = 0xc1; - pVBInfo->SR15 = XG27_SR13; + pVBInfo->SR18 = XG27_SR18; /*Z11m DDR*/ temp = xgifb_reg_get(pVBInfo->P3c4, 0x3B); diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h index 4909efa8eb2..c08ff5b2d6e 100644 --- a/drivers/staging/xgifb/vb_struct.h +++ b/drivers/staging/xgifb/vb_struct.h @@ -146,7 +146,7 @@ struct vb_device_info { void __iomem *FBAddr; - unsigned char const *SR15; + unsigned char const *SR18; unsigned char const (*CR40)[3]; struct SiS_MCLKData const *MCLKData; diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h index f8735944631..7168eedbd96 100644 --- a/drivers/staging/xgifb/vb_table.h +++ b/drivers/staging/xgifb/vb_table.h @@ -18,11 +18,11 @@ const struct XGI_ECLKDataStruct XGI340_ECLKData[] = { {0x7C, 0x08, 0x01, 200}, }; -static const unsigned char XG27_SR13[3] = { +static const unsigned char XG27_SR18[3] = { 0x32, 0x32, 0x42 /* SR18 */ }; -static const unsigned char XGI340_SR13[3] = { +static const unsigned char XGI340_SR18[3] = { 0x31, 0x42, 0x42 /* SR18 */ }; |