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

Commit 9e33ce79 authored by Micky Ching's avatar Micky Ching Committed by Lee Jones
Browse files

mfd: rtsx: Update PETXCFG address 



PETXCFG is defined at 0xFF03, the old 0xFE49 not used any more.

Signed-off-by: default avatarMicky Ching <micky_ching@realsil.com.cn>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent ada71f55

drivers/mfd/rts5227.c

+2 −4
Original line number Diff line number Diff line
@@ -118,11 +118,9 @@ static int rts5227_extra_init_hw(struct rtsx_pcr *pcr) 
	rts5227_fill_driving(pcr, OUTPUT_3V3);

	/* Configure force_clock_req */

	if (pcr->flags & PCR_REVERSE_SOCKET)

		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD,

				AUTOLOAD_CFG_BASE + 3, 0xB8, 0xB8);

		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, 0xB8, 0xB8);

	else

		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD,

				AUTOLOAD_CFG_BASE + 3, 0xB8, 0x88);

		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, 0xB8, 0x88);

	rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PM_CTRL3, 0x10, 0x00);



	return rtsx_pci_send_cmd(pcr, 100);

drivers/mfd/rts5249.c

+2 −4
Original line number Diff line number Diff line
@@ -116,11 +116,9 @@ static int rts5249_extra_init_hw(struct rtsx_pcr *pcr) 
	/* Configure driving */

	rts5249_fill_driving(pcr, OUTPUT_3V3);

	if (pcr->flags & PCR_REVERSE_SOCKET)

		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD,

				AUTOLOAD_CFG_BASE + 3, 0xB0, 0xB0);

		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, 0xB0, 0xB0);

	else

		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD,

				AUTOLOAD_CFG_BASE + 3, 0xB0, 0x80);

		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, 0xB0, 0x80);

	rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PM_CTRL3, 0x10, 0x00);



	return rtsx_pci_send_cmd(pcr, 100);

include/linux/mfd/rtsx_pci.h

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,6 @@ 
#define MSGTXDATA2			0xFE46

#define MSGTXDATA3			0xFE47

#define MSGTXCTL			0xFE48

#define PETXCFG				0xFE49

#define LTR_CTL				0xFE4A

#define OBFF_CFG			0xFE4C
@@ -606,6 +605,7 @@ 
#define DUMMY_REG_RESET_0		0xFE90



#define AUTOLOAD_CFG_BASE		0xFF00

#define PETXCFG				0xFF03



#define PM_CTRL1			0xFF44

#define PM_CTRL2			0xFF45