Skip to contentSkip to conversation

adding back some features

PATCH In review Kevin Hilman 4 participants 15 messages Jun 12, 2009 – Jun 18, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover adding back some features

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(-)
#1 lore raw

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

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.

---
 arch/arm/mach-omap2/id.c |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/id.c +22 -0
index 458990e..a98201c 100644
@@ -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
Signature · 1 line
1.6.2.2
#2 lore raw

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

From: Kalle Jokiniemi <[email protected]>

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

---
 arch/arm/plat-omap/dma.c              |   13 +++++++++++++
 arch/arm/plat-omap/include/mach/dma.h |   15 +++++++++++++++
 2 files changed, 28 insertions(+), 0 deletions(-)
arch/arm/plat-omap/dma.c +13 -0
index def14ec..7677a4a 100644
@@ -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,
arch/arm/plat-omap/include/mach/dma.h +15 -0
index 8c1eae8..7b939cc 100644
@@ -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
Signature · 1 line
1.6.2.2
maintainer
#3 lore raw

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

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

maintainer
#4 lore raw

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

In reply to Kevin Hilman

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

maintainer
#5 lore raw
In reply to Kevin Hilman

Hi,

Quoted 8 lines · 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

This we could justify getting into mainline as a fix, as otherwise some PM features won't work. Will add into omap-fixes.

Quoted 2 lines

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

Quoted 9 lines
 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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#6 lore raw
Quoted 6 lines · Tony Lindgren

Hi,

Quoted 3 lines · 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.

Quoted 8 lines
Quoted 5 lines

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.

Quoted 4 lines
Quoted 2 lines

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.

Quoted 7 lines

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

Quoted 15 lines

Regards,

Tony

Quoted 9 lines
 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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#7 lore raw
Quoted 21 lines · Kevin Hilman
Quoted 6 lines · Tony Lindgren

Hi,

Quoted 3 lines · 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.

Quoted 6 lines
Quoted 4 lines

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.

Quoted 3 lines

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.

Quoted 8 lines
Quoted 4 lines

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 <[email protected]>
Date:   Thu Oct 9 17:47:02 2008 +0300

OMAP3: SRAM size fix for HS/EMU devices

arch/arm/plat-omap/sram.c +9 -3
old mode 100644
new mode 100755
index 65006df..f40bd2d
@@ -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;
maintainer
#8 lore raw
Quoted 28 lines · Kevin Hilman
Quoted 26 lines · Kevin Hilman
Quoted 6 lines · Tony Lindgren

Hi,

Quoted 3 lines · 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.

Quoted 6 lines
Quoted 4 lines

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.

Quoted 7 lines

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.

Quoted 7 lines
Quoted 3 lines

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

Quoted 36 lines

Kevin

commit 106588e30f070d9a8d5906d409e0b9aad89edc9e

Author: Tero Kristo <[email protected]>
Date:   Thu Oct 9 17:47:02 2008 +0300

OMAP3: SRAM size fix for HS/EMU devices

arch/arm/plat-omap/sram.c +9 -3
old mode 100644
new mode 100755
index 65006df..f40bd2d
@@ -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;
#9 lore raw

code comment below:

Quoted 67 lines · Tony Lindgren
Quoted 28 lines · Kevin Hilman
Quoted 26 lines · Kevin Hilman
Quoted 6 lines · Tony Lindgren

Hi,

Quoted 3 lines · 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.

Quoted 6 lines
Quoted 4 lines

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.

Quoted 7 lines

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.

Quoted 7 lines
Quoted 3 lines

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

Quoted 21 lines

Kevin

commit 106588e30f070d9a8d5906d409e0b9aad89edc9e

Author: Tero Kristo <[email protected]>
Date:   Thu Oct 9 17:47:02 2008 +0300

OMAP3: SRAM size fix for HS/EMU devices

