aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMicky Ching <micky_ching@realsil.com.cn>2015-02-25 00:50:10 -0500
committerLee Jones <lee.jones@linaro.org>2015-03-03 11:41:17 -0500
commit9e33ce79f828eb5a1bb9dd4830c7fa719d4279dc (patch)
tree79443d44f62bebfd4eace1cc9ba75ee61dc5a860
parentada71f5588320e7a5c7166cb7c1c8c40cb866ac4 (diff)
mfd: rtsx: Update PETXCFG address
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>
-rw-r--r--drivers/mfd/rts5227.c6
-rw-r--r--drivers/mfd/rts5249.c6
-rw-r--r--include/linux/mfd/rtsx_pci.h2
3 files changed, 5 insertions, 9 deletions
diff --git a/drivers/mfd/rts5227.c b/drivers/mfd/rts5227.c
index 32407404d838..1f387d4cec6c 100644
--- a/drivers/mfd/rts5227.c
+++ b/drivers/mfd/rts5227.c
@@ -118,11 +118,9 @@ static int rts5227_extra_init_hw(struct rtsx_pcr *pcr)
118 rts5227_fill_driving(pcr, OUTPUT_3V3); 118 rts5227_fill_driving(pcr, OUTPUT_3V3);
119 /* Configure force_clock_req */ 119 /* Configure force_clock_req */
120 if (pcr->flags & PCR_REVERSE_SOCKET) 120 if (pcr->flags & PCR_REVERSE_SOCKET)
121 rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, 121 rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, 0xB8, 0xB8);
122 AUTOLOAD_CFG_BASE + 3, 0xB8, 0xB8);
123 else 122 else
124 rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, 123 rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, 0xB8, 0x88);
125 AUTOLOAD_CFG_BASE + 3, 0xB8, 0x88);
126 rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PM_CTRL3, 0x10, 0x00); 124 rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PM_CTRL3, 0x10, 0x00);
127 125
128 return rtsx_pci_send_cmd(pcr, 100); 126 return rtsx_pci_send_cmd(pcr, 100);
diff --git a/drivers/mfd/rts5249.c b/drivers/mfd/rts5249.c
index cf425cc959d5..225ad5527d3e 100644
--- a/drivers/mfd/rts5249.c
+++ b/drivers/mfd/rts5249.c
@@ -116,11 +116,9 @@ static int rts5249_extra_init_hw(struct rtsx_pcr *pcr)
116 /* Configure driving */ 116 /* Configure driving */
117 rts5249_fill_driving(pcr, OUTPUT_3V3); 117 rts5249_fill_driving(pcr, OUTPUT_3V3);
118 if (pcr->flags & PCR_REVERSE_SOCKET) 118 if (pcr->flags & PCR_REVERSE_SOCKET)
119 rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, 119 rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, 0xB0, 0xB0);
120 AUTOLOAD_CFG_BASE + 3, 0xB0, 0xB0);
121 else 120 else
122 rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, 121 rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, 0xB0, 0x80);
123 AUTOLOAD_CFG_BASE + 3, 0xB0, 0x80);
124 rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PM_CTRL3, 0x10, 0x00); 122 rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PM_CTRL3, 0x10, 0x00);
125 123
126 return rtsx_pci_send_cmd(pcr, 100); 124 return rtsx_pci_send_cmd(pcr, 100);
diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/mfd/rtsx_pci.h
index e81f2bbfcda0..87cff60953f6 100644
--- a/include/linux/mfd/rtsx_pci.h
+++ b/include/linux/mfd/rtsx_pci.h
@@ -572,7 +572,6 @@
572#define MSGTXDATA2 0xFE46 572#define MSGTXDATA2 0xFE46
573#define MSGTXDATA3 0xFE47 573#define MSGTXDATA3 0xFE47
574#define MSGTXCTL 0xFE48 574#define MSGTXCTL 0xFE48
575#define PETXCFG 0xFE49
576#define LTR_CTL 0xFE4A 575#define LTR_CTL 0xFE4A
577#define OBFF_CFG 0xFE4C 576#define OBFF_CFG 0xFE4C
578 577
@@ -606,6 +605,7 @@
606#define DUMMY_REG_RESET_0 0xFE90 605#define DUMMY_REG_RESET_0 0xFE90
607 606
608#define AUTOLOAD_CFG_BASE 0xFF00 607#define AUTOLOAD_CFG_BASE 0xFF00
608#define PETXCFG 0xFF03
609 609
610#define PM_CTRL1 0xFF44 610#define PM_CTRL1 0xFF44
611#define PM_CTRL2 0xFF45 611#define PM_CTRL2 0xFF45