All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/1] Fix OMAP_CHIP_INIT usage
@ 2009-04-23  9:43 Kalle Jokiniemi
  2009-04-23  9:43 ` [PATCH] ARM: OMAP3: " Kalle Jokiniemi
  2009-04-23 10:56 ` [PATCH 0/1] " Kalle Jokiniemi
  0 siblings, 2 replies; 5+ messages in thread
From: Kalle Jokiniemi @ 2009-04-23  9:43 UTC (permalink / raw)
  To: khilman; +Cc: linux-omap

Found this chip init problem while debugging a problem with
usb host getting stuck at active mode when toggling the 
/sys/power/enable_off_mode. The OMAP_CHIP_INIT calls used
"is ES2.0" macros, while it should be now according to the new
macro definitions "greater or equal to ES2.0".

Boot tested on RX51 (smartreflex disabled, as there is that problem vp_init 
problem)

Should apply on latest pm branch.

- Kalle




^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH] ARM: OMAP3: Fix OMAP_CHIP_INIT usage
  2009-04-23  9:43 [PATCH 0/1] Fix OMAP_CHIP_INIT usage Kalle Jokiniemi
@ 2009-04-23  9:43 ` Kalle Jokiniemi
  2009-04-23 23:21   ` Paul Walmsley
  2009-04-23 10:56 ` [PATCH 0/1] " Kalle Jokiniemi
  1 sibling, 1 reply; 5+ messages in thread
From: Kalle Jokiniemi @ 2009-04-23  9:43 UTC (permalink / raw)
  To: khilman; +Cc: linux-omap, Kalle Jokiniemi

Some modules have been specified only to exist in ES2.0
devices while they should exist on >= ES2.0 devices.
Fixed OMAP_CHIP_INIT() calls to take this to account.

Signed-off-by: Kalle Jokiniemi <kalle.jokiniemi@digia.com>
---
 arch/arm/mach-omap2/omapdev3xxx.h  |    8 ++++----
 arch/arm/mach-omap2/resource34xx.h |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap2/omapdev3xxx.h b/arch/arm/mach-omap2/omapdev3xxx.h
index dce87df..d2772c4 100644
--- a/arch/arm/mach-omap2/omapdev3xxx.h
+++ b/arch/arm/mach-omap2/omapdev3xxx.h
@@ -374,7 +374,7 @@ static struct omapdev neon_3xxx_omapdev = {
 static struct omapdev sgx_3xxx_omapdev = {
 	.name		= "sgx_omapdev",
 	.pwrdm		= { .name = "sgx_pwrdm" },
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
 };
 
 /* CORE */
@@ -435,7 +435,7 @@ static struct omapdev hsmmc3_3xxx_omapdev = {
 	.pwrdm		= { .name = "core_pwrdm" },
 	.pdev_name	= "mmci-omap",
 	.pdev_id	= 2,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
 };
 
 static struct omapdev mcspi4_3xxx_omapdev = {
@@ -658,7 +658,7 @@ static struct omapdev usbhost_3xxx_omapdev = {
 	.pwrdm		= { .name = "usbhost_pwrdm" },
 	.pdev_name	= "ehci-omap",
 	.pdev_id	= 0,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
 };
 
 static struct omapdev usbotg_3xxx_omapdev = {
@@ -666,7 +666,7 @@ static struct omapdev usbotg_3xxx_omapdev = {
 	.pwrdm		= { .name = "usbhost_pwrdm" },
 	.pdev_name	= "musb_hdrc",
 	.pdev_id	= -1,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
 };
 
 static struct omapdev usbtll_3xxx_omapdev = {
diff --git a/arch/arm/mach-omap2/resource34xx.h b/arch/arm/mach-omap2/resource34xx.h
index b847208..8d95a00 100644
--- a/arch/arm/mach-omap2/resource34xx.h
+++ b/arch/arm/mach-omap2/resource34xx.h
@@ -133,7 +133,7 @@ static struct shared_resource gfx_pwrdm_latency = {
 
 static struct shared_resource sgx_pwrdm_latency = {
 	.name 		= "sgx_pwrdm_latency",
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
 	.resource_data  = &sgx_pwrdm_lat_db,
 	.ops		= &pd_lat_res_ops,
 };
@@ -208,7 +208,7 @@ static struct pd_latency_db usbhost_pwrdm_lat_db = {
 
 static struct shared_resource usbhost_pwrdm_latency = {
 	.name		= "usbhost_pwrdm_latency",
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
 	.resource_data  = &usbhost_pwrdm_lat_db,
 	.ops		= &pd_lat_res_ops,
 };
-- 
1.5.4.3


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH 0/1] Fix OMAP_CHIP_INIT usage
  2009-04-23  9:43 [PATCH 0/1] Fix OMAP_CHIP_INIT usage Kalle Jokiniemi
  2009-04-23  9:43 ` [PATCH] ARM: OMAP3: " Kalle Jokiniemi