arch/arm/plat-omap/sram.c +0 -0
old mode 100644
new mode 100755
index 65006df..f40bd2d
@@ -131,9 +131,15 @@ void __init omap_detect_sram(void)
 	if (cpu_class_is_omap2()) {
 		if (is_sram_locked()) {
 			if (cpu_is_omap34xx()) {
Quoted 8 lines

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 138

Quoted 8 lines
arch/arm/plat-omap/sram.c +5 -3
-				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"

Quoted 12 lines

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 145

Quoted 7 lines
arch/arm/plat-omap/sram.c +4 -0
+					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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

- Paul

maintainer
#10 lore raw
Quoted 75 lines · Paul Walmsley

code comment below:

Quoted 71 lines · Tony Lindgren
Quoted 28 lines · Kevin Hilman
Quoted 26 lines · Kevin Hilman
Quoted 6 lines · Tony Lindgren

Hi,

Quoted 3 lines · 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.

Quoted 6 lines
Quoted 4 lines

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.

Quoted 7 lines

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.

Quoted 7 lines
Quoted 3 lines

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

Quoted 25 lines

Kevin

commit 106588e30f070d9a8d5906d409e0b9aad89edc9e

Author: Tero Kristo <[email protected]>
Date:   Thu Oct 9 17:47:02 2008 +0300

OMAP3: SRAM size fix for HS/EMU devices

arch/arm/plat-omap/sram.c +1 -3
old mode 100644
new mode 100755
index 65006df..f40bd2d
@@ -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) {
Quoted 8 lines
Quoted 4 lines

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 138

Quoted 4 lines
arch/arm/plat-omap/sram.c +4 -0
+					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

Quoted 15 lines
Quoted 12 lines

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 145

Quoted 7 lines
arch/arm/plat-omap/sram.c +4 -0
+					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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

- Paul

#11 lore raw
Quoted 105 lines

-----Original Message-----
From: ext Tony Lindgren [mailto:[email protected]]
Sent: 17 June, 2009 12:58
To: Paul Walmsley
Cc: Kristo Tero (Nokia-D/Tampere); Kevin Hilman; [email protected]
Subject: Re: [PATCH 0/2] adding back some features

Quoted 14 lines · Paul Walmsley

code comment below:

Quoted 10 lines · Tony Lindgren
Quoted 9 lines · Kevin Hilman
Quoted 7 lines · Kevin Hilman
Quoted 5 lines · Tony Lindgren

Hi,

Quoted 2 lines · 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.

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 5 lines

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?

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

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

Quoted 4 lines

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

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 3 lines

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

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

the other upcoming driver submissions from TI will have a dependency as well since there is still some missing

EMU/HS support ind drivers.

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

Also, I'm carrying this SRAM patch below for HS/EMU that

could go

Quoted 1 line
Quoted 1 line
Quoted 1 line

into Paul's SRAM/SDRC queue if this omap_type() gets

merged sooner

Quoted 3 lines
Quoted 3 lines
Quoted 1 line

rather than later.

Hmm, the HS omap sram.c patch below for sure justifies

fixing it as

Quoted 14 lines
Quoted 14 lines

incorrect SRAM size can cause nasty bugs.

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

Regards,

Tony

Quoted 6 lines

Kevin

commit 106588e30f070d9a8d5906d409e0b9aad89edc9e

Author: Tero Kristo <[email protected]>
Date:   Thu Oct 9 17:47:02 2008 +0300
Quoted 6 lines
Quoted 6 lines

Review

Quoted 6 lines

OMAP3: SRAM size fix for HS/EMU devices

(quoted diff) +0 -0

b/arch/arm/plat-omap/sram.c

Quoted 8 lines
Quoted 8 lines

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 134

Quoted 8 lines

old mode 100644 new mode 100755 index 65006df..f40bd2d

arch/arm/plat-omap/sram.c +0 -1
@@ -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;

Quoted 1 line
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 135

Quoted 1 line
arch/arm/plat-omap/sram.c +0 -1
-				omap_sram_start = 

OMAP3_SRAM_PUB_PA;

Quoted 1 line
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 136

Quoted 1 line
arch/arm/plat-omap/sram.c +0 -1
-				omap_sram_size = 

0x8000; /* 32K */

Quoted 1 line
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 134

Quoted 1 line
arch/arm/plat-omap/sram.c +1 -0
+				if (omap_type() == 

OMAP2_DEVICE_TYPE_GP) {

Quoted 1 line
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 135

Quoted 1 line
arch/arm/plat-omap/sram.c +1 -0
+					omap_sram_base 

= OMAP3_SRAM_PUB_VA;

Quoted 1 line
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 136

Quoted 1 line
arch/arm/plat-omap/sram.c +1 -0
+					omap_sram_start 

= OMAP3_SRAM_PUB_PA;

Quoted 1 line
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 137

Quoted 1 line
arch/arm/plat-omap/sram.c +1 -0
+					omap_sram_size 

= 0x8000; /* 32K */

Quoted 3 lines
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 138

Quoted 1 line
arch/arm/plat-omap/sram.c +1 -0
+				} else {

This would be better if it specifically tested for HS and

Quoted 6 lines

EMU devices.

Quoted 2 lines

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

Quoted 25 lines

Tony

Quoted 1 line
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 139

Quoted 1 line
arch/arm/plat-omap/sram.c +1 -0
+					omap_sram_base 

= OMAP3_SRAM_PUB_VA;

Quoted 1 line
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 140

Quoted 1 line
arch/arm/plat-omap/sram.c +1 -0
+					omap_sram_start 

= OMAP3_SRAM_PUB_PA;

Quoted 1 line
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 141

Quoted 1 line
arch/arm/plat-omap/sram.c +1 -0
+					omap_sram_size 

= 0x7000; /* 28K */

Quoted 3 lines
Quoted 3 lines

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void)

Quoted 3 lines
arch/arm/plat-omap/sram.c +1 -0
+				}
 			} else {
 				omap_sram_base = 

OMAP2_SRAM_PUB_VA;

Quoted 1 line
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 145

Quoted 1 line
arch/arm/plat-omap/sram.c +0 -0
 				omap_sram_start = 

OMAP2_SRAM_PUB_PA;

Quoted 8 lines
Quoted 5 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

- Paul

#12 lore raw
Quoted 5 lines · <[email protected]> writes:
Quoted 5 lines
Quoted 4 lines

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"

Quoted 8 lines
Quoted 2 lines

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

#13 lore raw
In reply to [email protected]
Quoted 105 lines · <[email protected]> writes:
Quoted 105 lines

-----Original Message-----
From: ext Tony Lindgren [mailto:[email protected]]
Sent: 17 June, 2009 12:58
To: Paul Walmsley
Cc: Kristo Tero (Nokia-D/Tampere); Kevin Hilman; [email protected]
Subject: Re: [PATCH 0/2] adding back some features

Quoted 14 lines · Paul Walmsley

code comment below:

Quoted 10 lines · Tony Lindgren
Quoted 9 lines · Kevin Hilman
Quoted 7 lines · Kevin Hilman
Quoted 5 lines · Tony Lindgren

Hi,

Quoted 2 lines · 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.

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 5 lines

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?

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

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

Quoted 4 lines

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

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 3 lines

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

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

the other upcoming driver submissions from TI will have a dependency as well since there is still some missing

EMU/HS support ind drivers.

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

Also, I'm carrying this SRAM patch below for HS/EMU that

could go

Quoted 1 line
Quoted 1 line
Quoted 1 line

into Paul's SRAM/SDRC queue if this omap_type() gets

merged sooner

Quoted 3 lines
Quoted 3 lines
Quoted 1 line

rather than later.

Hmm, the HS omap sram.c patch below for sure justifies

fixing it as

Quoted 14 lines
Quoted 14 lines

incorrect SRAM size can cause nasty bugs.

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

Regards,

Tony

Quoted 6 lines

Kevin

commit 106588e30f070d9a8d5906d409e0b9aad89edc9e

Author: Tero Kristo <[email protected]>
Date:   Thu Oct 9 17:47:02 2008 +0300
Quoted 6 lines
Quoted 6 lines

Review

Quoted 6 lines

OMAP3: SRAM size fix for HS/EMU devices

(quoted diff) +0 -0

b/arch/arm/plat-omap/sram.c

Quoted 8 lines
Quoted 8 lines

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 134

Quoted 8 lines

old mode 100644 new mode 100755 index 65006df..f40bd2d

arch/arm/plat-omap/sram.c +0 -1
@@ -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;

Quoted 1 line
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 135

Quoted 1 line
arch/arm/plat-omap/sram.c +0 -1
-				omap_sram_start = 

OMAP3_SRAM_PUB_PA;

Quoted 1 line
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 136

Quoted 1 line
arch/arm/plat-omap/sram.c +0 -1
-				omap_sram_size = 

0x8000; /* 32K */

Quoted 1 line
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 134

Quoted 1 line
arch/arm/plat-omap/sram.c +1 -0
+				if (omap_type() == 

OMAP2_DEVICE_TYPE_GP) {

Quoted 1 line
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 135

Quoted 1 line
arch/arm/plat-omap/sram.c +1 -0
+					omap_sram_base 

= OMAP3_SRAM_PUB_VA;

Quoted 1 line
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 136

Quoted 1 line
arch/arm/plat-omap/sram.c +1 -0
+					omap_sram_start 

= OMAP3_SRAM_PUB_PA;

Quoted 1 line
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 137

Quoted 1 line
arch/arm/plat-omap/sram.c +1 -0
+					omap_sram_size 

= 0x8000; /* 32K */

Quoted 3 lines
Quoted 1 line

arch/arm/plat-omap/sram.c void __init omap_detect_sram(void) · line 138

Quoted 1 line
arch/arm/plat-omap/sram.c +1 -0
+				} else {

This would be better if it specifically tested for HS and

Quoted 9 lines
Quoted 6 lines

EMU devices.

Quoted 2 lines

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

maintainer
#14 lore raw

cover adding back some features

In reply to Kevin Hilman

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