Commit 3df4fce7 authored by Ricky Wu's avatar Ricky Wu Committed by Greg Kroah-Hartman
Browse files

misc: rtsx: separate aspm mode into MODE_REG and MODE_CFG 



aspm (Active State Power Management)
rtsx_comm_set_aspm: this function is for driver to make sure
not enter power saving when processing of init and card_detcct
ASPM_MODE_CFG: 8411 5209 5227 5229 5249 5250
Change back to use original way to control aspm
ASPM_MODE_REG: 5227A 524A 5250A 5260 5261 5228
Keep the new way to control aspm

Fixes: 121e9c6b ("misc: rtsx: modify and fix init_hw function")
Reported-by: default avatarChris Chiu <chris.chiu@canonical.com>
Tested-by: default avatarGordon Lack <gordon.lack@dsl.pipex.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarRicky Wu <ricky_wu@realtek.com>
Link: https://lore.kernel.org/r/20210607101634.4948-1-ricky_wu@realtek.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5f0c2ee1

drivers/misc/cardreader/rtl8411.c

+1 −0
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ static void rtl8411_init_common_params(struct rtsx_pcr *pcr) 
	pcr->sd30_drive_sel_1v8 = DRIVER_TYPE_B;

	pcr->sd30_drive_sel_3v3 = DRIVER_TYPE_D;

	pcr->aspm_en = ASPM_L1_EN;

	pcr->aspm_mode = ASPM_MODE_CFG;

	pcr->tx_initial_phase = SET_CLOCK_PHASE(23, 7, 14);

	pcr->rx_initial_phase = SET_CLOCK_PHASE(4, 3, 10);

	pcr->ic_version = rtl8411_get_ic_version(pcr);

drivers/misc/cardreader/rts5209.c

+1 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ void rts5209_init_params(struct rtsx_pcr *pcr) 
	pcr->sd30_drive_sel_1v8 = DRIVER_TYPE_B;

	pcr->sd30_drive_sel_3v3 = DRIVER_TYPE_D;

	pcr->aspm_en = ASPM_L1_EN;

	pcr->aspm_mode = ASPM_MODE_CFG;

	pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 27, 16);

	pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5);

drivers/misc/cardreader/rts5227.c

+2 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ void rts5227_init_params(struct rtsx_pcr *pcr) 
	pcr->sd30_drive_sel_1v8 = CFG_DRIVER_TYPE_B;

	pcr->sd30_drive_sel_3v3 = CFG_DRIVER_TYPE_B;

	pcr->aspm_en = ASPM_L1_EN;

	pcr->aspm_mode = ASPM_MODE_CFG;

	pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 27, 15);

	pcr->rx_initial_phase = SET_CLOCK_PHASE(30, 7, 7);
@@ -483,6 +484,7 @@ void rts522a_init_params(struct rtsx_pcr *pcr) 


	rts5227_init_params(pcr);

	pcr->ops = &rts522a_pcr_ops;

	pcr->aspm_mode = ASPM_MODE_REG;

	pcr->tx_initial_phase = SET_CLOCK_PHASE(20, 20, 11);

	pcr->reg_pm_ctrl3 = RTS522A_PM_CTRL3;

drivers/misc/cardreader/rts5228.c

+1 −0
Original line number Diff line number Diff line
@@ -718,6 +718,7 @@ void rts5228_init_params(struct rtsx_pcr *pcr) 
	pcr->sd30_drive_sel_1v8 = CFG_DRIVER_TYPE_B;

	pcr->sd30_drive_sel_3v3 = CFG_DRIVER_TYPE_B;

	pcr->aspm_en = ASPM_L1_EN;

	pcr->aspm_mode = ASPM_MODE_REG;

	pcr->tx_initial_phase = SET_CLOCK_PHASE(28, 27, 11);

	pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5);

drivers/misc/cardreader/rts5229.c

+1 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ void rts5229_init_params(struct rtsx_pcr *pcr) 
	pcr->sd30_drive_sel_1v8 = DRIVER_TYPE_B;

	pcr->sd30_drive_sel_3v3 = DRIVER_TYPE_D;

	pcr->aspm_en = ASPM_L1_EN;

	pcr->aspm_mode = ASPM_MODE_CFG;

	pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 27, 15);

	pcr->rx_initial_phase = SET_CLOCK_PHASE(30, 6, 6);