diff options
Diffstat (limited to 'drivers/misc/cardreader')
| -rw-r--r-- | drivers/misc/cardreader/rts5260.c | 11 | 
1 files changed, 6 insertions, 5 deletions
| diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c index da22bcb62b04..4e285addbf2b 100644 --- a/drivers/misc/cardreader/rts5260.c +++ b/drivers/misc/cardreader/rts5260.c @@ -451,17 +451,18 @@ static void rts5260_pwr_saving_setting(struct rtsx_pcr *pcr)  	lss_l1_2 = rtsx_check_dev_flag(pcr, ASPM_L1_2_EN)  			| rtsx_check_dev_flag(pcr, PM_L1_2_EN); +	rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, 0xFF, 0);  	if (lss_l1_2) {  		pcr_dbg(pcr, "Set parameters for L1.2.");  		rtsx_pci_write_register(pcr, PWR_GLOBAL_CTRL,  					0xFF, PCIE_L1_2_EN); -	rtsx_pci_write_register(pcr, RTS5260_DVCC_CTRL, +		rtsx_pci_write_register(pcr, RTS5260_DVCC_CTRL,  					RTS5260_DVCC_OCP_EN |  					RTS5260_DVCC_OCP_CL_EN,  					RTS5260_DVCC_OCP_EN |  					RTS5260_DVCC_OCP_CL_EN); -	rtsx_pci_write_register(pcr, PWR_FE_CTL, +		rtsx_pci_write_register(pcr, PWR_FE_CTL,  					0xFF, PCIE_L1_2_PD_FE_EN);  	} else if (lss_l1_1) {  		pcr_dbg(pcr, "Set parameters for L1.1."); @@ -573,10 +574,10 @@ static int rts5260_extra_init_hw(struct rtsx_pcr *pcr)  	 * to drive low, and we forcibly request clock.  	 */  	if (option->force_clkreq_0) -		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, +		rtsx_pci_write_register(pcr, PETXCFG,  				 FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);  	else -		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, +		rtsx_pci_write_register(pcr, PETXCFG,  				 FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH);  	return 0; @@ -704,7 +705,7 @@ void rts5260_init_params(struct rtsx_pcr *pcr)  	option->ocp_en = 1;  	if (option->ocp_en)  		hw_param->interrupt_en |= SD_OC_INT_EN; -	hw_param->ocp_glitch =  SDVIO_OCP_GLITCH_800U | SDVIO_OCP_GLITCH_800U; +	hw_param->ocp_glitch =  SD_OCP_GLITCH_100U | SDVIO_OCP_GLITCH_800U;  	option->sd_400mA_ocp_thd = RTS5260_DVCC_OCP_THD_550;  	option->sd_800mA_ocp_thd = RTS5260_DVCC_OCP_THD_970;  } |