* [PATCH] Add support for OMAP4460 revision detection.
@ 2012-02-10 22:53 Robert P. J. Day
2012-04-13 9:54 ` Anand Gadiyar
0 siblings, 1 reply; 3+ messages in thread
From: Robert P. J. Day @ 2012-02-10 22:53 UTC (permalink / raw)
To: U-Boot Version 2 (barebox)
Without yet adding in the underlying code, extend the revision
checking code to return additional values for PandaBoard ES boards.
Much of the code was taken close to verbatim from U-Boot.
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
--
compile tested, and confirmed that this code behaves identically to
the original panda configure and build for the three pandas i have:
* Rev A2 (boots)
* Rev EA3 (boots)
* Rev B1 ES (no output)
so while there's still work to be done, this at least represents the
necessary infrastructure to start *recognizing* panda ES boards.
diff --git a/arch/arm/mach-omap/include/mach/omap4-silicon.h b/arch/arm/mach-omap/include/mach/omap4-silicon.h
index db0dfdf..4a98f45 100644
--- a/arch/arm/mach-omap/include/mach/omap4-silicon.h
+++ b/arch/arm/mach-omap/include/mach/omap4-silicon.h
@@ -156,6 +156,9 @@ struct s32ktimer {
#define OMAP4430_ES2_0 2
#define OMAP4430_ES2_1 3
#define OMAP4430_ES2_2 4
+#define OMAP4430_ES2_3 5
+#define OMAP4460_ES1_0 6
+#define OMAP4460_ES1_1 7
struct ddr_regs {
u32 tim1;
diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c
index 5223c7e..1afd00d 100644
--- a/arch/arm/mach-omap/omap4_generic.c
+++ b/arch/arm/mach-omap/omap4_generic.c
@@ -7,6 +7,26 @@
#include <mach/syslib.h>
#include <mach/xload.h>
+/*
+ * The following several lines are taken from U-Boot to support
+ * recognizing more revisions of OMAP4 chips.
+ */
+
+#define MIDR_CORTEX_A9_R0P1 0x410FC091
+#define MIDR_CORTEX_A9_R1P2 0x411FC092
+#define MIDR_CORTEX_A9_R1P3 0x411FC093
+#define MIDR_CORTEX_A9_R2P10 0x412FC09A
+
+#define CONTROL_ID_CODE 0x4A002204
+
+#define OMAP4_CONTROL_ID_CODE_ES1_0 0x0B85202F
+#define OMAP4_CONTROL_ID_CODE_ES2_0 0x1B85202F
+#define OMAP4_CONTROL_ID_CODE_ES2_1 0x3B95C02F
+#define OMAP4_CONTROL_ID_CODE_ES2_2 0x4B95C02F
+#define OMAP4_CONTROL_ID_CODE_ES2_3 0x6B95C02F
+#define OMAP4460_CONTROL_ID_CODE_ES1_0 0x0B94E02F
+#define OMAP4460_CONTROL_ID_CODE_ES1_1 0x2B94E02F
+
void __noreturn reset_cpu(unsigned long addr)
{
writel(PRM_RSTCTRL_RESET, PRM_RSTCTRL);
@@ -359,22 +379,45 @@ static unsigned int cortex_a9_rev(void)
unsigned int omap4_revision(void)
{
- unsigned int chip_rev = 0;
unsigned int rev = cortex_a9_rev();
switch(rev) {
- case 0x410FC091:
+ case MIDR_CORTEX_A9_R0P1:
return OMAP4430_ES1_0;
- case 0x411FC092:
- chip_rev = (readl(OMAP44XX_CTRL_BASE + 0x204) >> 28) & 0xF;
- if (chip_rev == 3)
+ case MIDR_CORTEX_A9_R1P2:
+ switch (readl(CONTROL_ID_CODE)) {
+ case OMAP4_CONTROL_ID_CODE_ES2_0:
+ return OMAP4430_ES2_0;
+ break;
+ case OMAP4_CONTROL_ID_CODE_ES2_1:
return OMAP4430_ES2_1;
- else if (chip_rev >= 4)
+ break;
+ case OMAP4_CONTROL_ID_CODE_ES2_2:
return OMAP4430_ES2_2;
- else
+ break;
+ default:
return OMAP4430_ES2_0;
+ break;
+ }
+ break;
+ case MIDR_CORTEX_A9_R1P3:
+ return OMAP4430_ES2_3;
+ break;
+ case MIDR_CORTEX_A9_R2P10:
+ switch (readl(CONTROL_ID_CODE)) {
+ case OMAP4460_CONTROL_ID_CODE_ES1_1:
+ return OMAP4460_ES1_1;
+ break;
+ case OMAP4460_CONTROL_ID_CODE_ES1_0:
+ default:
+ return OMAP4460_ES1_0;
+ break;
+ }
+ break;
+ default:
+ return OMAP4430_SILICON_ID_INVALID;
+ break;
}
- return OMAP4430_SILICON_ID_INVALID;
}
/*
--
========================================================================
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
========================================================================
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Add support for OMAP4460 revision detection.
2012-02-10 22:53 [PATCH] Add support for OMAP4460 revision detection Robert P. J. Day
@ 2012-04-13 9:54 ` Anand Gadiyar
2012-04-13 10:05 ` Sascha Hauer
0 siblings, 1 reply; 3+ messages in thread
From: Anand Gadiyar @ 2012-04-13 9:54 UTC (permalink / raw)
To: Robert P. J. Day; +Cc: U-Boot Version 2 (barebox)
[-- Attachment #1.1: Type: text/plain, Size: 835 bytes --]
On Sat, Feb 11, 2012 at 4:23 AM, Robert P. J. Day <rpjday@crashcourse.ca>wrote:
>
>
> Without yet adding in the underlying code, extend the revision
> checking code to return additional values for PandaBoard ES boards.
> Much of the code was taken close to verbatim from U-Boot.
>
> Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
>
> --
>
compile tested, and confirmed that this code behaves identically to
> the original panda configure and build for the three pandas i have:
>
> * Rev A2 (boots)
> * Rev EA3 (boots)
> * Rev B1 ES (no output)
>
> so while there's still work to be done, this at least represents the
> necessary infrastructure to start *recognizing* panda ES boards.
>
>
For what it's worth,
Tested-by: Anand Gadiyar <gadiyar@ti.com>
On a Rev A3 (ES2.2) (boots) and on a REV B3 ES (no output again).
[-- Attachment #1.2: Type: text/html, Size: 1421 bytes --]
[-- Attachment #2: Type: text/plain, Size: 149 bytes --]
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Add support for OMAP4460 revision detection.
2012-04-13 9:54 ` Anand Gadiyar
@ 2012-04-13 10:05 ` Sascha Hauer
0 siblings, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2012-04-13 10:05 UTC (permalink / raw)
To: Anand Gadiyar; +Cc: U-Boot Version 2 (barebox)
On Fri, Apr 13, 2012 at 03:24:37PM +0530, Anand Gadiyar wrote:
> On Sat, Feb 11, 2012 at 4:23 AM, Robert P. J. Day <rpjday@crashcourse.ca>wrote:
>
> >
> >
> > Without yet adding in the underlying code, extend the revision
> > checking code to return additional values for PandaBoard ES boards.
> > Much of the code was taken close to verbatim from U-Boot.
> >
> > Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
> >
> > --
> >
>
> compile tested, and confirmed that this code behaves identically to
> > the original panda configure and build for the three pandas i have:
> >
> > * Rev A2 (boots)
> > * Rev EA3 (boots)
> > * Rev B1 ES (no output)
> >
> > so while there's still work to be done, this at least represents the
> > necessary infrastructure to start *recognizing* panda ES boards.
> >
> >
> For what it's worth,
>
> Tested-by: Anand Gadiyar <gadiyar@ti.com>
Thanks for testing. I forgot about this one, but I applied it now.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-04-13 10:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-10 22:53 [PATCH] Add support for OMAP4460 revision detection Robert P. J. Day
2012-04-13 9:54 ` Anand Gadiyar
2012-04-13 10:05 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox