From: Vaibhav Hiremath <hvaibhav@ti.com>
To: linux-omap@vger.kernel.org
Cc: tony@atomide.com, linux-arm-kernel@lists.infradead.org,
Vaibhav Hiremath <hvaibhav@ti.com>
Subject: [PATCH-V2] ARM: OMAP: cpu: Make cpu_class_is_omap2 true for all non-omap1 platforms
Date: Fri, 29 Jun 2012 16:58:26 +0530 [thread overview]
Message-ID: <1340969306-28464-1-git-send-email-hvaibhav@ti.com> (raw)
As omap1 and omap2 will never be compiled together, due to
different compiler flags, so we can simply make
cpu_class_is_omap2() = true, for all non-omap1 platforms.
In order to fix build error from plat-omap/sram.c file,
omap_type() function is encapsulated under #ifdef CONFIG_ARCH_OMAP2PLUS.
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
CC: Tony Lindgren <tony@atomide.com>
---
Boot tested on Beable Bone, AM37x EVM and build tested for omap1.
It would be helpful if someone can test it on omap1 platform.
Change from V1:
- Fix omap1 build failure, by adding inline function
for omap_type().
arch/arm/plat-omap/include/plat/cpu.h | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index 8c84d05..c3617e2 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -42,7 +42,18 @@
#define OMAP2_DEVICE_TYPE_GP 3
#define OMAP2_DEVICE_TYPE_BAD 4
+#ifdef CONFIG_ARCH_OMAP2PLUS
int omap_type(void);
+#else
+static inline int omap_type(void)
+{
+ /*
+ * Safe to return 0, since this function will not
+ * be called for omap1.
+ */
+ return 0;
+}
+#endif
/*
* omap_rev bits:
@@ -358,8 +369,7 @@ IS_OMAP_TYPE(3430, 0x3430)
/* Macros to detect if we have OMAP1 or OMAP2 */
#define cpu_class_is_omap1() (cpu_is_omap7xx() || cpu_is_omap15xx() || \
cpu_is_omap16xx())
-#define cpu_class_is_omap2() (cpu_is_omap24xx() || cpu_is_omap34xx() || \
- cpu_is_omap44xx())
+#define cpu_class_is_omap2() !cpu_class_is_omap1()
/* Various silicon revisions for omap2 */
#define OMAP242X_CLASS 0x24200024
--
1.7.0.4
WARNING: multiple messages have this Message-ID (diff)
From: hvaibhav@ti.com (Vaibhav Hiremath)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH-V2] ARM: OMAP: cpu: Make cpu_class_is_omap2 true for all non-omap1 platforms
Date: Fri, 29 Jun 2012 16:58:26 +0530 [thread overview]
Message-ID: <1340969306-28464-1-git-send-email-hvaibhav@ti.com> (raw)
As omap1 and omap2 will never be compiled together, due to
different compiler flags, so we can simply make
cpu_class_is_omap2() = true, for all non-omap1 platforms.
In order to fix build error from plat-omap/sram.c file,
omap_type() function is encapsulated under #ifdef CONFIG_ARCH_OMAP2PLUS.
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
CC: Tony Lindgren <tony@atomide.com>
---
Boot tested on Beable Bone, AM37x EVM and build tested for omap1.
It would be helpful if someone can test it on omap1 platform.
Change from V1:
- Fix omap1 build failure, by adding inline function
for omap_type().
arch/arm/plat-omap/include/plat/cpu.h | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index 8c84d05..c3617e2 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -42,7 +42,18 @@
#define OMAP2_DEVICE_TYPE_GP 3
#define OMAP2_DEVICE_TYPE_BAD 4
+#ifdef CONFIG_ARCH_OMAP2PLUS
int omap_type(void);
+#else
+static inline int omap_type(void)
+{
+ /*
+ * Safe to return 0, since this function will not
+ * be called for omap1.
+ */
+ return 0;
+}
+#endif
/*
* omap_rev bits:
@@ -358,8 +369,7 @@ IS_OMAP_TYPE(3430, 0x3430)
/* Macros to detect if we have OMAP1 or OMAP2 */
#define cpu_class_is_omap1() (cpu_is_omap7xx() || cpu_is_omap15xx() || \
cpu_is_omap16xx())
-#define cpu_class_is_omap2() (cpu_is_omap24xx() || cpu_is_omap34xx() || \
- cpu_is_omap44xx())
+#define cpu_class_is_omap2() !cpu_class_is_omap1()
/* Various silicon revisions for omap2 */
#define OMAP242X_CLASS 0x24200024
--
1.7.0.4
next reply other threads:[~2012-06-29 11:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-29 11:28 Vaibhav Hiremath [this message]
2012-06-29 11:28 ` [PATCH-V2] ARM: OMAP: cpu: Make cpu_class_is_omap2 true for all non-omap1 platforms Vaibhav Hiremath
2012-07-03 13:08 ` Hiremath, Vaibhav
2012-07-03 13:08 ` Hiremath, Vaibhav
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1340969306-28464-1-git-send-email-hvaibhav@ti.com \
--to=hvaibhav@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.