linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] MX2: Fix mx2_camera clock regression.
@ 2012-03-21 15:19 Javier Martin
  2012-04-02  9:11 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Javier Martin @ 2012-03-21 15:19 UTC (permalink / raw)
  To: linux-arm-kernel

The following patch breaks mx2_camera driver:
http://git.linuxtv.org/media_tree.git?a=commitdiff;h=52f1a845e25dc0c6435153aca1a170e20b282429

This change fixes the problem.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
---
 arch/arm/mach-imx/clock-imx27.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-imx/clock-imx27.c b/arch/arm/mach-imx/clock-imx27.c
index b9a95ed..98e04f5 100644
--- a/arch/arm/mach-imx/clock-imx27.c
+++ b/arch/arm/mach-imx/clock-imx27.c
@@ -662,6 +662,7 @@ static struct clk_lookup lookups[] = {
 	_REGISTER_CLOCK(NULL, "dma", dma_clk)
 	_REGISTER_CLOCK(NULL, "rtic", rtic_clk)
 	_REGISTER_CLOCK(NULL, "brom", brom_clk)
+	_REGISTER_CLOCK(NULL, "emma", emma_clk)
 	_REGISTER_CLOCK("m2m-emmaprp.0", NULL, emma_clk)
 	_REGISTER_CLOCK(NULL, "slcdc", slcdc_clk)
 	_REGISTER_CLOCK("imx27-fec.0", NULL, fec_clk)
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [PATCH] MX2: Fix mx2_camera clock regression.
  2012-03-21 15:19 [PATCH] MX2: Fix mx2_camera clock regression Javier Martin
@ 2012-04-02  9:11 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2012-04-02  9:11 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Mar 21, 2012 at 04:19:41PM +0100, Javier Martin wrote:
> The following patch breaks mx2_camera driver:
> http://git.linuxtv.org/media_tree.git?a=commitdiff;h=52f1a845e25dc0c6435153aca1a170e20b282429
> 
> This change fixes the problem.
> 
> Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>

Applied, thanks

Sascha

> ---
>  arch/arm/mach-imx/clock-imx27.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/clock-imx27.c b/arch/arm/mach-imx/clock-imx27.c
> index b9a95ed..98e04f5 100644
> --- a/arch/arm/mach-imx/clock-imx27.c
> +++ b/arch/arm/mach-imx/clock-imx27.c
> @@ -662,6 +662,7 @@ static struct clk_lookup lookups[] = {
>  	_REGISTER_CLOCK(NULL, "dma", dma_clk)
>  	_REGISTER_CLOCK(NULL, "rtic", rtic_clk)
>  	_REGISTER_CLOCK(NULL, "brom", brom_clk)
> +	_REGISTER_CLOCK(NULL, "emma", emma_clk)
>  	_REGISTER_CLOCK("m2m-emmaprp.0", NULL, emma_clk)
>  	_REGISTER_CLOCK(NULL, "slcdc", slcdc_clk)
>  	_REGISTER_CLOCK("imx27-fec.0", NULL, fec_clk)
> -- 
> 1.7.0.4
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-04-02  9:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-21 15:19 [PATCH] MX2: Fix mx2_camera clock regression Javier Martin
2012-04-02  9:11 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).