leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mfd: rtsx: Update PETXCFG address

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

Signed-off-by: Micky Ching <micky_ching@realsil.com.cn>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Micky Ching
2015-02-25 13:50:10 +08:00
committed by Lee Jones
parent ada71f5588
commit 9e33ce79f8
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mfd/rts5227.c
View File

@@ -118,11 +118,9 @@ static int rts5227_extra_init_hw(struct rtsx_pcr *pcr)
rts5227_fill_driving(pcr, OUTPUT_3V3); rts5227_fill_driving(pcr, OUTPUT_3V3);
/* Configure force_clock_req */ /* Configure force_clock_req */
if (pcr->flags & PCR_REVERSE_SOCKET) if (pcr->flags & PCR_REVERSE_SOCKET)
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, 0xB8, 0xB8);
AUTOLOAD_CFG_BASE + 3, 0xB8, 0xB8);
else else
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, 0xB8, 0x88);
AUTOLOAD_CFG_BASE + 3, 0xB8, 0x88);
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PM_CTRL3, 0x10, 0x00); rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PM_CTRL3, 0x10, 0x00);
return rtsx_pci_send_cmd(pcr, 100); return rtsx_pci_send_cmd(pcr, 100);

6
drivers/mfd/rts5249.c
View File

@@ -116,11 +116,9 @@ static int rts5249_extra_init_hw(struct rtsx_pcr *pcr)
/* Configure driving */ /* Configure driving */
rts5249_fill_driving(pcr, OUTPUT_3V3); rts5249_fill_driving(pcr, OUTPUT_3V3);
if (pcr->flags & PCR_REVERSE_SOCKET) if (pcr->flags & PCR_REVERSE_SOCKET)
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, 0xB0, 0xB0);
AUTOLOAD_CFG_BASE + 3, 0xB0, 0xB0);
else else
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, 0xB0, 0x80);
AUTOLOAD_CFG_BASE + 3, 0xB0, 0x80);
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PM_CTRL3, 0x10, 0x00); rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PM_CTRL3, 0x10, 0x00);
return rtsx_pci_send_cmd(pcr, 100); return rtsx_pci_send_cmd(pcr, 100);

2
include/linux/mfd/rtsx_pci.h
View File

@@ -572,7 +572,6 @@
#define MSGTXDATA2 0xFE46 #define MSGTXDATA2 0xFE46
#define MSGTXDATA3 0xFE47 #define MSGTXDATA3 0xFE47
#define MSGTXCTL 0xFE48 #define MSGTXCTL 0xFE48
#define PETXCFG 0xFE49
#define LTR_CTL 0xFE4A #define LTR_CTL 0xFE4A
#define OBFF_CFG 0xFE4C #define OBFF_CFG 0xFE4C
@@ -606,6 +605,7 @@
#define DUMMY_REG_RESET_0 0xFE90 #define DUMMY_REG_RESET_0 0xFE90
#define AUTOLOAD_CFG_BASE 0xFF00 #define AUTOLOAD_CFG_BASE 0xFF00
#define PETXCFG 0xFF03
#define PM_CTRL1 0xFF44 #define PM_CTRL1 0xFF44
#define PM_CTRL2 0xFF45 #define PM_CTRL2 0xFF45