[PATCH 1/2] spi: sirf: use clk_prepare_enable and clk_disable_unprepare

[PATCH 1/2] spi: sirf: use clk_prepare_enable and clk_disable_unprepare

[Barry Song]

From: Barry Song <Baohua.Song@csr.com>

Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
calls as required by common clock framework.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
---
 drivers/spi/spi-sirf.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index e0f43a5..38a191c 100644
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -570,7 +570,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
 		ret = -EINVAL;
 		goto free_pin;
 	}
-	clk_enable(sspi->clk);
+	clk_prepare_enable(sspi->clk);
 	sspi->ctrl_freq = clk_get_rate(sspi->clk);
 
 	init_completion(&sspi->done);
@@ -594,7 +594,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
 	return 0;
 
 free_clk:
-	clk_disable(sspi->clk);
+	clk_disable_unprepare(sspi->clk);
 	clk_put(sspi->clk);
 free_pin:
 	pinctrl_put(sspi->p);
@@ -618,7 +618,7 @@ static int  spi_sirfsoc_remove(struct platform_device *pdev)
 		if (sspi->chipselect[i] > 0)
 			gpio_free(sspi->chipselect[i]);
 	}
-	clk_disable(sspi->clk);
+	clk_disable_unprepare(sspi->clk);
 	clk_put(sspi->clk);
 	pinctrl_put(sspi->p);
 	spi_master_put(master);
-- 
1.7.5.4



Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog

[PATCH 2/2] spi: sirf: add support for new SiRFmarco SMP SoC

[Barry Song]

From: Barry Song <Baohua.Song@csr.com>

