[PATCH 1/4 v2] omap: hwspinlock: uncomment the hwmod part for hwspinlock

[PATCH 1/4 v2] omap: hwspinlock: uncomment the hwmod part for hwspinlock

[Que, Simon]

[-- Attachment #1: Type: text/plain, Size: 858 bytes --]

uncomment the hwmod part for hwspinlock

Signed-off-by: Simon Que <sque@ti.com>
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_44xx_data.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index bb0c870..81e3f3f 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -5797,7 +5797,7 @@ static __initdata struct omap_hwmod *omap44xx_hwmods[] = {
 /*     &omap44xx_smartreflex_iva_hwmod, */
 /*     &omap44xx_smartreflex_mpu_hwmod, */
        /* spinlock class */
-/*     &omap44xx_spinlock_hwmod, */
+       &omap44xx_spinlock_hwmod,
        /* timer class */
        &omap44xx_timer1_hwmod,
        &omap44xx_timer2_hwmod,
--
1.7.0

[-- Attachment #2: 0001-omap-hwspinlock-uncomment-the-hwmod-part-for-hwspinlock.patch --]
[-- Type: application/octet-stream, Size: 955 bytes --]

From 472d06cef2bba9e35815960c5848b8a0d0a2d60e Mon Sep 17 00:00:00 2001
From: Simon Que <sque@ti.com>
Date: Fri, 6 Aug 2010 10:28:53 -0500
Subject: [PATCH 1/4] uncomment the hwmod part for hwspinlock

Signed-off-by: Simon Que <sque@ti.com>
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
---
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index bb0c870..81e3f3f 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -5797,7 +5797,7 @@ static __initdata struct omap_hwmod *omap44xx_hwmods[] = {
 /*	&omap44xx_smartreflex_iva_hwmod, */
 /*	&omap44xx_smartreflex_mpu_hwmod, */
 	/* spinlock class */
-/*	&omap44xx_spinlock_hwmod, */
+	&omap44xx_spinlock_hwmod,
 	/* timer class */
 	&omap44xx_timer1_hwmod,
 	&omap44xx_timer2_hwmod,
-- 
1.7.0

RE: [PATCH 1/4 v2] omap: hwspinlock: uncomment the hwmod part for hwspinlock

[Premi, Sanjeev]

> -----Original Message-----
> From: Que, Simon 
> Sent: Thursday, August 12, 2010 6:00 AM
> To: Linux Omap; Tony Lindgren
> Cc: Cousson, Benoit; Shilimkar, Santosh; Premi, Sanjeev; 
> Kanigeri, Hari
> Subject: [PATCH 1/4 v2] omap: hwspinlock: uncomment the hwmod 
> part for hwspinlock
> 
> uncomment the hwmod part for hwspinlock
> 
> Signed-off-by: Simon Que <sque@ti.com>
> Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
> ---
> arch/arm/mach-omap2/omap_hwmod_44xx_data.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
[sp] I did not see this file in any of the "master",
     "for-next" or "pm" branches.

> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c 
> b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> index bb0c870..81e3f3f 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> @@ -5797,7 +5797,7 @@ static __initdata struct omap_hwmod 
> *omap44xx_hwmods[] = {
>  /*     &omap44xx_smartreflex_iva_hwmod, */
>  /*     &omap44xx_smartreflex_mpu_hwmod, */
>         /* spinlock class */
> -/*     &omap44xx_spinlock_hwmod, */
> +       &omap44xx_spinlock_hwmod,
>         /* timer class */
>         &omap44xx_timer1_hwmod,
>         &omap44xx_timer2_hwmod,
> --
> 1.7.0
> 

RE: [PATCH 1/4 v2] omap: hwspinlock: uncomment the hwmod part for hwspinlock

[Que, Simon]

> > arch/arm/mach-omap2/omap_hwmod_44xx_data.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> [sp] I did not see this file in any of the "master",
>      "for-next" or "pm" branches.

[SQ] This will go into Santosh's omap4_next branch for upstreaming.  That branch contains the file.

Thanks,
Simon

RE: [PATCH 1/4 v2] omap: hwspinlock: uncomment the hwmod part for hwspinlock

[Shilimkar, Santosh]

Simon
> -----Original Message-----
> From: Que, Simon
> Sent: Friday, August 13, 2010 8:52 PM
> To: Premi, Sanjeev; Linux Omap; Tony Lindgren
> Cc: Cousson, Benoit; Shilimkar, Santosh; Kanigeri, Hari
> Subject: RE: [PATCH 1/4 v2] omap: hwspinlock: uncomment the hwmod part for
> hwspinlock
> 
> > > arch/arm/mach-omap2/omap_hwmod_44xx_data.c |    2 +-
> > >  1 files changed, 1 insertions(+), 1 deletions(-)
> > >
> > [sp] I did not see this file in any of the "master",
> >      "for-next" or "pm" branches.
> 
> [SQ] This will go into Santosh's omap4_next branch for upstreaming.  That
> branch contains the file.
> 
There is a slight change in the way OMAP4 hwmod database will be merged.
Every driver need to add it's respective databse as part of the series.

Please find more info on the below thread.

http://www.spinics.net/lists/linux-omap/msg34700.html

RE: [PATCH 1/4 v2] omap: hwspinlock: uncomment the hwmod part for hwspinlock

[Premi, Sanjeev]

> -----Original Message-----
> From: Shilimkar, Santosh 
> Sent: Friday, August 13, 2010 11:05 PM
> To: Que, Simon; Premi, Sanjeev; Linux Omap; Tony Lindgren
> Cc: Cousson, Benoit; Kanigeri, Hari
> Subject: RE: [PATCH 1/4 v2] omap: hwspinlock: uncomment the 
> hwmod part for hwspinlock
> 
> Simon
> > -----Original Message-----
> > From: Que, Simon
> > Sent: Friday, August 13, 2010 8:52 PM
> > To: Premi, Sanjeev; Linux Omap; Tony Lindgren
> > Cc: Cousson, Benoit; Shilimkar, Santosh; Kanigeri, Hari
> > Subject: RE: [PATCH 1/4 v2] omap: hwspinlock: uncomment the 
> hwmod part for
> > hwspinlock
> > 
> > > > arch/arm/mach-omap2/omap_hwmod_44xx_data.c |    2 +-
> > > >  1 files changed, 1 insertions(+), 1 deletions(-)
> > > >
> > > [sp] I did not see this file in any of the "master",
> > >      "for-next" or "pm" branches.
> > 
> > [SQ] This will go into Santosh's omap4_next branch for 
> upstreaming.  That
> > branch contains the file.
> > 
> There is a slight change in the way OMAP4 hwmod database will 
> be merged.
> Every driver need to add it's respective databse as part of 
> the series.
> 
> Please find more info on the below thread.
> 
> http://www.spinics.net/lists/linux-omap/msg34700.html
> 

Simon,

I am not sure if you have taken care of this comment from
Santosh in the recent patch series:
  [PATCH 1/3 v3] omap: hwspinlock: uncomment the hwmod part for hwspinlock

~sanjeev

> 
>