Patchwork [Quantal,1/4] mfd: rtsx: Add clock divider hook

login
register
mail settings
Submitter Adam Lee
Date March 14, 2013, 6:08 a.m.
Message ID <1363241342-13907-1-git-send-email-adam.lee@canonical.com>
Download mbox | patch
Permalink /patch/227438/
State New
Headers show

Comments

Adam Lee - March 14, 2013, 6:08 a.m.
From: Wei WANG <wei_wang@realsil.com.cn>

BugLink: https://launchpad.net/bugs/1153618

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.

Signed-off-by: Wei WANG <wei_wang@realsil.com.cn>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
(cherry picked from commit ab4e8f8b7bdfeff0c961fdbbdacb262d68f094c0)
Signed-off-by: Adam Lee <adam.lee@canonical.com>
---
 drivers/mfd/rtl8411.c  |   13 +++++++++++++
 drivers/mfd/rts5209.c  |    1 +
 drivers/mfd/rts5229.c  |    1 +
 drivers/mfd/rtsx_pcr.c |   14 ++++++++++++--
 4 files changed, 27 insertions(+), 2 deletions(-)
Tim Gardner - March 14, 2013, 12:25 p.m.
Mostly isolated to the new device.
Luis Henriques - March 14, 2013, 12:50 p.m.
On Thu, Mar 14, 2013 at 02:08:59PM +0800, Adam Lee wrote:
> From: Wei WANG <wei_wang@realsil.com.cn>
> 
> BugLink: https://launchpad.net/bugs/1153618
> 
> 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.
> 
> Signed-off-by: Wei WANG <wei_wang@realsil.com.cn>
> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
> (cherry picked from commit ab4e8f8b7bdfeff0c961fdbbdacb262d68f094c0)
> Signed-off-by: Adam Lee <adam.lee@canonical.com>
> ---
>  drivers/mfd/rtl8411.c  |   13 +++++++++++++
>  drivers/mfd/rts5209.c  |    1 +
>  drivers/mfd/rts5229.c  |    1 +
>  drivers/mfd/rtsx_pcr.c |   14 ++++++++++++--
>  4 files changed, 27 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mfd/rtl8411.c b/drivers/mfd/rtl8411.c
> index 5058ba8..3d3b4ad 100644
> --- a/drivers/mfd/rtl8411.c
> +++ b/drivers/mfd/rtl8411.c
> @@ -178,6 +178,18 @@ static unsigned int rtl8411_cd_deglitch(struct rtsx_pcr *pcr)
>  	return card_exist;
>  }
>  
> +static int rtl8411_conv_clk_and_div_n(int input, int dir)
> +{
> +	int output;
> +
> +	if (dir == CLK_TO_DIV_N)
> +		output = input * 4 / 5 - 2;
> +	else
> +		output = (input + 2) * 5 / 4;
> +
> +	return output;
> +}
> +
>  static const struct pcr_ops rtl8411_pcr_ops = {
>  	.extra_init_hw = rtl8411_extra_init_hw,
>  	.optimize_phy = NULL,
> @@ -189,6 +201,7 @@ static const struct pcr_ops rtl8411_pcr_ops = {
>  	.card_power_off = rtl8411_card_power_off,
>  	.switch_output_voltage = rtl8411_switch_output_voltage,
>  	.cd_deglitch = rtl8411_cd_deglitch,
> +	.conv_clk_and_div_n = rtl8411_conv_clk_and_div_n,
>  };
>  
>  /* SD Pull Control Enable:
> diff --git a/drivers/mfd/rts5209.c b/drivers/mfd/rts5209.c
> index ba74de8..98fe0f3 100644
> --- a/drivers/mfd/rts5209.c
> +++ b/drivers/mfd/rts5209.c
> @@ -174,6 +174,7 @@ static const struct pcr_ops rts5209_pcr_ops = {
>  	.card_power_off = rts5209_card_power_off,
>  	.switch_output_voltage = rts5209_switch_output_voltage,
>  	.cd_deglitch = NULL,
> +	.conv_clk_and_div_n = NULL,
>  };
>  
>  /* SD Pull Control Enable:
> diff --git a/drivers/mfd/rts5229.c b/drivers/mfd/rts5229.c
> index ec1747a..29d889c 100644
> --- a/drivers/mfd/rts5229.c
> +++ b/drivers/mfd/rts5229.c
> @@ -144,6 +144,7 @@ static const struct pcr_ops rts5229_pcr_ops = {
>  	.card_power_off = rts5229_card_power_off,
>  	.switch_output_voltage = rts5229_switch_output_voltage,
>  	.cd_deglitch = NULL,
> +	.conv_clk_and_div_n = NULL,
>  };
>  
>  /* SD Pull Control Enable:
> diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c
> index bab8298..e0aa415 100644
> --- a/drivers/mfd/rtsx_pcr.c
> +++ b/drivers/mfd/rtsx_pcr.c
> @@ -630,7 +630,10 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock,
>  	if (clk == pcr->cur_clock)
>  		return 0;
>  
> -	N = (u8)(clk - 2);
> +	if (pcr->ops->conv_clk_and_div_n)
> +		N = (u8)pcr->ops->conv_clk_and_div_n(clk, CLK_TO_DIV_N);
> +	else
> +		N = (u8)(clk - 2);
>  	if ((clk <= 2) || (N > max_N))
>  		return -EINVAL;
>  
> @@ -641,7 +644,14 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock,
>  	/* Make sure that the SSC clock div_n is equal or greater than min_N */
>  	div = CLK_DIV_1;
>  	while ((N < min_N) && (div < max_div)) {
> -		N = (N + 2) * 2 - 2;
> +		if (pcr->ops->conv_clk_and_div_n) {
> +			int dbl_clk = pcr->ops->conv_clk_and_div_n(N,
> +					DIV_N_TO_CLK) * 2;
> +			N = (u8)pcr->ops->conv_clk_and_div_n(dbl_clk,
> +					CLK_TO_DIV_N);
> +		} else {
> +			N = (N + 2) * 2 - 2;
> +		}
>  		div++;
>  	}
>  	dev_dbg(&(pcr->pci->dev), "N = %d, div = %d\n", N, div);
> -- 
> 1.7.9.5
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

Three clean cherry-picks and a backport that looks correct to me.

Cheers,
--
Luis
Luis Henriques - March 14, 2013, 12:54 p.m.
doh!  I missed the 'ACK'!

Cheers,
--
Luis

On Thu, Mar 14, 2013 at 12:50:56PM +0000, Luis Henriques wrote:
> On Thu, Mar 14, 2013 at 02:08:59PM +0800, Adam Lee wrote:
> > From: Wei WANG <wei_wang@realsil.com.cn>
> > 
> > BugLink: https://launchpad.net/bugs/1153618
> > 
> > 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.
> > 
> > Signed-off-by: Wei WANG <wei_wang@realsil.com.cn>
> > Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
> > (cherry picked from commit ab4e8f8b7bdfeff0c961fdbbdacb262d68f094c0)
> > Signed-off-by: Adam Lee <adam.lee@canonical.com>
> > ---
> >  drivers/mfd/rtl8411.c  |   13 +++++++++++++
> >  drivers/mfd/rts5209.c  |    1 +
> >  drivers/mfd/rts5229.c  |    1 +
> >  drivers/mfd/rtsx_pcr.c |   14 ++++++++++++--
> >  4 files changed, 27 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/mfd/rtl8411.c b/drivers/mfd/rtl8411.c
> > index 5058ba8..3d3b4ad 100644
> > --- a/drivers/mfd/rtl8411.c
> > +++ b/drivers/mfd/rtl8411.c
> > @@ -178,6 +178,18 @@ static unsigned int rtl8411_cd_deglitch(struct rtsx_pcr *pcr)
> >  	return card_exist;
> >  }
> >  
> > +static int rtl8411_conv_clk_and_div_n(int input, int dir)
> > +{
> > +	int output;
> > +
> > +	if (dir == CLK_TO_DIV_N)
> > +		output = input * 4 / 5 - 2;
> > +	else
> > +		output = (input + 2) * 5 / 4;
> > +
> > +	return output;
> > +}
> > +
> >  static const struct pcr_ops rtl8411_pcr_ops = {
> >  	.extra_init_hw = rtl8411_extra_init_hw,
> >  	.optimize_phy = NULL,
> > @@ -189,6 +201,7 @@ static const struct pcr_ops rtl8411_pcr_ops = {
> >  	.card_power_off = rtl8411_card_power_off,
> >  	.switch_output_voltage = rtl8411_switch_output_voltage,
> >  	.cd_deglitch = rtl8411_cd_deglitch,
> > +	.conv_clk_and_div_n = rtl8411_conv_clk_and_div_n,
> >  };
> >  
> >  /* SD Pull Control Enable:
> > diff --git a/drivers/mfd/rts5209.c b/drivers/mfd/rts5209.c
> > index ba74de8..98fe0f3 100644
> > --- a/drivers/mfd/rts5209.c
> > +++ b/drivers/mfd/rts5209.c
> > @@ -174,6 +174,7 @@ static const struct pcr_ops rts5209_pcr_ops = {
> >  	.card_power_off = rts5209_card_power_off,
> >  	.switch_output_voltage = rts5209_switch_output_voltage,
> >  	.cd_deglitch = NULL,
> > +	.conv_clk_and_div_n = NULL,
> >  };
> >  
> >  /* SD Pull Control Enable:
> > diff --git a/drivers/mfd/rts5229.c b/drivers/mfd/rts5229.c
> > index ec1747a..29d889c 100644
> > --- a/drivers/mfd/rts5229.c
> > +++ b/drivers/mfd/rts5229.c
> > @@ -144,6 +144,7 @@ static const struct pcr_ops rts5229_pcr_ops = {
> >  	.card_power_off = rts5229_card_power_off,
> >  	.switch_output_voltage = rts5229_switch_output_voltage,
> >  	.cd_deglitch = NULL,
> > +	.conv_clk_and_div_n = NULL,
> >  };
> >  
> >  /* SD Pull Control Enable:
> > diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c
> > index bab8298..e0aa415 100644
> > --- a/drivers/mfd/rtsx_pcr.c
> > +++ b/drivers/mfd/rtsx_pcr.c
> > @@ -630,7 +630,10 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock,
> >  	if (clk == pcr->cur_clock)
> >  		return 0;
> >  
> > -	N = (u8)(clk - 2);
> > +	if (pcr->ops->conv_clk_and_div_n)
> > +		N = (u8)pcr->ops->conv_clk_and_div_n(clk, CLK_TO_DIV_N);
> > +	else
> > +		N = (u8)(clk - 2);
> >  	if ((clk <= 2) || (N > max_N))
> >  		return -EINVAL;
> >  
> > @@ -641,7 +644,14 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock,
> >  	/* Make sure that the SSC clock div_n is equal or greater than min_N */
> >  	div = CLK_DIV_1;
> >  	while ((N < min_N) && (div < max_div)) {
> > -		N = (N + 2) * 2 - 2;
> > +		if (pcr->ops->conv_clk_and_div_n) {
> > +			int dbl_clk = pcr->ops->conv_clk_and_div_n(N,
> > +					DIV_N_TO_CLK) * 2;
> > +			N = (u8)pcr->ops->conv_clk_and_div_n(dbl_clk,
> > +					CLK_TO_DIV_N);
> > +		} else {
> > +			N = (N + 2) * 2 - 2;
> > +		}
> >  		div++;
> >  	}
> >  	dev_dbg(&(pcr->pci->dev), "N = %d, div = %d\n", N, div);
> > -- 
> > 1.7.9.5
> > 
> > 
> > -- 
> > kernel-team mailing list
> > kernel-team@lists.ubuntu.com
> > https://lists.ubuntu.com/mailman/listinfo/kernel-team
> 
> Three clean cherry-picks and a backport that looks correct to me.
> 
> Cheers,
> --
> Luis
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Tim Gardner - March 14, 2013, 2:25 p.m.
I did the backport slightly different in order to preserve context in
case there are ever stable updates to this file.

rtg

Patch

diff --git a/drivers/mfd/rtl8411.c b/drivers/mfd/rtl8411.c
index 5058ba8..3d3b4ad 100644
--- a/drivers/mfd/rtl8411.c
+++ b/drivers/mfd/rtl8411.c
@@ -178,6 +178,18 @@  static unsigned int rtl8411_cd_deglitch(struct rtsx_pcr *pcr)
 	return card_exist;
 }
 
