[PATCH 1/2] Revert "OMAP3: SRAM size fix for HS/EMU devices"

[PATCH 1/2] Revert "OMAP3: SRAM size fix for HS/EMU devices"

[Kevin Hilman]

This reverts commit bea1418bd09e30961e36f96f97979a3603f1da9b.
---
 arch/arm/plat-omap/sram.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 arch/arm/plat-omap/sram.c

diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
old mode 100755
new mode 100644
index f40bd2d..65006df
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -131,15 +131,9 @@ void __init omap_detect_sram(void)
 	if (cpu_class_is_omap2()) {
 		if (is_sram_locked()) {
 			if (cpu_is_omap34xx()) {
-				if (omap_type() == OMAP2_DEVICE_TYPE_GP) {
-					omap_sram_base = OMAP3_SRAM_PUB_VA;
-					omap_sram_start = OMAP3_SRAM_PUB_PA;
-					omap_sram_size = 0x8000; /* 32K */
-				} else {
-					omap_sram_base = OMAP3_SRAM_PUB_VA;
-					omap_sram_start = OMAP3_SRAM_PUB_PA;
-					omap_sram_size = 0x7000; /* 28K */
-				}
+				omap_sram_base = OMAP3_SRAM_PUB_VA;
+				omap_sram_start = OMAP3_SRAM_PUB_PA;
+				omap_sram_size = 0x8000; /* 32K */
 			} else {
 				omap_sram_base = OMAP2_SRAM_PUB_VA;
 				omap_sram_start = OMAP2_SRAM_PUB_PA;
-- 
1.6.3.2

[PATCH 2/2] OMAP3: SRAM size fix for HS/EMU devices

[Kevin Hilman]

From: Tero Kristo <tero.kristo@nokia.com>

SRAM size fix for HS/EMU devices

Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/plat-omap/sram.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
 mode change 100644 => 100755 arch/arm/plat-omap/sram.c

diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
old mode 100644
new mode 100755
index 65006df..80bf3b1
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -133,7 +133,11 @@ void __init omap_detect_sram(void)
 			if (cpu_is_omap34xx()) {
 				omap_sram_base = OMAP3_SRAM_PUB_VA;
 				omap_sram_start = OMAP3_SRAM_PUB_PA;
-				omap_sram_size = 0x8000; /* 32K */
+				if ((omap_type() == OMAP2_DEVICE_TYPE_EMU) ||
+				    (omap_type() == OMAP2_DEVICE_TYPE_SEC)) {
+					omap_sram_size = 0x7000; /* 28K */
+				else
+					omap_sram_size = 0x8000; /* 32K */
 			} else {
 				omap_sram_base = OMAP2_SRAM_PUB_VA;
 				omap_sram_start = OMAP2_SRAM_PUB_PA;
-- 
1.6.3.2

Re: [PATCH 2/2] OMAP3: SRAM size fix for HS/EMU devices

[Tony Lindgren]

* Kevin Hilman <khilman@deeprootsystems.com> [090618 03:00]:
> From: Tero Kristo <tero.kristo@nokia.com>
> 
> SRAM size fix for HS/EMU devices
> 
> Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
>  arch/arm/plat-omap/sram.c |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
>  mode change 100644 => 100755 arch/arm/plat-omap/sram.c

This one also has some mode change going on, please check your repos.
Will fix before applying.

Tony
 
> diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
> old mode 100644
> new mode 100755
> index 65006df..80bf3b1
> --- a/arch/arm/plat-omap/sram.c
> +++ b/arch/arm/plat-omap/sram.c
> @@ -133,7 +133,11 @@ void __init omap_detect_sram(void)
>  			if (cpu_is_omap34xx()) {
>  				omap_sram_base = OMAP3_SRAM_PUB_VA;
>  				omap_sram_start = OMAP3_SRAM_PUB_PA;
> -				omap_sram_size = 0x8000; /* 32K */
> +				if ((omap_type() == OMAP2_DEVICE_TYPE_EMU) ||
> +				    (omap_type() == OMAP2_DEVICE_TYPE_SEC)) {
> +					omap_sram_size = 0x7000; /* 28K */
> +				else
> +					omap_sram_size = 0x8000; /* 32K */
>  			} else {
>  				omap_sram_base = OMAP2_SRAM_PUB_VA;
>  				omap_sram_start = OMAP2_SRAM_PUB_PA;
> -- 
> 1.6.3.2
> 
> --
> 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

[APPLIED] [PATCH 2/2] OMAP3: SRAM size fix for HS/EMU devices

[Tony Lindgren]

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: omap-fixes

Initial commit ID (Likely to change): 50e246332d7a86d544bed701c714bed79cd03504

PatchWorks
http://patchwork.kernel.org/patch/31020/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=50e246332d7a86d544bed701c714bed79cd03504

[APPLIED] [PATCH 1/2] Revert "OMAP3: SRAM size fix for HS/EMU devices"

[Tony Lindgren]

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: master

Initial commit ID (Likely to change): 0c851268ad95c336dd07afe669c076bc725972e9

PatchWorks
http://patchwork.kernel.org/patch/31019/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=0c851268ad95c336dd07afe669c076bc725972e9

Re: [PATCH 2/2] OMAP3: SRAM size fix for HS/EMU devices

[Kevin Hilman]

Tony Lindgren <tony@atomide.com> writes:

> * Kevin Hilman <khilman@deeprootsystems.com> [090618 03:00]:
>> From: Tero Kristo <tero.kristo@nokia.com>
>> 
>> SRAM size fix for HS/EMU devices
>> 
>> Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
>> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
>> Signed-off-by: Tony Lindgren <tony@atomide.com>
>> ---
>>  arch/arm/plat-omap/sram.c |    6 +++++-
>>  1 files changed, 5 insertions(+), 1 deletions(-)
>>  mode change 100644 => 100755 arch/arm/plat-omap/sram.c
>
> This one also has some mode change going on, please check your repos.
> Will fix before applying.
>

Sorry, I shot this one out too quickly... it didn't compile either.  Sorry.

Kevin

>  
>> diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
>> old mode 100644
>> new mode 100755
>> index 65006df..80bf3b1
>> --- a/arch/arm/plat-omap/sram.c
>> +++ b/arch/arm/plat-omap/sram.c
>> @@ -133,7 +133,11 @@ void __init omap_detect_sram(void)
>>  			if (cpu_is_omap34xx()) {
>>  				omap_sram_base = OMAP3_SRAM_PUB_VA;
>>  				omap_sram_start = OMAP3_SRAM_PUB_PA;
>> -				omap_sram_size = 0x8000; /* 32K */
>> +				if ((omap_type() == OMAP2_DEVICE_TYPE_EMU) ||
>> +				    (omap_type() == OMAP2_DEVICE_TYPE_SEC)) {
>> +					omap_sram_size = 0x7000; /* 28K */
>> +				else
>> +					omap_sram_size = 0x8000; /* 32K */
>>  			} else {
>>  				omap_sram_base = OMAP2_SRAM_PUB_VA;
>>  				omap_sram_start = OMAP2_SRAM_PUB_PA;
>> -- 
>> 1.6.3.2
>> 
>> --
>> 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