misc: rtsx: Enable OCP for rts522a rts524a rts525a rts5260
PATCH 1/1 misc: rtsx: Enable OCP for rts522a rts524a rts525a rts5260
From: RickyWu <[email protected]>
this enables and adds OCP function for Realtek A series cardreader chips and fixes some OCP flow in rts5260.c
Signed-off-by RickyWu <[email protected]>
--- drivers/misc/cardreader/rts5227.c | 64 +++++++++++--- drivers/misc/cardreader/rts5249.c | 32 +++++-- drivers/misc/cardreader/rts5260.c | 136 +++++++++++------------------ drivers/misc/cardreader/rtsx_pcr.c | 40 +++++++-- drivers/misc/cardreader/rtsx_pcr.h | 5 ++ 5 files changed, 165 insertions(+), 112 deletions(-)
drivers/misc/cardreader/rts5227.c +54 -10
@@ -170,35 +170,46 @@ static int rts5227_card_power_on(struct rtsx_pcr *pcr, int card) {int err; +if (pcr->option.ocp_en) +rtsx_pci_enable_ocp (pcr); +rtsx_pci_init_cmd (pcr);rtsx_pci_add_cmd (pcr,WRITE_REG_CMD ,CARD_PWR_CTL ,SD_POWER_MASK ,SD_PARTIAL_POWER_ON ); +rtsx_pci_add_cmd (pcr,WRITE_REG_CMD ,PWR_GATE_CTRL ,LDO3318_PWR_MASK ,0x02 ); + err =rtsx_pci_send_cmd (pcr,100 );if (err <0 )return err;/* To avoid too large in-rush current */ -udelay (150 ); - +msleep (20 );rtsx_pci_init_cmd (pcr);rtsx_pci_add_cmd (pcr,WRITE_REG_CMD ,CARD_PWR_CTL ,SD_POWER_MASK ,SD_POWER_ON ); +rtsx_pci_add_cmd (pcr,WRITE_REG_CMD ,PWR_GATE_CTRL ,LDO3318_PWR_MASK ,0x06 ); + +rtsx_pci_add_cmd (pcr,WRITE_REG_CMD ,CARD_OE , +SD_OUTPUT_EN ,SD_OUTPUT_EN ); +rtsx_pci_add_cmd (pcr,WRITE_REG_CMD ,CARD_OE , +MS_OUTPUT_EN ,MS_OUTPUT_EN );return rtsx_pci_send_cmd (pcr,100 ); }static int rts5227_card_power_off (struct rtsx_pcr *pcr,int card) { -rtsx_pci_init_cmd (pcr); -rtsx_pci_add_cmd (pcr,WRITE_REG_CMD ,CARD_PWR_CTL , -SD_POWER_MASK |PMOS_STRG_MASK , -SD_POWER_OFF | PMOS_STRG_400mA); -rtsx_pci_add_cmd (pcr,WRITE_REG_CMD ,PWR_GATE_CTRL , -LDO3318_PWR_MASK ,0X00 ); -return rtsx_pci_send_cmd (pcr,100 ); +if (pcr->option.ocp_en) +rtsx_pci_disable_ocp (pcr); + +rtsx_pci_write_register (pcr,CARD_PWR_CTL ,SD_POWER_MASK | +PMOS_STRG_MASK ,SD_POWER_OFF | PMOS_STRG_400mA); +rtsx_pci_write_register (pcr,PWR_GATE_CTRL ,LDO3318_PWR_MASK ,0X00 ); + +return 0 ; }static int rts5227_switch_output_voltage (struct rtsx_pcr *pcr,u8 voltage)
@@ -348,6 +359,32 @@ static int rts522a_extra_init_hw(struct rtsx_pcr *pcr)return 0 ; } +static int rts522a_switch_output_voltage (struct rtsx_pcr *pcr,u8 voltage) +{ +int err; + +if (voltage ==OUTPUT_3V3 ) { + err =rtsx_pci_write_phy_register (pcr,0x08 ,0x57E4 ); +if (err <0 ) +return err; + }else if (voltage ==OUTPUT_1V8 ) { + err =rtsx_pci_write_phy_register (pcr,0x11 ,0x3C02 ); +if (err <0 ) +return err; + err =rtsx_pci_write_phy_register (pcr,0x08 ,0x54A4 ); +if (err <0 ) +return err; + }else { +return -EINVAL ; + } + +/* set pad drive */ +rtsx_pci_init_cmd (pcr); +rts5227_fill_driving (pcr, voltage); +return rtsx_pci_send_cmd (pcr,100 ); +} + +/* rts522a operations mainly derived from rts5227, except phy/hw init setting. */ static const struct pcr_ops rts522a_pcr_ops = {
@@ -360,7 +397,7 @@ static const struct pcr_ops rts522a_pcr_ops = { .disable_auto_blink = rts5227_disable_auto_blink, .card_power_on = rts5227_card_power_on, .card_power_off = rts5227_card_power_off, - .switch_output_voltage = rts5227_switch_output_voltage, + .switch_output_voltage = rts522a_switch_output_voltage, .cd_deglitch = NULL, .conv_clk_and_div_n = NULL, .force_power_down = rts5227_force_power_down,
@@ -371,4 +408,11 @@ void rts522a_init_params(struct rtsx_pcr *pcr)rts5227_init_params (pcr); pcr->reg_pm_ctrl3 =RTS522A_PM_CTRL3 ; + + pcr->option.ocp_en =1 ; +if (pcr->option.ocp_en) + pcr->hw_param.interrupt_en |=SD_OC_INT_EN ; + pcr->hw_param.ocp_glitch =SD_OCP_GLITCH_10M ; + pcr->option.sd_800mA_ocp_thd =RTS522A_OCP_THD_800 ; + }
drivers/misc/cardreader/rts5249.c +26 -6
@@ -284,6 +284,10 @@ static int rtsx_base_disable_auto_blink(struct rtsx_pcr *pcr)static int rtsx_base_card_power_on (struct rtsx_pcr *pcr,int card) {int err; +struct rtsx_cr_option *option = &pcr->option; + +if (option->ocp_en) +rtsx_pci_enable_ocp (pcr);rtsx_pci_init_cmd (pcr); rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, CARD_PWR_CTL,
@@ -306,12 +310,15 @@ static int rtsx_base_card_power_on(struct rtsx_pcr *pcr, int card)static int rtsx_base_card_power_off (struct rtsx_pcr *pcr,int card) { -rtsx_pci_init_cmd (pcr); -rtsx_pci_add_cmd (pcr,WRITE_REG_CMD ,CARD_PWR_CTL , -SD_POWER_MASK ,SD_POWER_OFF ); -rtsx_pci_add_cmd (pcr,WRITE_REG_CMD ,PWR_GATE_CTRL , -LDO3318_PWR_MASK ,0x00 ); -return rtsx_pci_send_cmd (pcr,100 ); +struct rtsx_cr_option *option = &pcr->option; + +if (option->ocp_en) +rtsx_pci_disable_ocp (pcr); + +rtsx_pci_write_register (pcr,CARD_PWR_CTL ,SD_POWER_MASK ,SD_POWER_OFF ); + +rtsx_pci_write_register (pcr,PWR_GATE_CTRL ,LDO3318_PWR_MASK ,0x00 ); +return 0 ; }static int rtsx_base_switch_output_voltage (struct rtsx_pcr *pcr,u8 voltage)
@@ -629,6 +636,13 @@ void rts524a_init_params(struct rtsx_pcr *pcr) pcr->reg_pm_ctrl3 =RTS524A_PM_CTRL3 ; pcr->ops = &rts524a_pcr_ops; + + pcr->option.ocp_en =1 ; +if (pcr->option.ocp_en) + pcr->hw_param.interrupt_en |=SD_OC_INT_EN ; + pcr->hw_param.ocp_glitch =SD_OCP_GLITCH_10M ; + pcr->option.sd_800mA_ocp_thd =RTS524A_OCP_THD_800 ; + }static int rts525a_card_power_on (struct rtsx_pcr *pcr,int card)
@@ -737,4 +751,10 @@ void rts525a_init_params(struct rtsx_pcr *pcr) pcr->reg_pm_ctrl3 =RTS524A_PM_CTRL3 ; pcr->ops = &rts525a_pcr_ops; + + pcr->option.ocp_en =1 ; +if (pcr->option.ocp_en) + pcr->hw_param.interrupt_en |=SD_OC_INT_EN ; + pcr->hw_param.ocp_glitch =SD_OCP_GLITCH_10M ; + pcr->option.sd_800mA_ocp_thd =RTS525A_OCP_THD_800 ; }
drivers/misc/cardreader/rts5260.c +49 -87
267 lines not on this page · raw message
drivers/misc/cardreader/rtsx_pcr.c +31 -9
@@ -703,7 +703,10 @@ EXPORT_SYMBOL_GPL(rtsx_pci_card_pull_ctl_disable);static void rtsx_pci_enable_bus_int (struct rtsx_pcr *pcr) { - pcr->bier =TRANS_OK_INT_EN |TRANS_FAIL_INT_EN |SD_INT_EN ; +struct rtsx_hw_param *hw_param = &pcr->hw_param; + + pcr->bier =TRANS_OK_INT_EN |TRANS_FAIL_INT_EN |SD_INT_EN + | hw_param->interrupt_en;if (pcr->num_slots >1 ) pcr->bier |=MS_INT_EN ;
@@ -969,8 +972,19 @@ static void rtsx_pci_card_detect(struct work_struct *work)static void rtsx_pci_process_ocp (struct rtsx_pcr *pcr) { -if (pcr->ops->process_ocp) +if (pcr->ops->process_ocp) { pcr->ops->process_ocp (pcr); + }else { +if (!pcr->option.ocp_en) +return ; +rtsx_pci_get_ocpstat (pcr, &pcr->ocp_stat); +if (pcr->ocp_stat & (SD_OC_NOW |SD_OC_EVER )) { +rtsx_pci_card_power_off (pcr,RTSX_SD_CARD ); +rtsx_pci_write_register (pcr,CARD_OE ,SD_OUTPUT_EN ,0 ); +rtsx_pci_clear_ocpstat (pcr); + pcr->ocp_stat =0 ; + } + } }static int rtsx_pci_process_ocp_interrupt (struct rtsx_pcr *pcr)
@@ -1039,7 +1053,7 @@ static irqreturn_t rtsx_pci_isr(int irq, void *dev_id) } } -if (pcr->card_inserted || pcr->card_removed) +if ((pcr->card_inserted || pcr->card_removed) && !(int_reg &SD_OC_INT ))schedule_delayed_work (&pcr->carddet_work,msecs_to_jiffies (200 ));
@@ -1144,10 +1158,12 @@ void rtsx_pci_enable_ocp(struct rtsx_pcr *pcr) {u8 val =SD_OCP_INT_EN |SD_DETECT_EN ; -if (pcr->ops->enable_ocp) +if (pcr->ops->enable_ocp) { pcr->ops->enable_ocp (pcr); -else + }else { +rtsx_pci_write_register (pcr,FPDCTL ,OC_POWER_DOWN ,0 );rtsx_pci_write_register (pcr,REG_OCPCTL ,0xFF , val); + } }
@@ -1155,10 +1171,13 @@ void rtsx_pci_disable_ocp(struct rtsx_pcr *pcr) {u8 mask =SD_OCP_INT_EN |SD_DETECT_EN ; -if (pcr->ops->disable_ocp) +if (pcr->ops->disable_ocp) { pcr->ops->disable_ocp (pcr); -else + }else {rtsx_pci_write_register (pcr,REG_OCPCTL , mask,0 ); +rtsx_pci_write_register (pcr,FPDCTL ,OC_POWER_DOWN , +OC_POWER_DOWN ); + } }void rtsx_pci_init_ocp (struct rtsx_pcr *pcr)
@@ -1169,7 +1188,7 @@ void rtsx_pci_init_ocp(struct rtsx_pcr *pcr)struct rtsx_cr_option *option = &(pcr->option);if (option->ocp_en) { -u8 val = option->sd_400mA_ocp_thd; +u8 val = option->sd_800mA_ocp_thd;rtsx_pci_write_register (pcr,FPDCTL ,OC_POWER_DOWN ,0 ); rtsx_pci_write_register(pcr, REG_OCPPARA1,
@@ -1204,6 +1223,7 @@ void rtsx_pci_clear_ocpstat(struct rtsx_pcr *pcr)u8 val =SD_OCP_INT_CLR |SD_OC_CLR ;rtsx_pci_write_register (pcr,REG_OCPCTL , mask, val); +udelay (100 );rtsx_pci_write_register (pcr,REG_OCPCTL , mask,0 ); } }
@@ -1213,7 +1233,6 @@ int rtsx_sd_power_off_card3v3(struct rtsx_pcr *pcr)rtsx_pci_write_register (pcr,CARD_CLK_EN ,SD_CLK_EN |MS_CLK_EN |SD40_CLK_EN ,0 );rtsx_pci_write_register (pcr,CARD_OE ,SD_OUTPUT_EN ,0 ); -rtsx_pci_card_power_off (pcr,RTSX_SD_CARD );msleep (50 );
@@ -1313,6 +1332,9 @@ static int rtsx_pci_init_hw(struct rtsx_pcr *pcr)break ; } +/*init ocp*/ +rtsx_pci_init_ocp (pcr); +/* Enable clk_request_n to enable clock power management */ rtsx_pci_write_config_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL +1 ,1 );/* Enter L1 when host tx idle */
drivers/misc/cardreader/rtsx_pcr.h +5 -0
@@ -46,6 +46,11 @@#define SSC_CLOCK_STABLE_WAIT 130 +#define RTS524A_OCP_THD_800 0x04 +#define RTS525A_OCP_THD_800 0x05 +#define RTS522A_OCP_THD_800 0x06 + +int __rtsx_pci_write_phy_register (struct rtsx_pcr *pcr,u8 addr,u16 val);int __rtsx_pci_read_phy_register (struct rtsx_pcr *pcr,u8 addr,u16 *val);
Signature · 1 line
2.17.1