@ 2009-04-23 10:56 ` Kalle Jokiniemi
  1 sibling, 0 replies; 5+ messages in thread
From: Kalle Jokiniemi @ 2009-04-23 10:56 UTC (permalink / raw)
  To: khilman; +Cc: linux-omap

On Thu, 2009-04-23 at 12:43 +0300, Kalle Jokiniemi wrote:
> Found this chip init problem while debugging a problem with
> usb host getting stuck at active mode when toggling the 

BTW, this usb host problem is not fixed by this chip init patch. I'm
sending a separate patch that completely disables the usb host hardware
save/restore. That fixes the "usb_host active" problem.

- Kalle


> /sys/power/enable_off_mode. The OMAP_CHIP_INIT calls used
> "is ES2.0" macros, while it should be now according to the new
> macro definitions "greater or equal to ES2.0".
> 
> Boot tested on RX51 (smartreflex disabled, as there is that problem vp_init 
> problem)
> 
> Should apply on latest pm branch.
> 
> - Kalle
> 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html


^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: OMAP3: Fix OMAP_CHIP_INIT usage
  2009-04-23  9:43 ` [PATCH] ARM: OMAP3: " Kalle Jokiniemi
@ 2009-04-23 23:21   ` Paul Walmsley
  2009-05-14 17:09     ` Kevin Hilman
  0 siblings, 1 reply; 5+ messages in thread
From: Paul Walmsley @ 2009-04-23 23:21 UTC (permalink / raw)
  To: Kalle Jokiniemi; +Cc: khilman, linux-omap

On Thu, 23 Apr 2009, Kalle Jokiniemi wrote:

> Some modules have been specified only to exist in ES2.0
> devices while they should exist on >= ES2.0 devices.
> Fixed OMAP_CHIP_INIT() calls to take this to account.
> 
> Signed-off-by: Kalle Jokiniemi <kalle.jokiniemi@digia.com>

At least the omapdev3xxx.h changes are:

Acked-by: Paul Walmsley <paul@pwsan.com>

This patch is specific to the PM branch.

- Paul

> ---
>  arch/arm/mach-omap2/omapdev3xxx.h  |    8 ++++----
>  arch/arm/mach-omap2/resource34xx.h |    4 ++--
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/omapdev3xxx.h b/arch/arm/mach-omap2/omapdev3xxx.h
> index dce87df..d2772c4 100644
> --- a/arch/arm/mach-omap2/omapdev3xxx.h
> +++ b/arch/arm/mach-omap2/omapdev3xxx.h
> @@ -374,7 +374,7 @@ static struct omapdev neon_3xxx_omapdev = {
>  static struct omapdev sgx_3xxx_omapdev = {
>  	.name		= "sgx_omapdev",
>  	.pwrdm		= { .name = "sgx_pwrdm" },
> -	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
> +	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
>  };
>  
>  /* CORE */
> @@ -435,7 +435,7 @@ static struct omapdev hsmmc3_3xxx_omapdev = {
>  	.pwrdm		= { .name = "core_pwrdm" },
>  	.pdev_name	= "mmci-omap",
>  	.pdev_id	= 2,
> -	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
> +	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
>  };
>  
>  static struct omapdev mcspi4_3xxx_omapdev = {
> @@ -658,7 +658,7 @@ static struct omapdev usbhost_3xxx_omapdev = {
>  	.pwrdm		= { .name = "usbhost_pwrdm" },
>  	.pdev_name	= "ehci-omap",
>  	.pdev_id	= 0,
> -	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
> +	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
>  };
>  
>  static struct omapdev usbotg_3xxx_omapdev = {
> @@ -666,7 +666,7 @@ static struct omapdev usbotg_3xxx_omapdev = {
>  	.pwrdm		= { .name = "usbhost_pwrdm" },
>  	.pdev_name	= "musb_hdrc",
>  	.pdev_id	= -1,
> -	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
> +	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
>  };
>  
>  static struct omapdev usbtll_3xxx_omapdev = {
> diff --git a/arch/arm/mach-omap2/resource34xx.h b/arch/arm/mach-omap2/resource34xx.h
> index b847208..8d95a00 100644
> --- a/arch/arm/mach-omap2/resource34xx.h
> +++ b/arch/arm/mach-omap2/resource34xx.h
> @@ -133,7 +133,7 @@ static struct shared_resource gfx_pwrdm_latency = {
>  
>  static struct shared_resource sgx_pwrdm_latency = {
>  	.name 		= "sgx_pwrdm_latency",
> -	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
> +	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
>  	.resource_data  = &sgx_pwrdm_lat_db,
>  	.ops		= &pd_lat_res_ops,
>  };
> @@ -208,7 +208,7 @@ static struct pd_latency_db usbhost_pwrdm_lat_db = {
>  
>  static struct shared_resource usbhost_pwrdm_latency = {
>  	.name		= "usbhost_pwrdm_latency",
> -	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
> +	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
>  	.resource_data  = &usbhost_pwrdm_lat_db,
>  	.ops		= &pd_lat_res_ops,
>  };
> -- 
> 1.5.4.3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


- Paul

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: OMAP3: Fix OMAP_CHIP_INIT usage
  2009-04-23 23:21   ` Paul Walmsley
@ 2009-05-14 17:09     ` Kevin Hilman
  0 siblings, 0 replies; 5+ messages in thread
From: Kevin Hilman @ 2009-05-14 17:09 UTC (permalink / raw)
  To: Paul Walmsley; +Cc: Kalle Jokiniemi, linux-omap

Paul Walmsley <paul@pwsan.com> writes:

> On Thu, 23 Apr 2009, Kalle Jokiniemi wrote:
>
>> Some modules have been specified only to exist in ES2.0
>> devices while they should exist on >= ES2.0 devices.
>> Fixed OMAP_CHIP_INIT() calls to take this to account.
>> 
>> Signed-off-by: Kalle Jokiniemi <kalle.jokiniemi@digia.com>
>
> At least the omapdev3xxx.h changes are:
>
> Acked-by: Paul Walmsley <paul@pwsan.com>
>
> This patch is specific to the PM branch.
>

Pushing to PM branch today.

Kevin

>
>> ---
>>  arch/arm/mach-omap2/omapdev3xxx.h  |    8 ++++----
>>  arch/arm/mach-omap2/resource34xx.h |    4 ++--
>>  2 files changed, 6 insertions(+), 6 deletions(-)
>> 
>> diff --git a/arch/arm/mach-omap2/omapdev3xxx.h b/arch/arm/mach-omap2/omapdev3xxx.h
>> index dce87df..d2772c4 100644
>> --- a/arch/arm/mach-omap2/omapdev3xxx.h
>> +++ b/arch/arm/mach-omap2/omapdev3xxx.h
>> @@ -374,7 +374,7 @@ static struct omapdev neon_3xxx_omapdev = {
>>  static struct omapdev sgx_3xxx_omapdev = {
>>  	.name		= "sgx_omapdev",
>>  	.pwrdm		= { .name = "sgx_pwrdm" },
>> -	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
>> +	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
>>  };
>>  
>>  /* CORE */
>> @@ -435,7 +435,7 @@ static struct omapdev hsmmc3_3xxx_omapdev = {
>>  	.pwrdm		= { .name = "core_pwrdm" },
>>  	.pdev_name	= "mmci-omap",
>>  	.pdev_id	= 2,
>> -	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
>> +	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
>>  };
>>  
>>  static struct omapdev mcspi4_3xxx_omapdev = {
>> @@ -658,7 +658,7 @@ static struct omapdev usbhost_3xxx_omapdev = {
>>  	.pwrdm		= { .name = "usbhost_pwrdm" },
>>  	.pdev_name	= "ehci-omap",
>>  	.pdev_id	= 0,
>> -	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
>> +	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
>>  };
>>  
>>  static struct omapdev usbotg_3xxx_omapdev = {
>> @@ -666,7 +666,7 @@ static struct omapdev usbotg_3xxx_omapdev = {
>>  	.pwrdm		= { .name = "usbhost_pwrdm" },
>>  	.pdev_name	= "musb_hdrc",
>>  	.pdev_id	= -1,
>> -	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
>> +	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
>>  };
>>  
>>  static struct omapdev usbtll_3xxx_omapdev = {
>> diff --git a/arch/arm/mach-omap2/resource34xx.h b/arch/arm/mach-omap2/resource34xx.h
>> index b847208..8d95a00 100644
>> --- a/arch/arm/mach-omap2/resource34xx.h
>> +++ b/arch/arm/mach-omap2/resource34xx.h
>> @@ -133,7 +133,7 @@ static struct shared_resource gfx_pwrdm_latency = {
>>  
>>  static struct shared_resource sgx_pwrdm_latency = {
>>  	.name 		= "sgx_pwrdm_latency",
>> -	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
>> +	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
>>  	.resource_data  = &sgx_pwrdm_lat_db,
>>  	.ops		= &pd_lat_res_ops,
>>  };
>> @@ -208,7 +208,7 @@ static struct pd_latency_db usbhost_pwrdm_lat_db = {
>>  
>>  static struct shared_resource usbhost_pwrdm_latency = {
>>  	.name		= "usbhost_pwrdm_latency",
>> -	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
>> +	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
>>  	.resource_data  = &usbhost_pwrdm_lat_db,
>>  	.ops		= &pd_lat_res_ops,
>>  };
>> -- 
>> 1.5.4.3
>> 
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> 
>
>
> - Paul

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-05-14 17:09 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-04-23  9:43 [PATCH 0/1] Fix OMAP_CHIP_INIT usage Kalle Jokiniemi
2009-04-23  9:43 ` [PATCH] ARM: OMAP3: " Kalle Jokiniemi
2009-04-23 23:21   ` Paul Walmsley
2009-05-14 17:09     ` Kevin Hilman
2009-04-23 10:56 ` [PATCH 0/1] " Kalle Jokiniemi

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.