mfd: rtsx: decrease driver size and add new device
v4 cover mfd: rtsx: decrease driver size and add new device
From: Micky Ching <[email protected]>
we add a macro to simplify setting pull control, and use a common init function to init the common params for 8411-like chips. at last we add support for rtl8402 chip.
Micky Ching (2):
mfd: rtsx: add set pull control macro and simplify rtl8411
mfd: rtsx: add support for card reader rtl8402
drivers/mfd/rtl8411.c | 95 ++++++++++++++++++++++++++---------------------- drivers/mfd/rtsx_pcr.c | 5 +++ drivers/mfd/rtsx_pcr.h | 9 +++++ 3 files changed, 66 insertions(+), 43 deletions(-)
--
1.7.9.5
PATCH v4 1/2 mfd: rtsx: add set pull control macro and simplify rtl8411
From: Micky Ching <[email protected]>
add set pull control macro to reduce code for setting pull control, and use a common init function to reduce code for rtl8411.c. So this patch is used to just simplify code.
--- drivers/mfd/rtl8411.c | 53 ++++++++++++------------------------------------ drivers/mfd/rtsx_pcr.h | 8 ++++++++ 2 files changed, 21 insertions(+), 40 deletions(-)
drivers/mfd/rtl8411.c +13 -40
@@ -441,12 +441,10 @@ static const u32 rtl8411b_qfn48_ms_pull_ctl_disable_tbl[] = { 0, }; -void rtl8411_init_params (struct rtsx_pcr *pcr) +void rtl8411_init_common_params (struct rtsx_pcr *pcr) { pcr->extra_caps =EXTRA_CAPS_SD_SDR50 |EXTRA_CAPS_SD_SDR104 ; pcr->num_slots =2 ; - pcr->ops = &rtl8411_pcr_ops; - pcr->flags =0 ; pcr->card_drive_sel =RTL8411_CARD_DRIVE_DEFAULT ; pcr->sd30_drive_sel_1v8 =DRIVER_TYPE_B ;
@@ -454,47 +452,22 @@ void rtl8411_init_params(struct rtsx_pcr *pcr) pcr->aspm_en =ASPM_L1_EN ; 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); - pcr->sd_pull_ctl_enable_tbl = rtl8411_sd_pull_ctl_enable_tbl; - pcr->sd_pull_ctl_disable_tbl = rtl8411_sd_pull_ctl_disable_tbl; - pcr->ms_pull_ctl_enable_tbl = rtl8411_ms_pull_ctl_enable_tbl; - pcr->ms_pull_ctl_disable_tbl = rtl8411_ms_pull_ctl_disable_tbl; +} + +void rtl8411_init_params (struct rtsx_pcr *pcr) +{ +rtl8411_init_common_params (pcr); + pcr->ops = &rtl8411_pcr_ops; +set_pull_ctrl_tables (pcr, rtl8411); }void rtl8411b_init_params (struct rtsx_pcr *pcr) { - pcr->extra_caps =EXTRA_CAPS_SD_SDR50 |EXTRA_CAPS_SD_SDR104 ; - pcr->num_slots =2 ; +rtl8411_init_common_params (pcr); pcr->ops = &rtl8411b_pcr_ops; - - pcr->flags =0 ; - pcr->card_drive_sel =RTL8411_CARD_DRIVE_DEFAULT ; - pcr->sd30_drive_sel_1v8 =DRIVER_TYPE_B ; - pcr->sd30_drive_sel_3v3 =DRIVER_TYPE_D ; - pcr->aspm_en =ASPM_L1_EN ; - 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); - -if (rtl8411b_is_qfn48 (pcr)) { - pcr->sd_pull_ctl_enable_tbl = - rtl8411b_qfn48_sd_pull_ctl_enable_tbl; - pcr->sd_pull_ctl_disable_tbl = - rtl8411b_qfn48_sd_pull_ctl_disable_tbl; - pcr->ms_pull_ctl_enable_tbl = - rtl8411b_qfn48_ms_pull_ctl_enable_tbl; - pcr->ms_pull_ctl_disable_tbl = - rtl8411b_qfn48_ms_pull_ctl_disable_tbl; - }else { - pcr->sd_pull_ctl_enable_tbl = - rtl8411b_qfn64_sd_pull_ctl_enable_tbl; - pcr->sd_pull_ctl_disable_tbl = - rtl8411b_qfn64_sd_pull_ctl_disable_tbl; - pcr->ms_pull_ctl_enable_tbl = - rtl8411b_qfn64_ms_pull_ctl_enable_tbl; - pcr->ms_pull_ctl_disable_tbl = - rtl8411b_qfn64_ms_pull_ctl_disable_tbl; - } +if (rtl8411b_is_qfn48 (pcr)) +set_pull_ctrl_tables (pcr, rtl8411b_qfn48); +else +set_pull_ctrl_tables (pcr, rtl8411b_qfn64); }
drivers/mfd/rtsx_pcr.h +8 -0
@@ -63,4 +63,12 @@ static inline u8 map_sd_drive(int idx)#define rtl8411_reg_to_sd30_drive_sel_3v3 (reg) (((reg) >> 5) & 0x07)#define rtl8411b_reg_to_sd30_drive_sel_3v3 (reg) ((reg) & 0x03) +#define set_pull_ctrl_tables (pcr, __device) \ +do { \ + pcr->sd_pull_ctl_enable_tbl = __device##_sd_pull_ctl_enable_tbl; \ + pcr->sd_pull_ctl_disable_tbl = __device##_sd_pull_ctl_disable_tbl; \ + pcr->ms_pull_ctl_enable_tbl = __device##_ms_pull_ctl_enable_tbl; \ + pcr->ms_pull_ctl_disable_tbl = __device##_ms_pull_ctl_disable_tbl; \ +} while (0) +#endif
Signature · 1 line
1.7.9.5
PATCH v4 2/2 mfd: rtsx: add support for card reader rtl8402
In reply to [email protected]From: Micky Ching <[email protected]>
rtl8402 is much like rtl8411, so just add it to rtl8411.c
--- drivers/mfd/rtl8411.c | 44 ++++++++++++++++++++++++++++++++++++++++---- drivers/mfd/rtsx_pcr.c | 5 +++++ drivers/mfd/rtsx_pcr.h | 1 + 3 files changed, 46 insertions(+), 4 deletions(-)
drivers/mfd/rtl8411.c +40 -4
@@ -191,24 +191,25 @@ static int rtl8411_card_power_off(struct rtsx_pcr *pcr, int card) BPP_LDO_POWB, BPP_LDO_SUSPEND); } -static int rtl8411_switch_output_voltage (struct rtsx_pcr *pcr,u8 voltage) +static int rtl8411_do_switch_output_voltage (struct rtsx_pcr *pcr,u8 voltage, +int bpp_tuned18_shift,int bpp_asic_1v8) {u8 mask, val;int err; - mask = (BPP_REG_TUNED18 <<BPP_TUNED18_SHIFT_8411 ) |BPP_PAD_MASK ; + mask = (BPP_REG_TUNED18 << bpp_tuned18_shift) |BPP_PAD_MASK ;if (voltage ==OUTPUT_3V3 ) { err =rtsx_pci_write_register (pcr,SD30_DRIVE_SEL ,0x07 , pcr->sd30_drive_sel_3v3);if (err <0 )return err; - val = (BPP_ASIC_3V3 <<BPP_TUNED18_SHIFT_8411 ) |BPP_PAD_3V3 ; + val = (BPP_ASIC_3V3 << bpp_tuned18_shift) |BPP_PAD_3V3 ; }else if (voltage ==OUTPUT_1V8 ) { err =rtsx_pci_write_register (pcr,SD30_DRIVE_SEL ,0x07 , pcr->sd30_drive_sel_1v8);if (err <0 )return err; - val = (BPP_ASIC_1V8 <<BPP_TUNED18_SHIFT_8411 ) |BPP_PAD_1V8 ; + val = (bpp_asic_1v8 << bpp_tuned18_shift) |BPP_PAD_1V8 ; }else {return -EINVAL ; }
@@ -216,6 +217,18 @@ static int rtl8411_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)return rtsx_pci_write_register (pcr,LDO_CTL , mask, val); } +static int rtl8411_switch_output_voltage (struct rtsx_pcr *pcr,u8 voltage) +{ +return rtl8411_do_switch_output_voltage (pcr, voltage, +BPP_TUNED18_SHIFT_8411 ,BPP_ASIC_1V8 ); +} + +static int rtl8402_switch_output_voltage (struct rtsx_pcr *pcr,u8 voltage) +{ +return rtl8411_do_switch_output_voltage (pcr, voltage, +BPP_TUNED18_SHIFT_8402 ,BPP_ASIC_2V0 ); +} +static unsigned int rtl8411_cd_deglitch (struct rtsx_pcr *pcr) {unsigned int card_exist;
@@ -295,6 +308,22 @@ static const struct pcr_ops rtl8411_pcr_ops = { .force_power_down = rtl8411_force_power_down, }; +static const struct pcr_ops rtl8402_pcr_ops = { + .fetch_vendor_settings = rtl8411_fetch_vendor_settings, + .extra_init_hw = rtl8411_extra_init_hw, + .optimize_phy =NULL , + .turn_on_led = rtl8411_turn_on_led, + .turn_off_led = rtl8411_turn_off_led, + .enable_auto_blink = rtl8411_enable_auto_blink, + .disable_auto_blink = rtl8411_disable_auto_blink, + .card_power_on = rtl8411_card_power_on, + .card_power_off = rtl8411_card_power_off, + .switch_output_voltage = rtl8402_switch_output_voltage, + .cd_deglitch = rtl8411_cd_deglitch, + .conv_clk_and_div_n = rtl8411_conv_clk_and_div_n, + .force_power_down = rtl8411_force_power_down, +}; +static const struct pcr_ops rtl8411b_pcr_ops = { .fetch_vendor_settings = rtl8411b_fetch_vendor_settings, .extra_init_hw = rtl8411b_extra_init_hw,
@@ -471,3 +500,10 @@ void rtl8411b_init_params(struct rtsx_pcr *pcr)else set_pull_ctrl_tables (pcr, rtl8411b_qfn64); } + +void rtl8402_init_params (struct rtsx_pcr *pcr) +{ +rtl8411_init_common_params (pcr); + pcr->ops = &rtl8402_pcr_ops; +set_pull_ctrl_tables (pcr, rtl8411); +}
drivers/mfd/rtsx_pcr.c +5 -0
@@ -57,6 +57,7 @@ static DEFINE_PCI_DEVICE_TABLE(rtsx_pci_ids) = { { PCI_DEVICE(0x10EC, 0x5227), PCI_CLASS_OTHERS << 16, 0xFF0000 }, { PCI_DEVICE(0x10EC, 0x5249), PCI_CLASS_OTHERS << 16, 0xFF0000 }, { PCI_DEVICE(0x10EC, 0x5287), PCI_CLASS_OTHERS << 16, 0xFF0000 }, + { PCI_DEVICE(0x10EC, 0x5286), PCI_CLASS_OTHERS << 16, 0xFF0000 }, { 0, } };
@@ -1061,6 +1062,10 @@ static int rtsx_pci_init_chip(struct rtsx_pcr *pcr)case 0x5287 :rtl8411b_init_params (pcr);break ; + +case 0x5286 : +rtl8402_init_params (pcr); +break ; } dev_dbg(&(pcr->pci->dev), "PID: 0x%04x, IC version: 0x%02x\n",
drivers/mfd/rtsx_pcr.h +1 -0
@@ -30,6 +30,7 @@void rts5209_init_params (struct rtsx_pcr *pcr);void rts5229_init_params (struct rtsx_pcr *pcr);void rtl8411_init_params (struct rtsx_pcr *pcr); +void rtl8402_init_params (struct rtsx_pcr *pcr);void rts5227_init_params (struct rtsx_pcr *pcr);void rts5249_init_params (struct rtsx_pcr *pcr);void rtl8411b_init_params (struct rtsx_pcr *pcr);
Signature · 1 line
1.7.9.5
Quoted 6 lines · On Wed, Dec 18, 2013 at 10:03:11AM +0800, [email protected] wrote:
From: Micky Ching <[email protected]>
we add a macro to simplify setting pull control, and use a common init function to init the common params for 8411-like chips. at last we add support for rtl8402 chip.
Quoted 9 lines
Micky Ching (2):
mfd: rtsx: add set pull control macro and simplify rtl8411
mfd: rtsx: add support for card reader rtl8402drivers/mfd/rtl8411.c | 95 ++++++++++++++++++++++++++---------------------- drivers/mfd/rtsx_pcr.c | 5 +++ drivers/mfd/rtsx_pcr.h | 9 +++++ 3 files changed, 66 insertions(+), 43 deletions(-)
Great. Looks good to me.
regards,
dan carpenter
Quoted 6 lines · On Wed, 18 Dec 2013, [email protected] wrote:
From: Micky Ching <[email protected]>
we add a macro to simplify setting pull control, and use a common init function to init the common params for 8411-like chips. at last we add support for rtl8402 chip.
Quoted 8 lines
Micky Ching (2):
mfd: rtsx: add set pull control macro and simplify rtl8411
mfd: rtsx: add support for card reader rtl8402drivers/mfd/rtl8411.c | 95 ++++++++++++++++++++++++++---------------------- drivers/mfd/rtsx_pcr.c | 5 +++ drivers/mfd/rtsx_pcr.h | 9 +++++ 3 files changed, 66 insertions(+), 43 deletions(-)
Nice.
Applied with Dan's Reviewed-by.
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog