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

Commit 597d96b6 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

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: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d8e7567e

drivers/staging/xgifb/vb_init.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

drivers/staging/xgifb/vb_setmode.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/staging/xgifb/vb_struct.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/xgifb/vb_table.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */

};