* [PATCH 1/2] Revert "OMAP3: SRAM size fix for HS/EMU devices"
@ 2009-06-18 0:00 Kevin Hilman
2009-06-18 0:00 ` [PATCH 2/2] OMAP3: SRAM size fix for HS/EMU devices Kevin Hilman
2009-06-18 7:56 ` [APPLIED] [PATCH 1/2] Revert "OMAP3: SRAM size fix for HS/EMU devices" Tony Lindgren
0 siblings, 2 replies; 6+ messages in thread
From: Kevin Hilman @ 2009-06-18 0:00 UTC (permalink / raw)
To: linux-omap
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] OMAP3: SRAM size fix for HS/EMU devices
2009-06-18 0:00 [PATCH 1/2] Revert "OMAP3: SRAM size fix for HS/EMU devices" Kevin Hilman
@ 2009-06-18 0:00 ` Kevin Hilman
2009-06-18 5:16 ` Tony Lindgren
2009-06-18 7:52 ` [APPLIED] " Tony Lindgren
2009-06-18 7:56 ` [APPLIED] [PATCH 1/2] Revert "OMAP3: SRAM size fix for HS/EMU devices" Tony Lindgren
1 sibling, 2 replies; 6+ messages in thread
From: Kevin Hilman @ 2009-06-18 0:00 UTC (permalink / raw)
To: linux-omap
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] OMAP3: SRAM size fix for HS/EMU devices
2009-06-18 0:00 ` [PATCH 2/2] OMAP3: SRAM size fix for HS/EMU devices Kevin Hilman
@ 2009-06-18 5:16 ` Tony Lindgren
2009-06-18 14:12 ` Kevin Hilman
2009-06-18 7:52 ` [APPLIED] " Tony Lindgren
1 sibling, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2009-06-18 5:16 UTC (permalink / raw)
To: Kevin Hilman; +Cc: linux-omap
* 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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] OMAP3: SRAM size fix for HS/EMU devices
2009-06-18 5:16 ` Tony Lindgren
@ 2009-06-18 14:12 ` Kevin Hilman
0 siblings, 0 replies; 6+ messages in thread
From: Kevin Hilman @ 2009-06-18 14:12 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [APPLIED] [PATCH 2/2] OMAP3: SRAM size fix for HS/EMU devices
2009-06-18 0:00 ` [PATCH 2/2] OMAP3: SRAM size fix for HS/EMU devices Kevin Hilman
2009-06-18 5:16 ` Tony Lindgren
@ 2009-06-18 7:52 ` Tony Lindgren
1 sibling, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2009-06-18 7:52 UTC (permalink / raw)
To: linux-omap
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [APPLIED] [PATCH 1/2] Revert "OMAP3: SRAM size fix for HS/EMU devices"
2009-06-18 0:00 [PATCH 1/2] Revert "OMAP3: SRAM size fix for HS/EMU devices" Kevin Hilman
2009-06-18 0:00 ` [PATCH 2/2] OMAP3: SRAM size fix for HS/EMU devices Kevin Hilman
@ 2009-06-18 7:56 ` Tony Lindgren
1 sibling, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2009-06-18 7:56 UTC (permalink / raw)
To: linux-omap
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-06-18 14:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-18 0:00 [PATCH 1/2] Revert "OMAP3: SRAM size fix for HS/EMU devices" Kevin Hilman
2009-06-18 0:00 ` [PATCH 2/2] OMAP3: SRAM size fix for HS/EMU devices Kevin Hilman
2009-06-18 5:16 ` Tony Lindgren
2009-06-18 14:12 ` Kevin Hilman
2009-06-18 7:52 ` [APPLIED] " Tony Lindgren
2009-06-18 7:56 ` [APPLIED] [PATCH 1/2] Revert "OMAP3: SRAM size fix for HS/EMU devices" Tony Lindgren
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.