the driver is also compatible with SiRFmarco except SiRFprimaII,
so simply add "sirf,marco-spi" to OF match table.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
---
 drivers/spi/spi-sirf.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index 38a191c..09ca0e3 100644
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -659,6 +659,7 @@ static const struct dev_pm_ops spi_sirfsoc_pm_ops = {
 
 static const struct of_device_id spi_sirfsoc_of_match[] = {
 	{ .compatible = "sirf,prima2-spi", },
+	{ .compatible = "sirf,marco-spi", },
 	{}
 };
 MODULE_DEVICE_TABLE(of, sirfsoc_spi_of_match);
-- 
1.7.5.4



Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog

Re: [PATCH 2/2] spi: sirf: add support for new SiRFmarco SMP SoC

[Sergei Shtylyov]

Hello.

On 26-12-2012 6:48, Barry Song wrote:

> From: Barry Song <Baohua.Song@csr.com>

> the driver is also compatible with SiRFmarco except SiRFprimaII,
> so simply add "sirf,marco-spi" to OF match table.

> Signed-off-by: Barry Song <Baohua.Song@csr.com>

    You've just posted this patch as a part of another 2-patch series.

WBR, Sergei

Re: [PATCH 2/2] spi: sirf: add support for new SiRFmarco SMP SoC

[Barry Song]

2012/12/26, Sergei Shtylyov <sshtylyov-Igf4POYTYCDQT0dZR+AlfA@public.gmane.org>:
> Hello.
>
> On 26-12-2012 6:48, Barry Song wrote:
>
>> From: Barry Song <Baohua.Song-kQvG35nSl+M@public.gmane.org>
>
>> the driver is also compatible with SiRFmarco except SiRFprimaII,
>> so simply add "sirf,marco-spi" to OF match table.
>
>> Signed-off-by: Barry Song <Baohua.Song-kQvG35nSl+M@public.gmane.org>
>
>     You've just posted this patch as a part of another 2-patch series.

no, this one is spi, the other one is i2c.

> WBR, Sergei

-barry

------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d

Re: [PATCH 2/2] spi: sirf: add support for new SiRFmarco SMP SoC

[Sergei Shtylyov]

Hello.

On 12/26/2012 03:32 PM, Barry Song wrote:

>>> From: Barry Song <Baohua.Song-kQvG35nSl+M@public.gmane.org>

>>> the driver is also compatible with SiRFmarco except SiRFprimaII,
>>> so simply add "sirf,marco-spi" to OF match table.

>>> Signed-off-by: Barry Song <Baohua.Song-kQvG35nSl+M@public.gmane.org>

>>     You've just posted this patch as a part of another 2-patch series.

> no, this one is spi, the other one is i2c.

   Sorry for the noise -- I was being blind (and goggles didn't help :-).

> -barry

WBR, Sergei


------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d

Re: [PATCH 1/2] spi: sirf: use clk_prepare_enable and clk_disable_unprepare

[Grant Likely]

On Wed, 26 Dec 2012 10:48:33 +0800, Barry Song <Barry.Song-kQvG35nSl+M@public.gmane.org> wrote:
> From: Barry Song <Baohua.Song-kQvG35nSl+M@public.gmane.org>
> 
> Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
> calls as required by common clock framework.
> 
> Signed-off-by: Barry Song <Baohua.Song-kQvG35nSl+M@public.gmane.org>

Applied, thanks.

g.

> ---
>  drivers/spi/spi-sirf.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
> index e0f43a5..38a191c 100644
> --- a/drivers/spi/spi-sirf.c
> +++ b/drivers/spi/spi-sirf.c
> @@ -570,7 +570,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
>  		ret = -EINVAL;
>  		goto free_pin;
>  	}
> -	clk_enable(sspi->clk);
> +	clk_prepare_enable(sspi->clk);
>  	sspi->ctrl_freq = clk_get_rate(sspi->clk);
>  
>  	init_completion(&sspi->done);
> @@ -594,7 +594,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
>  	return 0;
>  
>  free_clk:
> -	clk_disable(sspi->clk);
> +	clk_disable_unprepare(sspi->clk);
>  	clk_put(sspi->clk);
>  free_pin:
>  	pinctrl_put(sspi->p);
> @@ -618,7 +618,7 @@ static int  spi_sirfsoc_remove(struct platform_device *pdev)
>  		if (sspi->chipselect[i] > 0)
>  			gpio_free(sspi->chipselect[i]);
>  	}
> -	clk_disable(sspi->clk);
> +	clk_disable_unprepare(sspi->clk);
>  	clk_put(sspi->clk);
>  	pinctrl_put(sspi->p);
>  	spi_master_put(master);
> -- 
> 1.7.5.4
> 
> 
> 
> Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
> More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.

------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013 
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb

Re: [PATCH 2/2] spi: sirf: add support for new SiRFmarco SMP SoC

[Grant Likely]

On Wed, 26 Dec 2012 10:48:34 +0800, Barry Song <Barry.Song-kQvG35nSl+M@public.gmane.org> wrote:
> From: Barry Song <Baohua.Song-kQvG35nSl+M@public.gmane.org>
> 
> the driver is also compatible with SiRFmarco except SiRFprimaII,
> so simply add "sirf,marco-spi" to OF match table.
> 
> Signed-off-by: Barry Song <Baohua.Song-kQvG35nSl+M@public.gmane.org>

Applied, thanks.

g.

> ---
>  drivers/spi/spi-sirf.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
> index 38a191c..09ca0e3 100644
> --- a/drivers/spi/spi-sirf.c
> +++ b/drivers/spi/spi-sirf.c
> @@ -659,6 +659,7 @@ static const struct dev_pm_ops spi_sirfsoc_pm_ops = {
>  
>  static const struct of_device_id spi_sirfsoc_of_match[] = {
>  	{ .compatible = "sirf,prima2-spi", },
> +	{ .compatible = "sirf,marco-spi", },
>  	{}
>  };
>  MODULE_DEVICE_TABLE(of, sirfsoc_spi_of_match);
> -- 
> 1.7.5.4
> 
> 
> 
> Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
> More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.

------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013 
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb