On Wed, 25 Feb 2015, micky_ching@xxxxxxxxxxxxxx wrote: > From: Micky Ching <micky_ching@xxxxxxxxxxxxxx> > > PETXCFG is defined at 0xFF03, the old 0xFE49 not used any more. > > Signed-off-by: Micky Ching <micky_ching@xxxxxxxxxxxxxx> > Acked-by: Lee Jones <lee.jones@xxxxxxxxxx> > --- > drivers/mfd/rts5227.c | 6 ++---- > drivers/mfd/rts5249.c | 6 ++---- > include/linux/mfd/rtsx_pci.h | 2 +- > 3 files changed, 5 insertions(+), 9 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/rts5227.c b/drivers/mfd/rts5227.c > index 3240740..1f387d4 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) > 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); > diff --git a/drivers/mfd/rts5249.c b/drivers/mfd/rts5249.c > index cf425cc..225ad55 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) > /* 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); > diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/mfd/rtsx_pci.h > index e81f2bb..87cff60 100644 > --- a/include/linux/mfd/rtsx_pci.h > +++ b/include/linux/mfd/rtsx_pci.h > @@ -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 -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
