Commit 1672617d authored by Rui Feng's avatar Rui Feng Committed by Ulf Hansson
Browse files

misc: rtsx: Add hardware auto power off for RTS5261 



This patch enable hardware auto power off when card is removed.

Signed-off-by: default avatarRui Feng <rui_feng@realsil.com.cn>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/1604397312-2991-1-git-send-email-rui_feng@realsil.com.cn


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 1da3c515

drivers/misc/cardreader/rts5261.c

+9 −0
Original line number Diff line number Diff line
@@ -176,6 +176,8 @@ static int rts5261_card_power_on(struct rtsx_pcr *pcr, int card) 
	if (option->ocp_en)

		rtsx_pci_enable_ocp(pcr);



	rtsx_pci_write_register(pcr, REG_CRC_DUMMY_0,

		CFG_SD_POW_AUTO_PD, CFG_SD_POW_AUTO_PD);



	rtsx_pci_write_register(pcr, RTS5261_LDO1_CFG1,

			RTS5261_LDO1_TUNE_MASK, RTS5261_LDO1_33);
@@ -303,6 +305,8 @@ static int rts5261_card_power_off(struct rtsx_pcr *pcr, int card) 
	err = rtsx_pci_write_register(pcr, RTS5261_LDO1233318_POW_CTL,

				RTS5261_LDO_POWERON_MASK, 0);



	rtsx_pci_write_register(pcr, REG_CRC_DUMMY_0,

		CFG_SD_POW_AUTO_PD, 0);

	if (pcr->option.ocp_en)

		rtsx_pci_disable_ocp(pcr);
@@ -475,6 +479,7 @@ static void rts5261_init_from_cfg(struct rtsx_pcr *pcr) 
static int rts5261_extra_init_hw(struct rtsx_pcr *pcr)

{

	struct rtsx_cr_option *option = &pcr->option;

	u32 val;



	rtsx_pci_write_register(pcr, RTS5261_AUTOLOAD_CFG1,

			CD_RESUME_EN_MASK, CD_RESUME_EN_MASK);
@@ -489,6 +494,10 @@ static int rts5261_extra_init_hw(struct rtsx_pcr *pcr) 
			AUX_CLK_ACTIVE_SEL_MASK, MAC_CKSW_DONE);

	rtsx_pci_write_register(pcr, L1SUB_CONFIG3, 0xFF, 0);



	if (is_version_higher_than(pcr, PID_5261, IC_VER_B)) {

		val = rtsx_pci_readl(pcr, RTSX_DUM_REG);

		rtsx_pci_writel(pcr, RTSX_DUM_REG, val | 0x1);

	}

	rtsx_pci_write_register(pcr, RTS5261_AUTOLOAD_CFG4,

			RTS5261_AUX_CLK_16M_EN, 0);

include/linux/rtsx_pci.h

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 
#define   MS_OC_INT_EN			(1 << 23)

#define   SD_OC_INT_EN			(1 << 22)



#define RTSX_DUM_REG			0x1C



/*

 * macros for easy use
@@ -1272,6 +1273,8 @@ struct rtsx_pcr { 
#define PCI_PID(pcr)			((pcr)->pci->device)

#define is_version(pcr, pid, ver)				\

	(CHK_PCI_PID(pcr, pid) && (pcr)->ic_version == (ver))

#define is_version_higher_than(pcr, pid, ver)			\

	(CHK_PCI_PID(pcr, pid) && (pcr)->ic_version > (ver))

#define pcr_dbg(pcr, fmt, arg...)				\

	dev_dbg(&(pcr)->pci->dev, fmt, ##arg)