Commit 0a3bbf92 authored by Rui Feng's avatar Rui Feng Committed by Ulf Hansson
Browse files

misc: rtsx: Fix aspm for RTS5261 



This patch fix the bug that LDO is off when aspm is enabled.

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/1604397285-2850-1-git-send-email-rui_feng@realsil.com.cn


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

drivers/misc/cardreader/rts5261.c

+9 −1
Original line number Diff line number Diff line
@@ -530,22 +530,30 @@ static int rts5261_extra_init_hw(struct rtsx_pcr *pcr) 


static void rts5261_enable_aspm(struct rtsx_pcr *pcr, bool enable)

{

	u8 val = FORCE_ASPM_CTL0 | FORCE_ASPM_CTL1;

	u8 mask = FORCE_ASPM_VAL_MASK | FORCE_ASPM_CTL0 | FORCE_ASPM_CTL1;



	if (pcr->aspm_enabled == enable)

		return;



	val |= (pcr->aspm_en & 0x02);

	rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, mask, val);

	pcie_capability_clear_and_set_word(pcr->pci, PCI_EXP_LNKCTL,

					   PCI_EXP_LNKCTL_ASPMC, pcr->aspm_en);

	pcr->aspm_enabled = enable;



}



static void rts5261_disable_aspm(struct rtsx_pcr *pcr, bool enable)

{

	u8 val = FORCE_ASPM_CTL0 | FORCE_ASPM_CTL1;

	u8 mask = FORCE_ASPM_VAL_MASK | FORCE_ASPM_CTL0 | FORCE_ASPM_CTL1;



	if (pcr->aspm_enabled == enable)

		return;



	pcie_capability_clear_and_set_word(pcr->pci, PCI_EXP_LNKCTL,

					   PCI_EXP_LNKCTL_ASPMC, 0);

	rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, mask, val);

	rtsx_pci_write_register(pcr, SD_CFG1, SD_ASYNC_FIFO_NOT_RST, 0);

	udelay(10);

	pcr->aspm_enabled = enable;

drivers/misc/cardreader/rts5261.h

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ 


/*New add*/

#define rts5261_vendor_setting_valid(reg)	((reg) & 0x010000)

#define rts5261_reg_to_aspm(reg)		(((reg) >> 28) ^ 0x03)

#define rts5261_reg_to_aspm(reg) \

	(((~(reg) >> 28) & 0x02) | (((reg) >> 28) & 0x01))

#define rts5261_reg_check_reverse_socket(reg)	((reg) & 0x04)

#define rts5261_reg_to_card_drive_sel(reg)	((((reg) >> 6) & 0x01) << 6)

#define rts5261_reg_to_sd30_drive_sel_1v8(reg)	(((reg) >> 22) ^ 0x03)