[PATCH 0/2] adding back some features

[PATCH 0/2] adding back some features

[Kevin Hilman]

Here's a couple patches to add-back some feature dropped in the
mainline sync.  These are needed for the PM branch among other things.

Applies to linux-omap master.

Kevin

Kalle Jokiniemi (1): OMAP3: DMA: Enable idlemodes for DMA OCP

Kevin Hilman (1):
  OMAP2/3: SoC IDs: add omap_type() for determining GP/EMU/HS

 arch/arm/mach-omap2/id.c              |   22 ++++++++++++++++++++++
 arch/arm/plat-omap/dma.c              |   13 +++++++++++++
 arch/arm/plat-omap/include/mach/dma.h |   15 +++++++++++++++
 3 files changed, 50 insertions(+), 0 deletions(-)

[PATCH 1/2] OMAP2/3: SoC IDs: add omap_type() for determining GP/EMU/HS

[Kevin Hilman]

The omap_type() function is added and returns the DEVICETYPE field of
the CONTROL_STATUS register.  The result can be used for conditional
code based on whether device is GP, EMU or HS.

Signed-off-by: Kevin Hilman <khilman@ti.deeprootsystems.com>
---
 arch/arm/mach-omap2/id.c |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 458990e..a98201c 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -48,6 +48,28 @@ int omap_chip_is(struct omap_chip_id oci)
 }
 EXPORT_SYMBOL(omap_chip_is);
 
+int omap_type(void)
+{
+	u32 val = 0;
+
+	if (cpu_is_omap24xx())
+		val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS);
+	else if (cpu_is_omap34xx())
+		val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS);
+	else {
+		pr_err("Cannot detect omap type!\n");
+		goto out;
+	}
+
+	val &= OMAP2_DEVICETYPE_MASK;
+	val >>= 8;
+
+out:
+	return val;
+}
+EXPORT_SYMBOL(omap_type);
+
+
 /*----------------------------------------------------------------------------*/
 
 #define OMAP_TAP_IDCODE		0x0204
-- 
1.6.2.2

[PATCH 2/2] OMAP3: DMA: Enable idlemodes for DMA OCP

[Kevin Hilman]

From: Kalle Jokiniemi <ext-kalle.jokiniemi@nokia.com>

This patch enables MStandby smart-idle mode, autoidle smartidle mode,
and the autoidle bit for DMA4_OCP_SYSCONFIG.

Signed-off-by: Kalle Jokiniemi <ext-kalle.jokiniemi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Kevin Hilman <khilman@ti.deeprootsystems.com>
---
 arch/arm/plat-omap/dma.c              |   13 +++++++++++++
 arch/arm/plat-omap/include/mach/dma.h |   15 +++++++++++++++
 2 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index def14ec..7677a4a 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -2457,6 +2457,19 @@ static int __init omap_init_dma(void)
 		setup_irq(irq, &omap24xx_dma_irq);
 	}
 
