History

mfd: rtsx: Add clock divider hook

Add callback function conv_clk_and_div_n to convert between SSC clock and its divider N. For rtl8411, the formula to calculate SSC clock divider N is different with the other card reader models.

Wei WANG committed 13 years ago

Commit ab4e8f81 parent ef85e736 files · +31 −2Browse files

Unified · Split

6 files
  1. drivers/mfd/rtl8411.c +13 −0
  2. drivers/mfd/rts5209.c +1 −0
  3. drivers/mfd/rts5229.c +1 −0
  4. drivers/mfd/rtsx_pcr.c +12 −2
  5. include/linux/mfd/rtsx_common.h +3 −0
  6. include/linux/mfd/rtsx_pci.h +1 −0
drivers/mfd/rtl8411.c+13−0
@@ -178,6 +178,18 @@ static unsigned int rtl8411_cd_deglitch(struct rtsx_pcr *pcr) · 177 unmodified lines
178 return card_exist;178 return card_exist;
179}179}
180 180
181static int rtl8411_conv_clk_and_div_n(int input, int dir)
182{
183 int output;
184
185 if (dir == CLK_TO_DIV_N)
186 output = input * 4 / 5 - 2;
187 else
188 output = (input + 2) * 5 / 4;
189
190 return output;
191}
192
181static const struct pcr_ops rtl8411_pcr_ops = {193static const struct pcr_ops rtl8411_pcr_ops = {
182 .extra_init_hw = rtl8411_extra_init_hw,194 .extra_init_hw = rtl8411_extra_init_hw,
183 .optimize_phy = NULL,195 .optimize_phy = NULL,
@@ -189,6 +201,7 @@ static const struct pcr_ops rtl8411_pcr_ops = { · 5 unmodified lines
189 .card_power_off = rtl8411_card_power_off,201 .card_power_off = rtl8411_card_power_off,
190 .switch_output_voltage = rtl8411_switch_output_voltage,202 .switch_output_voltage = rtl8411_switch_output_voltage,
191 .cd_deglitch = rtl8411_cd_deglitch,203 .cd_deglitch = rtl8411_cd_deglitch,
204 .conv_clk_and_div_n = rtl8411_conv_clk_and_div_n,
192};205};
193 206
194/* SD Pull Control Enable:207/* SD Pull Control Enable:
drivers/mfd/rts5209.c+1−0
@@ -174,6 +174,7 @@ static const struct pcr_ops rts5209_pcr_ops = { · 173 unmodified lines
174 .card_power_off = rts5209_card_power_off,174 .card_power_off = rts5209_card_power_off,
175 .switch_output_voltage = rts5209_switch_output_voltage,175 .switch_output_voltage = rts5209_switch_output_voltage,
176 .cd_deglitch = NULL,176 .cd_deglitch = NULL,
177 .conv_clk_and_div_n = NULL,
177};178};
178 179
179/* SD Pull Control Enable:180/* SD Pull Control Enable:
drivers/mfd/rts5229.c+1−0
@@ -144,6 +144,7 @@ static const struct pcr_ops rts5229_pcr_ops = { · 143 unmodified lines
144 .card_power_off = rts5229_card_power_off,144 .card_power_off = rts5229_card_power_off,
145 .switch_output_voltage = rts5229_switch_output_voltage,145 .switch_output_voltage = rts5229_switch_output_voltage,
146 .cd_deglitch = NULL,146 .cd_deglitch = NULL,
147 .conv_clk_and_div_n = NULL,
147};148};
148 149
149/* SD Pull Control Enable:150/* SD Pull Control Enable:
drivers/mfd/rtsx_pcr.c+12−2
@@ -630,7 +630,10 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock, · 629 unmodified lines
630 if (clk == pcr->cur_clock)630 if (clk == pcr->cur_clock)
631 return 0;631 return 0;
632 632
633 N = (u8)(clk - 2);633 if (pcr->ops->conv_clk_and_div_n)
634 N = (u8)pcr->ops->conv_clk_and_div_n(clk, CLK_TO_DIV_N);
635 else
636 N = (u8)(clk - 2);
634 if ((clk <= 2) || (N > max_N))637 if ((clk <= 2) || (N > max_N))
635 return -EINVAL;638 return -EINVAL;
636 639
@@ -641,7 +644,14 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock, · 4 unmodified lines
641 /* Make sure that the SSC clock div_n is equal or greater than min_N */644 /* Make sure that the SSC clock div_n is equal or greater than min_N */
642 div = CLK_DIV_1;645 div = CLK_DIV_1;
643 while ((N < min_N) && (div < max_div)) {646 while ((N < min_N) && (div < max_div)) {
644 N = (N + 2) * 2 - 2;647 if (pcr->ops->conv_clk_and_div_n) {
648 int dbl_clk = pcr->ops->conv_clk_and_div_n(N,
649 DIV_N_TO_CLK) * 2;
650 N = (u8)pcr->ops->conv_clk_and_div_n(dbl_clk,
651 CLK_TO_DIV_N);
652 } else {
653 N = (N + 2) * 2 - 2;
654 }
645 div++;655 div++;
646 }656 }
647 dev_dbg(&(pcr->pci->dev), "N = %d, div = %d\n", N, div);657 dev_dbg(&(pcr->pci->dev), "N = %d, div = %d\n", N, div);
include/linux/mfd/rtsx_common.h+3−0
@@ -38,6 +38,9 @@ · 37 unmodified lines
38#define RTSX_SD_CARD 038#define RTSX_SD_CARD 0
39#define RTSX_MS_CARD 139#define RTSX_MS_CARD 1
40 40
41#define CLK_TO_DIV_N 0
42#define DIV_N_TO_CLK 1
43
41struct platform_device;44struct platform_device;
42 45
43struct rtsx_slot {46struct rtsx_slot {
include/linux/mfd/rtsx_pci.h+1−0
@@ -704,6 +704,7 @@ struct pcr_ops { · 703 unmodified lines
704 int (*switch_output_voltage)(struct rtsx_pcr *pcr,704 int (*switch_output_voltage)(struct rtsx_pcr *pcr,
705 u8 voltage);705 u8 voltage);
706 unsigned int (*cd_deglitch)(struct rtsx_pcr *pcr);706 unsigned int (*cd_deglitch)(struct rtsx_pcr *pcr);
707 int (*conv_clk_and_div_n)(int clk, int dir);
707};708};
708 709
709enum PDEV_STAT {PDEV_STAT_IDLE, PDEV_STAT_RUN};710enum PDEV_STAT {PDEV_STAT_IDLE, PDEV_STAT_RUN};