diff options
-rw-r--r-- | drivers/misc/cardreader/rts5260.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c index da22bcb62b04..52c95add56f0 100644 --- a/drivers/misc/cardreader/rts5260.c +++ b/drivers/misc/cardreader/rts5260.c | |||
@@ -451,6 +451,7 @@ static void rts5260_pwr_saving_setting(struct rtsx_pcr *pcr) | |||
451 | lss_l1_2 = rtsx_check_dev_flag(pcr, ASPM_L1_2_EN) | 451 | lss_l1_2 = rtsx_check_dev_flag(pcr, ASPM_L1_2_EN) |
452 | | rtsx_check_dev_flag(pcr, PM_L1_2_EN); | 452 | | rtsx_check_dev_flag(pcr, PM_L1_2_EN); |
453 | 453 | ||
454 | rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, 0xFF, 0); | ||
454 | if (lss_l1_2) { | 455 | if (lss_l1_2) { |
455 | pcr_dbg(pcr, "Set parameters for L1.2."); | 456 | pcr_dbg(pcr, "Set parameters for L1.2."); |
456 | rtsx_pci_write_register(pcr, PWR_GLOBAL_CTRL, | 457 | rtsx_pci_write_register(pcr, PWR_GLOBAL_CTRL, |
@@ -573,10 +574,10 @@ static int rts5260_extra_init_hw(struct rtsx_pcr *pcr) | |||
573 | * to drive low, and we forcibly request clock. | 574 | * to drive low, and we forcibly request clock. |
574 | */ | 575 | */ |
575 | if (option->force_clkreq_0) | 576 | if (option->force_clkreq_0) |
576 | rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, | 577 | rtsx_pci_write_register(pcr, PETXCFG, |
577 | FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW); | 578 | FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW); |
578 | else | 579 | else |
579 | rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, | 580 | rtsx_pci_write_register(pcr, PETXCFG, |
580 | FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH); | 581 | FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH); |
581 | 582 | ||
582 | return 0; | 583 | return 0; |
@@ -704,7 +705,7 @@ void rts5260_init_params(struct rtsx_pcr *pcr) | |||
704 | option->ocp_en = 1; | 705 | option->ocp_en = 1; |
705 | if (option->ocp_en) | 706 | if (option->ocp_en) |
706 | hw_param->interrupt_en |= SD_OC_INT_EN; | 707 | hw_param->interrupt_en |= SD_OC_INT_EN; |
707 | hw_param->ocp_glitch = SDVIO_OCP_GLITCH_800U | SDVIO_OCP_GLITCH_800U; | 708 | hw_param->ocp_glitch = SD_OCP_GLITCH_100U | SDVIO_OCP_GLITCH_800U; |
708 | option->sd_400mA_ocp_thd = RTS5260_DVCC_OCP_THD_550; | 709 | option->sd_400mA_ocp_thd = RTS5260_DVCC_OCP_THD_550; |
709 | option->sd_800mA_ocp_thd = RTS5260_DVCC_OCP_THD_970; | 710 | option->sd_800mA_ocp_thd = RTS5260_DVCC_OCP_THD_970; |
710 | } | 711 | } |