+	/* Enable smartidle idlemodes and autoidle */
+	if (cpu_is_omap34xx()) {
+		u32 v = dma_read(OCP_SYSCONFIG);
+		v &= ~(DMA_SYSCONFIG_MIDLEMODE_MASK |
+				DMA_SYSCONFIG_SIDLEMODE_MASK |
+				DMA_SYSCONFIG_AUTOIDLE);
+		v |= (DMA_SYSCONFIG_MIDLEMODE(DMA_IDLEMODE_SMARTIDLE) |
+			DMA_SYSCONFIG_SIDLEMODE(DMA_IDLEMODE_SMARTIDLE) |
+			DMA_SYSCONFIG_AUTOIDLE);
+		dma_write(v , OCP_SYSCONFIG);
+	}
+
+
 	/* FIXME: Update LCD DMA to work on 24xx */
 	if (cpu_class_is_omap1()) {
 		r = request_irq(INT_DMA_LCD, lcd_dma_irq_handler, 0,
diff --git a/arch/arm/plat-omap/include/mach/dma.h b/arch/arm/plat-omap/include/mach/dma.h
index 8c1eae8..7b939cc 100644
--- a/arch/arm/plat-omap/include/mach/dma.h
+++ b/arch/arm/plat-omap/include/mach/dma.h
@@ -389,6 +389,21 @@
 #define DMA_THREAD_FIFO_25		(0x02 << 14)
 #define DMA_THREAD_FIFO_50		(0x03 << 14)
 
+/* DMA4_OCP_SYSCONFIG bits */
+#define DMA_SYSCONFIG_MIDLEMODE_MASK		(3 << 12)
+#define DMA_SYSCONFIG_CLOCKACTIVITY_MASK	(3 << 8)
+#define DMA_SYSCONFIG_EMUFREE			(1 << 5)
+#define DMA_SYSCONFIG_SIDLEMODE_MASK		(3 << 3)
+#define DMA_SYSCONFIG_SOFTRESET			(1 << 2)
+#define DMA_SYSCONFIG_AUTOIDLE			(1 << 0)
+
+#define DMA_SYSCONFIG_MIDLEMODE(n)		((n) << 12)
+#define DMA_SYSCONFIG_SIDLEMODE(n)		((n) << 3)
+
+#define DMA_IDLEMODE_SMARTIDLE			0x2
+#define DMA_IDLEMODE_NO_IDLE			0x1
+#define DMA_IDLEMODE_FORCE_IDLE			0x0
+
 /* Chaining modes*/
 #ifndef CONFIG_ARCH_OMAP1
 #define OMAP_DMA_STATIC_CHAIN		0x1
-- 
1.6.2.2

[APPLIED] [PATCH 2/2] OMAP3: DMA: Enable idlemodes for DMA OCP

[Tony Lindgren]

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

Branch in linux-omap: %s

Initial commit ID (Likely to change): f8e830d85b5cd497fb8176be0d2d8b17c10cf1f0

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

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=f8e830d85b5cd497fb8176be0d2d8b17c10cf1f0

[APPLIED] [PATCH 1/2] OMAP2/3: SoC IDs: add omap_type() for determining

[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): 3c195a1bd36ab83b248b9174412ee81a35a41e87

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

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=3c195a1bd36ab83b248b9174412ee81a35a41e87

Re: [PATCH 0/2] adding back some features

[Tony Lindgren]

Hi,

* Kevin Hilman <khilman@deeprootsystems.com> [090612 15:13]:
> Here's a couple patches to add-back some feature dropped in the
> mainline sync.  These are needed for the PM branch among other things.
> 
> Applies to linux-omap master.
> 
> Kevin
> 
> Kalle Jokiniemi (1): OMAP3: DMA: Enable idlemodes for DMA OCP

This we could justify getting into mainline as a fix, as otherwise
some PM features won't work. Will add into omap-fixes.
 
> Kevin Hilman (1):
>   OMAP2/3: SoC IDs: add omap_type() for determining GP/EMU/HS

Is there any reason to get this one into mainline early?

If not, I suggest you keep this in your pm branch for next merge
window that I can keep merging to l-o master as needed.

However, if omap_type() is by other queues earlier, then I can
add it into my upstream queue. If this blocks several queues
from being rebased against mainline kernel, that alone might
already be a good enough reason to get it in early.

Regards,

Tony

 
>  arch/arm/mach-omap2/id.c              |   22 ++++++++++++++++++++++
>  arch/arm/plat-omap/dma.c              |   13 +++++++++++++
>  arch/arm/plat-omap/include/mach/dma.h |   15 +++++++++++++++
>  3 files changed, 50 insertions(+), 0 deletions(-)
> 
> --
> 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

Re: [PATCH 0/2] adding back some features

[Kevin Hilman]

Tony Lindgren <tony@atomide.com> writes:

> Hi,
>
> * Kevin Hilman <khilman@deeprootsystems.com> [090612 15:13]:
>> Here's a couple patches to add-back some feature dropped in the
>> mainline sync.  These are needed for the PM branch among other things.
>> 
>> Applies to linux-omap master.
>> 
>> Kevin
>> 
>> Kalle Jokiniemi (1): OMAP3: DMA: Enable idlemodes for DMA OCP
>
> This we could justify getting into mainline as a fix, as otherwise
> some PM features won't work. Will add into omap-fixes.

Thanks.

>> Kevin Hilman (1):
>>   OMAP2/3: SoC IDs: add omap_type() for determining GP/EMU/HS
>
> Is there any reason to get this one into mainline early?

Well, the PM branch has a dependency, but also the recenetly submitted
qwatchdog driver has a dependency.

> If not, I suggest you keep this in your pm branch for next merge
> window that I can keep merging to l-o master as needed.
>
> However, if omap_type() is by other queues earlier, then I can
> add it into my upstream queue. If this blocks several queues
> from being rebased against mainline kernel, that alone might
> already be a good enough reason to get it in early.

I think it should go via your upstream queue.  I imagine some of the
other upcoming driver submissions from TI will have a dependency as
well since there is still some missing EMU/HS support ind drivers.

Kevin

>
> Regards,
>
> Tony
>
>  
>>  arch/arm/mach-omap2/id.c              |   22 ++++++++++++++++++++++
>>  arch/arm/plat-omap/dma.c              |   13 +++++++++++++
>>  arch/arm/plat-omap/include/mach/dma.h |   15 +++++++++++++++
>>  3 files changed, 50 insertions(+), 0 deletions(-)
>> 
>> --
>> 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

Re: [PATCH 0/2] adding back some features

[Kevin Hilman]

Kevin Hilman <khilman@deeprootsystems.com> writes:

> Tony Lindgren <tony@atomide.com> writes:
>
>> Hi,
>>
>> * Kevin Hilman <khilman@deeprootsystems.com> [090612 15:13]:
>>> Here's a couple patches to add-back some feature dropped in the
>>> mainline sync.  These are needed for the PM branch among other things.
>>> 
>>> Applies to linux-omap master.
>>> 
>>> Kevin Hilman (1):
>>>   OMAP2/3: SoC IDs: add omap_type() for determining GP/EMU/HS
>>
>> Is there any reason to get this one into mainline early?
>
> Well, the PM branch has a dependency, but also the recenetly submitted
> qwatchdog driver has a dependency.
>
>> If not, I suggest you keep this in your pm branch for next merge
>> window that I can keep merging to l-o master as needed.
>>
>> However, if omap_type() is by other queues earlier, then I can
>> add it into my upstream queue. If this blocks several queues
>> from being rebased against mainline kernel, that alone might
>> already be a good enough reason to get it in early.
>
> I think it should go via your upstream queue.  I imagine some of the
> other upcoming driver submissions from TI will have a dependency as
> well since there is still some missing EMU/HS support ind drivers.

Also, I'm carrying this SRAM patch below for HS/EMU that could go into
Paul's SRAM/SDRC queue if this omap_type() gets merged sooner rather
than later.

Kevin

commit 106588e30f070d9a8d5906d409e0b9aad89edc9e
Author: Tero Kristo <tero.kristo@nokia.com>
Date:   Thu Oct 9 17:47:02 2008 +0300

    OMAP3: SRAM size fix for HS/EMU devices
    
    Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
    Signed-off-by: Kevin Hilman <khilman@ti.deeprootsystems.com>

diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
old mode 100644
new mode 100755
index 65006df..f40bd2d
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -131,9 +131,15 @@ void __init omap_detect_sram(void)
 	if (cpu_class_is_omap2()) {
 		if (is_sram_locked()) {
 			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_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 */
+				}
 			} else {
 				omap_sram_base = OMAP2_SRAM_PUB_VA;
 				omap_sram_start = OMAP2_SRAM_PUB_PA;

Re: [PATCH 0/2] adding back some features

[Tony Lindgren]

* Kevin Hilman <khilman@deeprootsystems.com> [090615 09:05]:
> Kevin Hilman <khilman@deeprootsystems.com> writes:
> 
> > Tony Lindgren <tony@atomide.com> writes:
> >
> >> Hi,
> >>
> >> * Kevin Hilman <khilman@deeprootsystems.com> [090612 15:13]:
> >>> Here's a couple patches to add-back some feature dropped in the
> >>> mainline sync.  These are needed for the PM branch among other things.
> >>> 
> >>> Applies to linux-omap master.
> >>> 
> >>> Kevin Hilman (1):
> >>>   OMAP2/3: SoC IDs: add omap_type() for determining GP/EMU/HS
> >>
> >> Is there any reason to get this one into mainline early?
> >
> > Well, the PM branch has a dependency, but also the recenetly submitted
> > qwatchdog driver has a dependency.
> >
> >> If not, I suggest you keep this in your pm branch for next merge
> >> window that I can keep merging to l-o master as needed.
> >>
> >> However, if omap_type() is by other queues earlier, then I can
> >> add it into my upstream queue. If this blocks several queues
> >> from being rebased against mainline kernel, that alone might
> >> already be a good enough reason to get it in early.
> >
> > I think it should go via your upstream queue.  I imagine some of the
> > other upcoming driver submissions from TI will have a dependency as
> > well since there is still some missing EMU/HS support ind drivers.
> 
> Also, I'm carrying this SRAM patch below for HS/EMU that could go into
> Paul's SRAM/SDRC queue if this omap_type() gets merged sooner rather
> than later.

Hmm, the HS omap sram.c patch below for sure justifies fixing it as
incorrect SRAM size can cause nasty bugs.

Will add both omap_type and the sram.c patch below to omap-fixes.

Regards,

Tony
 
> Kevin
> 
> commit 106588e30f070d9a8d5906d409e0b9aad89edc9e
> Author: Tero Kristo <tero.kristo@nokia.com>
> Date:   Thu Oct 9 17:47:02 2008 +0300
> 
>     OMAP3: SRAM size fix for HS/EMU devices
>     
>     Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
>     Signed-off-by: Kevin Hilman <khilman@ti.deeprootsystems.com>
> 
> diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
> old mode 100644
> new mode 100755
> index 65006df..f40bd2d
> --- a/arch/arm/plat-omap/sram.c
> +++ b/arch/arm/plat-omap/sram.c
> @@ -131,9 +131,15 @@ void __init omap_detect_sram(void)
>  	if (cpu_class_is_omap2()) {
>  		if (is_sram_locked()) {
>  			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_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 */
> +				}
>  			} else {
>  				omap_sram_base = OMAP2_SRAM_PUB_VA;
>  				omap_sram_start = OMAP2_SRAM_PUB_PA;

Re: [PATCH 0/2] adding back some features

[Paul Walmsley]

code comment below:

On Wed, 17 Jun 2009, Tony Lindgren wrote:

> * Kevin Hilman <khilman@deeprootsystems.com> [090615 09:05]:
> > Kevin Hilman <khilman@deeprootsystems.com> writes:
> > 
> > > Tony Lindgren <tony@atomide.com> writes:
> > >
> > >> Hi,
> > >>
> > >> * Kevin Hilman <khilman@deeprootsystems.com> [090612 15:13]:
> > >>> Here's a couple patches to add-back some feature dropped in the
> > >>> mainline sync.  These are needed for the PM branch among other things.
> > >>> 
> > >>> Applies to linux-omap master.
> > >>> 
> > >>> Kevin Hilman (1):
> > >>>   OMAP2/3: SoC IDs: add omap_type() for determining GP/EMU/HS
> > >>
> > >> Is there any reason to get this one into mainline early?
> > >
> > > Well, the PM branch has a dependency, but also the recenetly submitted
> > > qwatchdog driver has a dependency.
> > >
> > >> If not, I suggest you keep this in your pm branch for next merge
> > >> window that I can keep merging to l-o master as needed.
> > >>
> > >> However, if omap_type() is by other queues earlier, then I can
> > >> add it into my upstream queue. If this blocks several queues
> > >> from being rebased against mainline kernel, that alone might
> > >> already be a good enough reason to get it in early.
> > >
> > > I think it should go via your upstream queue.  I imagine some of the
> > > other upcoming driver submissions from TI will have a dependency as
> > > well since there is still some missing EMU/HS support ind drivers.
> > 
> > Also, I'm carrying this SRAM patch below for HS/EMU that could go into
> > Paul's SRAM/SDRC queue if this omap_type() gets merged sooner rather
> > than later.
> 
> Hmm, the HS omap sram.c patch below for sure justifies fixing it as
> incorrect SRAM size can cause nasty bugs.
> 
> Will add both omap_type and the sram.c patch below to omap-fixes.
> 
> Regards,
> 
> Tony
>  
> > Kevin
> > 
> > commit 106588e30f070d9a8d5906d409e0b9aad89edc9e
> > Author: Tero Kristo <tero.kristo@nokia.com>
> > Date:   Thu Oct 9 17:47:02 2008 +0300
> > 
> >     OMAP3: SRAM size fix for HS/EMU devices
> >     
> >     Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
> >     Signed-off-by: Kevin Hilman <khilman@ti.deeprootsystems.com>
> > 
> > diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
> > old mode 100644
> > new mode 100755
> > index 65006df..f40bd2d
> > --- a/arch/arm/plat-omap/sram.c
> > +++ b/arch/arm/plat-omap/sram.c
> > @@ -131,9 +131,15 @@ void __init omap_detect_sram(void)
> >  	if (cpu_class_is_omap2()) {
> >  		if (is_sram_locked()) {
> >  			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_GP) {
> > +					omap_sram_base = OMAP3_SRAM_PUB_VA;
> > +					omap_sram_start = OMAP3_SRAM_PUB_PA;
> > +					omap_sram_size = 0x8000; /* 32K */
> > +				} else {

This would be better if it specifically tested for HS and EMU devices.  
There are at least two other omap_type() possibilities here, "TEST" and 
"BAD"

> > +					omap_sram_base = OMAP3_SRAM_PUB_VA;
> > +					omap_sram_start = OMAP3_SRAM_PUB_PA;
> > +					omap_sram_size = 0x7000; /* 28K */
> > +				}
> >  			} else {
> >  				omap_sram_base = OMAP2_SRAM_PUB_VA;
> >  				omap_sram_start = OMAP2_SRAM_PUB_PA;
> --
> 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

Re: [PATCH 0/2] adding back some features

[Tony Lindgren]

* Paul Walmsley <paul@pwsan.com> [090617 01:35]:
> code comment below:
> 
> On Wed, 17 Jun 2009, Tony Lindgren wrote:
> 
> > * Kevin Hilman <khilman@deeprootsystems.com> [090615 09:05]:
> > > Kevin Hilman <khilman@deeprootsystems.com> writes:
> > > 
> > > > Tony Lindgren <tony@atomide.com> writes:
> > > >
> > > >> Hi,
> > > >>
> > > >> * Kevin Hilman <khilman@deeprootsystems.com> [090612 15:13]:
> > > >>> Here's a couple patches to add-back some feature dropped in the
> > > >>> mainline sync.  These are needed for the PM branch among other things.
> > > >>> 
> > > >>> Applies to linux-omap master.
> > > >>> 
> > > >>> Kevin Hilman (1):
> > > >>>   OMAP2/3: SoC IDs: add omap_type() for determining GP/EMU/HS
> > > >>
> > > >> Is there any reason to get this one into mainline early?
> > > >
> > > > Well, the PM branch has a dependency, but also the recenetly submitted
> > > > qwatchdog driver has a dependency.
> > > >
> > > >> If not, I suggest you keep this in your pm branch for next merge
> > > >> window that I can keep merging to l-o master as needed.
> > > >>
> > > >> However, if omap_type() is by other queues earlier, then I can
> > > >> add it into my upstream queue. If this blocks several queues
> > > >> from being rebased against mainline kernel, that alone might
> > > >> already be a good enough reason to get it in early.
> > > >
> > > > I think it should go via your upstream queue.  I imagine some of the
> > > > other upcoming driver submissions from TI will have a dependency as
> > > > well since there is still some missing EMU/HS support ind drivers.
> > > 
> > > Also, I'm carrying this SRAM patch below for HS/EMU that could go into
> > > Paul's SRAM/SDRC queue if this omap_type() gets merged sooner rather
> > > than later.
> > 
> > Hmm, the HS omap sram.c patch below for sure justifies fixing it as
> > incorrect SRAM size can cause nasty bugs.
> > 
> > Will add both omap_type and the sram.c patch below to omap-fixes.
> > 
> > Regards,
> > 
> > Tony
> >  
> > > Kevin
> > > 
> > > commit 106588e30f070d9a8d5906d409e0b9aad89edc9e
> > > Author: Tero Kristo <tero.kristo@nokia.com>
> > > Date:   Thu Oct 9 17:47:02 2008 +0300
> > > 
> > >     OMAP3: SRAM size fix for HS/EMU devices
> > >     
> > >     Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
> > >     Signed-off-by: Kevin Hilman <khilman@ti.deeprootsystems.com>
> > > 
> > > diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
> > > old mode 100644
> > > new mode 100755
> > > index 65006df..f40bd2d
> > > --- a/arch/arm/plat-omap/sram.c
> > > +++ b/arch/arm/plat-omap/sram.c
> > > @@ -131,9 +131,15 @@ void __init omap_detect_sram(void)
> > >  	if (cpu_class_is_omap2()) {
> > >  		if (is_sram_locked()) {
> > >  			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_GP) {
> > > +					omap_sram_base = OMAP3_SRAM_PUB_VA;
> > > +					omap_sram_start = OMAP3_SRAM_PUB_PA;
> > > +					omap_sram_size = 0x8000; /* 32K */
> > > +				} else {
> 
> This would be better if it specifically tested for HS and EMU devices.  
> There are at least two other omap_type() possibilities here, "TEST" and 
> "BAD"

Tero, can you please repost? I will hold on sending out the omap-fixes
for that, and refresh omap-fixes with the updated patch.

Tony

 
> > > +					omap_sram_base = OMAP3_SRAM_PUB_VA;
> > > +					omap_sram_start = OMAP3_SRAM_PUB_PA;
> > > +					omap_sram_size = 0x7000; /* 28K */
> > > +				}
> > >  			} else {
> > >  				omap_sram_base = OMAP2_SRAM_PUB_VA;
> > >  				omap_sram_start = OMAP2_SRAM_PUB_PA;
> > --
> > 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

RE: [PATCH 0/2] adding back some features

[Tero.Kristo]

 

>-----Original Message-----
>From: ext Tony Lindgren [mailto:tony@atomide.com] 
>Sent: 17 June, 2009 12:58
>To: Paul Walmsley
>Cc: Kristo Tero (Nokia-D/Tampere); Kevin Hilman; 
>linux-omap@vger.kernel.org
>Subject: Re: [PATCH 0/2] adding back some features
>
>* Paul Walmsley <paul@pwsan.com> [090617 01:35]:
>> code comment below:
>> 
>> On Wed, 17 Jun 2009, Tony Lindgren wrote:
>> 
>> > * Kevin Hilman <khilman@deeprootsystems.com> [090615 09:05]:
>> > > Kevin Hilman <khilman@deeprootsystems.com> writes:
>> > > 
>> > > > Tony Lindgren <tony@atomide.com> writes:
>> > > >
>> > > >> Hi,
>> > > >>
>> > > >> * Kevin Hilman <khilman@deeprootsystems.com> [090612 15:13]:
>> > > >>> Here's a couple patches to add-back some feature dropped in 
>> > > >>> the mainline sync.  These are needed for the PM 
>branch among other things.
>> > > >>> 
>> > > >>> Applies to linux-omap master.
>> > > >>> 
>> > > >>> Kevin Hilman (1):
>> > > >>>   OMAP2/3: SoC IDs: add omap_type() for determining GP/EMU/HS
>> > > >>
>> > > >> Is there any reason to get this one into mainline early?
>> > > >
>> > > > Well, the PM branch has a dependency, but also the recenetly 
>> > > > submitted qwatchdog driver has a dependency.
>> > > >
>> > > >> If not, I suggest you keep this in your pm branch for next 
>> > > >> merge window that I can keep merging to l-o master as needed.
>> > > >>
>> > > >> However, if omap_type() is by other queues earlier, 
>then I can 
>> > > >> add it into my upstream queue. If this blocks several queues 
>> > > >> from being rebased against mainline kernel, that alone might 
>> > > >> already be a good enough reason to get it in early.
>> > > >
>> > > > I think it should go via your upstream queue.  I 
>imagine some of 
>> > > > the other upcoming driver submissions from TI will have a 
>> > > > dependency as well since there is still some missing 
>EMU/HS support ind drivers.
>> > > 
>> > > Also, I'm carrying this SRAM patch below for HS/EMU that 
>could go 
>> > > into Paul's SRAM/SDRC queue if this omap_type() gets 
>merged sooner 
>> > > rather than later.
>> > 
>> > Hmm, the HS omap sram.c patch below for sure justifies 
>fixing it as 
>> > incorrect SRAM size can cause nasty bugs.
>> > 
>> > Will add both omap_type and the sram.c patch below to omap-fixes.
>> > 
>> > Regards,
>> > 
>> > Tony
>> >  
>> > > Kevin
>> > > 
>> > > commit 106588e30f070d9a8d5906d409e0b9aad89edc9e
>> > > Author: Tero Kristo <tero.kristo@nokia.com>
>> > > Date:   Thu Oct 9 17:47:02 2008 +0300
>> > > 
>> > >     OMAP3: SRAM size fix for HS/EMU devices
>> > >     
>> > >     Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
>> > >     Signed-off-by: Kevin Hilman <khilman@ti.deeprootsystems.com>
>> > > 
>> > > diff --git a/arch/arm/plat-omap/sram.c 
>b/arch/arm/plat-omap/sram.c 
>> > > old mode 100644 new mode 100755 index 65006df..f40bd2d
>> > > --- a/arch/arm/plat-omap/sram.c
>> > > +++ b/arch/arm/plat-omap/sram.c
>> > > @@ -131,9 +131,15 @@ void __init omap_detect_sram(void)
>> > >  	if (cpu_class_is_omap2()) {
>> > >  		if (is_sram_locked()) {
>> > >  			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_GP) {
>> > > +					omap_sram_base 
>= OMAP3_SRAM_PUB_VA;
>> > > +					omap_sram_start 
>= OMAP3_SRAM_PUB_PA;
>> > > +					omap_sram_size 
>= 0x8000; /* 32K */
>> > > +				} else {
>> 
>> This would be better if it specifically tested for HS and 
>EMU devices.  
>> There are at least two other omap_type() possibilities here, "TEST" 
>> and "BAD"
>
>Tero, can you please repost? I will hold on sending out the 
>omap-fixes for that, and refresh omap-fixes with the updated patch.

I'll try to look at this tomorrow if I happen to have time, I am currently quite busy fixing some bugs in our code base. However, if you need it right now and if someone wants to re-write this to check against TEST and BAD, I am of course okay with that (rather simple fix actually.) :)

-Tero

>
>Tony
>
> 
>> > > +					omap_sram_base 
>= OMAP3_SRAM_PUB_VA;
>> > > +					omap_sram_start 
>= OMAP3_SRAM_PUB_PA;
>> > > +					omap_sram_size 
>= 0x7000; /* 28K */
>> > > +				}
>> > >  			} else {
>> > >  				omap_sram_base = 
>OMAP2_SRAM_PUB_VA;
>> > >  				omap_sram_start = 
>OMAP2_SRAM_PUB_PA;
>> > --
>> > 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
>

Re: [PATCH 0/2] adding back some features

[Kevin Hilman]

<Tero.Kristo@nokia.com> writes:

>>> 
>>> This would be better if it specifically tested for HS and EMU
>>> devices.  There are at least two other omap_type() possibilities
>>> here, "TEST" and "BAD"
>>
>>Tero, can you please repost? I will hold on sending out the 
>>omap-fixes for that, and refresh omap-fixes with the updated patch.
>
> I'll try to look at this tomorrow if I happen to have time, I am
> currently quite busy fixing some bugs in our code base. However, if
> you need it right now and if someone wants to re-write this to check
> against TEST and BAD, I am of course okay with that (rather simple
> fix actually.) :)

I'll fix this up and resubmit.

Kevin

Re: [PATCH 0/2] adding back some features

[Kevin Hilman]

<Tero.Kristo@nokia.com> writes:

>  
>
>>-----Original Message-----
>>From: ext Tony Lindgren [mailto:tony@atomide.com] 
>>Sent: 17 June, 2009 12:58
>>To: Paul Walmsley
>>Cc: Kristo Tero (Nokia-D/Tampere); Kevin Hilman; 
>>linux-omap@vger.kernel.org
>>Subject: Re: [PATCH 0/2] adding back some features
>>
>>* Paul Walmsley <paul@pwsan.com> [090617 01:35]:
>>> code comment below:
>>> 
>>> On Wed, 17 Jun 2009, Tony Lindgren wrote:
>>> 
>>> > * Kevin Hilman <khilman@deeprootsystems.com> [090615 09:05]:
>>> > > Kevin Hilman <khilman@deeprootsystems.com> writes:
>>> > > 
>>> > > > Tony Lindgren <tony@atomide.com> writes:
>>> > > >
>>> > > >> Hi,
>>> > > >>
>>> > > >> * Kevin Hilman <khilman@deeprootsystems.com> [090612 15:13]:
>>> > > >>> Here's a couple patches to add-back some feature dropped in 
>>> > > >>> the mainline sync.  These are needed for the PM 
>>branch among other things.
>>> > > >>> 
>>> > > >>> Applies to linux-omap master.
>>> > > >>> 
>>> > > >>> Kevin Hilman (1):
>>> > > >>>   OMAP2/3: SoC IDs: add omap_type() for determining GP/EMU/HS
>>> > > >>
>>> > > >> Is there any reason to get this one into mainline early?
>>> > > >
>>> > > > Well, the PM branch has a dependency, but also the recenetly 
>>> > > > submitted qwatchdog driver has a dependency.
>>> > > >
>>> > > >> If not, I suggest you keep this in your pm branch for next 
>>> > > >> merge window that I can keep merging to l-o master as needed.
>>> > > >>
>>> > > >> However, if omap_type() is by other queues earlier, 
>>then I can 
>>> > > >> add it into my upstream queue. If this blocks several queues 
>>> > > >> from being rebased against mainline kernel, that alone might 
>>> > > >> already be a good enough reason to get it in early.
>>> > > >
>>> > > > I think it should go via your upstream queue.  I 
>>imagine some of 
>>> > > > the other upcoming driver submissions from TI will have a 
>>> > > > dependency as well since there is still some missing 
>>EMU/HS support ind drivers.
>>> > > 
>>> > > Also, I'm carrying this SRAM patch below for HS/EMU that 
>>could go 
>>> > > into Paul's SRAM/SDRC queue if this omap_type() gets 
>>merged sooner 
>>> > > rather than later.
>>> > 
>>> > Hmm, the HS omap sram.c patch below for sure justifies 
>>fixing it as 
>>> > incorrect SRAM size can cause nasty bugs.
>>> > 
>>> > Will add both omap_type and the sram.c patch below to omap-fixes.
>>> > 
>>> > Regards,
>>> > 
>>> > Tony
>>> >  
>>> > > Kevin
>>> > > 
>>> > > commit 106588e30f070d9a8d5906d409e0b9aad89edc9e
>>> > > Author: Tero Kristo <tero.kristo@nokia.com>
>>> > > Date:   Thu Oct 9 17:47:02 2008 +0300
>>> > > 
>>> > >     OMAP3: SRAM size fix for HS/EMU devices
>>> > >     
>>> > >     Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
>>> > >     Signed-off-by: Kevin Hilman <khilman@ti.deeprootsystems.com>
>>> > > 
>>> > > diff --git a/arch/arm/plat-omap/sram.c 
>>b/arch/arm/plat-omap/sram.c 
>>> > > old mode 100644 new mode 100755 index 65006df..f40bd2d
>>> > > --- a/arch/arm/plat-omap/sram.c
>>> > > +++ b/arch/arm/plat-omap/sram.c
>>> > > @@ -131,9 +131,15 @@ void __init omap_detect_sram(void)
>>> > >  	if (cpu_class_is_omap2()) {
>>> > >  		if (is_sram_locked()) {
>>> > >  			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_GP) {
>>> > > +					omap_sram_base 
>>= OMAP3_SRAM_PUB_VA;
>>> > > +					omap_sram_start 
>>= OMAP3_SRAM_PUB_PA;
>>> > > +					omap_sram_size 
>>= 0x8000; /* 32K */
>>> > > +				} else {
>>> 
>>> This would be better if it specifically tested for HS and 
>>EMU devices.  
>>> There are at least two other omap_type() possibilities here, "TEST" 
>>> and "BAD"
>>
>>Tero, can you please repost? I will hold on sending out the 
>>omap-fixes for that, and refresh omap-fixes with the updated patch.
>
> I'll try to look at this tomorrow if I happen to have time, I am currently quite busy fixing some bugs in our code base. However, if you need it right now and if someone wants to re-write this to check against TEST and BAD, I am of course okay with that (rather simple fix actually.) :)
>

OK, I've sent an updated patch to the list, along with a revert of the
original so it's easier to sned upstream.

Kevin

[APPLIED] [PATCH 0/2] adding back some features

[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): 97b83891f45c229ef5898b86dfe969e23d3b32b8

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

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=97b83891f45c229ef5898b86dfe969e23d3b32b8