+static int rtl8411_conv_clk_and_div_n(int input, int dir)
+{
+	int output;
+
+	if (dir == CLK_TO_DIV_N)
+		output = input * 4 / 5 - 2;
+	else
+		output = (input + 2) * 5 / 4;
+
+	return output;
+}
+
 static const struct pcr_ops rtl8411_pcr_ops = {
 	.extra_init_hw = rtl8411_extra_init_hw,
 	.optimize_phy = NULL,
@@ -189,6 +201,7 @@  static const struct pcr_ops rtl8411_pcr_ops = {
 	.card_power_off = rtl8411_card_power_off,
 	.switch_output_voltage = rtl8411_switch_output_voltage,
 	.cd_deglitch = rtl8411_cd_deglitch,
+	.conv_clk_and_div_n = rtl8411_conv_clk_and_div_n,
 };
 
 /* SD Pull Control Enable:
diff --git a/drivers/mfd/rts5209.c b/drivers/mfd/rts5209.c
index ba74de8..98fe0f3 100644
--- a/drivers/mfd/rts5209.c
+++ b/drivers/mfd/rts5209.c
@@ -174,6 +174,7 @@  static const struct pcr_ops rts5209_pcr_ops = {
 	.card_power_off = rts5209_card_power_off,
 	.switch_output_voltage = rts5209_switch_output_voltage,
 	.cd_deglitch = NULL,
+	.conv_clk_and_div_n = NULL,
 };
 
 /* SD Pull Control Enable:
diff --git a/drivers/mfd/rts5229.c b/drivers/mfd/rts5229.c
index ec1747a..29d889c 100644
--- a/drivers/mfd/rts5229.c
+++ b/drivers/mfd/rts5229.c
@@ -144,6 +144,7 @@  static const struct pcr_ops rts5229_pcr_ops = {
 	.card_power_off = rts5229_card_power_off,
 	.switch_output_voltage = rts5229_switch_output_voltage,
 	.cd_deglitch = NULL,
+	.conv_clk_and_div_n = NULL,
 };
 
 /* SD Pull Control Enable:
diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c
index bab8298..e0aa415 100644
--- a/drivers/mfd/rtsx_pcr.c
+++ b/drivers/mfd/rtsx_pcr.c
@@ -630,7 +630,10 @@  int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock,
 	if (clk == pcr->cur_clock)
 		return 0;
 
-	N = (u8)(clk - 2);
+	if (pcr->ops->conv_clk_and_div_n)
+		N = (u8)pcr->ops->conv_clk_and_div_n(clk, CLK_TO_DIV_N);
+	else
+		N = (u8)(clk - 2);
 	if ((clk <= 2) || (N > max_N))
 		return -EINVAL;
 
@@ -641,7 +644,14 @@  int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock,
 	/* Make sure that the SSC clock div_n is equal or greater than min_N */
 	div = CLK_DIV_1;
 	while ((N < min_N) && (div < max_div)) {
-		N = (N + 2) * 2 - 2;
+		if (pcr->ops->conv_clk_and_div_n) {
+			int dbl_clk = pcr->ops->conv_clk_and_div_n(N,
+					DIV_N_TO_CLK) * 2;
+			N = (u8)pcr->ops->conv_clk_and_div_n(dbl_clk,
+					CLK_TO_DIV_N);
+		} else {
+			N = (N + 2) * 2 - 2;
+		}
 		div++;
 	}
 	dev_dbg(&(pcr->pci->dev), "N = %d, div = %d\n", N, div);