misc: rtsx: Fix power down flow
Subsystems (2)
PATCH v4 1/2 misc: rtsx: Fix power down flow
From: Ricky Wu <[email protected]>
Fix and sort out rtsx driver power down flow
Signed-off-by Ricky Wu <[email protected]>
--- drivers/misc/cardreader/rts5227.c | 15 --------------- drivers/misc/cardreader/rts5228.c | 5 ++--- drivers/misc/cardreader/rts5249.c | 17 ----------------- drivers/misc/cardreader/rts5260.c | 16 ---------------- drivers/misc/cardreader/rtsx_pcr.c | 16 ++++++++++++++++ 5 files changed, 18 insertions(+), 51 deletions(-)
drivers/misc/cardreader/rts5227.c +0 -15
@@ -77,19 +77,6 @@ static void rts5227_fetch_vendor_settings(struct rtsx_pcr *pcr) pcr->flags |=PCR_REVERSE_SOCKET ; } -static void rts5227_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) -{ -/* Set relink_time to 0 */ -rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +1 ,0xFF ,0 ); -rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +2 ,0xFF ,0 ); -rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +3 ,0x01 ,0 ); - -if (pm_state ==HOST_ENTER_S3 ) -rtsx_pci_write_register (pcr, pcr->reg_pm_ctrl3,0x10 ,0x10 ); - -rtsx_pci_write_register (pcr,FPDCTL ,0x03 ,0x03 ); -} -static int rts5227_extra_init_hw (struct rtsx_pcr *pcr) {u16 cap;
@@ -239,7 +226,6 @@ static const struct pcr_ops rts5227_pcr_ops = { .switch_output_voltage = rts5227_switch_output_voltage, .cd_deglitch = NULL, .conv_clk_and_div_n = NULL, - .force_power_down = rts5227_force_power_down, };/* SD Pull Control Enable:
@@ -389,7 +375,6 @@ static const struct pcr_ops rts522a_pcr_ops = { .switch_output_voltage = rts522a_switch_output_voltage, .cd_deglitch = NULL, .conv_clk_and_div_n = NULL, - .force_power_down = rts5227_force_power_down, };void rts522a_init_params (struct rtsx_pcr *pcr)
drivers/misc/cardreader/rts5228.c +2 -3
@@ -99,9 +99,8 @@ static void rts5228_force_power_down(struct rtsx_pcr *pcr, u8 pm_state)rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +3 ,RELINK_TIME_MASK ,0 ); -if (pm_state ==HOST_ENTER_S3 ) -rtsx_pci_write_register (pcr, pcr->reg_pm_ctrl3, -D3_DELINK_MODE_EN ,D3_DELINK_MODE_EN ); +rtsx_pci_write_register (pcr, pcr->reg_pm_ctrl3, +D3_DELINK_MODE_EN ,D3_DELINK_MODE_EN );rtsx_pci_write_register (pcr,FPDCTL ,SSC_POWER_DOWN ,SSC_POWER_DOWN );
drivers/misc/cardreader/rts5249.c +0 -17
@@ -78,20 +78,6 @@ static void rtsx_base_fetch_vendor_settings(struct rtsx_pcr *pcr) pcr->flags |=PCR_REVERSE_SOCKET ; } -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) -{ -/* Set relink_time to 0 */ -rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +1 ,0xFF ,0 ); -rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +2 ,0xFF ,0 ); -rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +3 ,0x01 ,0 ); - -if (pm_state ==HOST_ENTER_S3 ) -rtsx_pci_write_register (pcr, pcr->reg_pm_ctrl3, -D3_DELINK_MODE_EN ,D3_DELINK_MODE_EN ); - -rtsx_pci_write_register (pcr,FPDCTL ,0x03 ,0x03 ); -} -static void rts5249_init_from_cfg (struct rtsx_pcr *pcr) {struct pci_dev *pdev = pcr->pci;
@@ -360,7 +346,6 @@ static const struct pcr_ops rts5249_pcr_ops = { .card_power_on = rtsx_base_card_power_on, .card_power_off = rtsx_base_card_power_off, .switch_output_voltage = rtsx_base_switch_output_voltage, - .force_power_down = rtsx_base_force_power_down, };/* SD Pull Control Enable:
@@ -585,7 +570,6 @@ static const struct pcr_ops rts524a_pcr_ops = { .card_power_on = rtsx_base_card_power_on, .card_power_off = rtsx_base_card_power_off, .switch_output_voltage = rtsx_base_switch_output_voltage, - .force_power_down = rtsx_base_force_power_down, .set_l1off_cfg_sub_d0 = rts5250_set_l1off_cfg_sub_d0, };
@@ -700,7 +684,6 @@ static const struct pcr_ops rts525a_pcr_ops = { .card_power_on = rts525a_card_power_on, .card_power_off = rtsx_base_card_power_off, .switch_output_voltage = rts525a_switch_output_voltage, - .force_power_down = rtsx_base_force_power_down, .set_l1off_cfg_sub_d0 = rts5250_set_l1off_cfg_sub_d0, };
drivers/misc/cardreader/rts5260.c +0 -16
@@ -87,21 +87,6 @@ static void rtsx_base_fetch_vendor_settings(struct rtsx_pcr *pcr) pcr->flags |=PCR_REVERSE_SOCKET ; } -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) -{ -/* Set relink_time to 0 */ -rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +1 ,MASK_8_BIT_DEF ,0 ); -rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +2 ,MASK_8_BIT_DEF ,0 ); -rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +3 , -RELINK_TIME_MASK ,0 ); - -if (pm_state ==HOST_ENTER_S3 ) -rtsx_pci_write_register (pcr, pcr->reg_pm_ctrl3, -D3_DELINK_MODE_EN ,D3_DELINK_MODE_EN ); - -rtsx_pci_write_register (pcr,FPDCTL ,ALL_POWER_DOWN ,ALL_POWER_DOWN ); -} -static int rtsx_base_enable_auto_blink (struct rtsx_pcr *pcr) { return rtsx_pci_write_register(pcr, OLT_LED_CTL,
@@ -620,7 +605,6 @@ static const struct pcr_ops rts5260_pcr_ops = { .card_power_on = rts5260_card_power_on, .card_power_off = rts5260_card_power_off, .switch_output_voltage = rts5260_switch_output_voltage, - .force_power_down = rtsx_base_force_power_down, .stop_cmd = rts5260_stop_cmd, .set_l1off_cfg_sub_d0 = rts5260_set_l1off_cfg_sub_d0, .enable_ocp = rts5260_enable_ocp,
drivers/misc/cardreader/rtsx_pcr.c +16 -0
@@ -1096,6 +1096,20 @@ static void rtsx_pci_idle_work(struct work_struct *work)mutex_unlock (&pcr->pcr_mutex); } +static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) +{ +/* Set relink_time to 0 */ +rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +1 ,MASK_8_BIT_DEF ,0 ); +rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +2 ,MASK_8_BIT_DEF ,0 ); +rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +3 , +RELINK_TIME_MASK ,0 ); + +rtsx_pci_write_register (pcr, pcr->reg_pm_ctrl3, +D3_DELINK_MODE_EN ,D3_DELINK_MODE_EN ); + +rtsx_pci_write_register (pcr,FPDCTL ,ALL_POWER_DOWN ,ALL_POWER_DOWN ); +} +static void __maybe_unused rtsx_pci_power_off (struct rtsx_pcr *pcr,u8 pm_state) {if (pcr->ops->turn_off_led)
@@ -1109,6 +1123,8 @@ static void __maybe_unused rtsx_pci_power_off(struct rtsx_pcr *pcr, u8 pm_state)if (pcr->ops->force_power_down) pcr->ops->force_power_down (pcr, pm_state); +else +rtsx_base_force_power_down (pcr, pm_state); }void rtsx_pci_enable_ocp (struct rtsx_pcr *pcr)
Signature · 1 line
2.17.1