From: Tarun Kanti DebBarma <tarun.kanti@ti.com>
To: linux-omap@vger.kernel.org
Cc: Tarun Kanti DebBarma <tarun.kanti@ti.com>,
"Cousson, Benoit" <b-cousson@ti.com>
Subject: [PATCH v12 2/9] OMAP4: hwmod data: add dmtimer version information
Date: Wed, 9 Mar 2011 05:15:41 +0530 [thread overview]
Message-ID: <1299627948-20040-3-git-send-email-tarun.kanti@ti.com> (raw)
In-Reply-To: <1299627948-20040-1-git-send-email-tarun.kanti@ti.com>
OMAP4 has two groups of timers: version 1 timers are 1, 2, 10,
while the rest of the timers, 3-9, 11 are version 2 timers.
The version information is required by the driver so that they
could be handled correctly by it.
Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Acked-by: Cousson, Benoit <b-cousson@ti.com>
Cc: Cousson, Benoit <b-cousson@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 +++
arch/arm/plat-omap/include/plat/dmtimer.h | 4 +++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 7dbcdf7..9a34e20 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -27,6 +27,7 @@
#include <plat/mcspi.h>
#include <plat/mcbsp.h>
#include <plat/mmc.h>
+#include <plat/dmtimer.h>
#include "omap_hwmod_common_data.h"
@@ -3956,6 +3957,7 @@ static struct omap_hwmod_class_sysconfig omap44xx_timer_1ms_sysc = {
static struct omap_hwmod_class omap44xx_timer_1ms_hwmod_class = {
.name = "timer",
.sysc = &omap44xx_timer_1ms_sysc,
+ .rev = OMAP_TIMER_IP_VERSION_1,
};
static struct omap_hwmod_class_sysconfig omap44xx_timer_sysc = {
@@ -3971,6 +3973,7 @@ static struct omap_hwmod_class_sysconfig omap44xx_timer_sysc = {
static struct omap_hwmod_class omap44xx_timer_hwmod_class = {
.name = "timer",
.sysc = &omap44xx_timer_sysc,
+ .rev = OMAP_TIMER_IP_VERSION_2,
};
/* timer1 */
diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h b/arch/arm/plat-omap/include/plat/dmtimer.h
index d6c70d2..e3d477d 100644
--- a/arch/arm/plat-omap/include/plat/dmtimer.h
+++ b/arch/arm/plat-omap/include/plat/dmtimer.h
@@ -54,7 +54,9 @@
* IP revision identifier so that Highlander IP
* in OMAP4 can be distinguished.
*/
-#define OMAP_TIMER_IP_VERSION_1 0x1
+#define OMAP_TIMER_IP_VERSION_1 0x1
+#define OMAP_TIMER_IP_VERSION_2 0x2
+
struct omap_dm_timer;
extern struct omap_dm_timer *gptimer_wakeup;
extern struct sys_timer omap_timer;
--
1.6.0.4
next prev parent reply other threads:[~2011-03-08 23:43 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-08 23:45 [PATCH v12 0/9] dmtimer adaptation to platform_driver Tarun Kanti DebBarma
2011-03-08 23:45 ` [PATCH v12 1/9] OMAP2+: dmtimer: add device names to flck nodes Tarun Kanti DebBarma
2011-03-08 23:45 ` Tarun Kanti DebBarma [this message]
2011-03-08 23:45 ` [PATCH v12 3/9] OMAP1: dmtimer: conversion to platform devices Tarun Kanti DebBarma
2011-03-08 23:45 ` [PATCH v12 4/9] OMAP2+: dmtimer: convert " Tarun Kanti DebBarma
2011-03-09 21:42 ` Tony Lindgren
2011-03-10 15:29 ` DebBarma, Tarun Kanti
2011-03-10 22:52 ` Kevin Hilman
2011-03-11 4:36 ` DebBarma, Tarun Kanti
2011-03-10 23:14 ` Kevin Hilman
2011-03-11 4:20 ` DebBarma, Tarun Kanti
2011-03-11 19:13 ` Tony Lindgren
2011-03-12 0:03 ` Kevin Hilman
2011-03-14 17:12 ` Tony Lindgren
2011-03-17 22:00 ` Kevin Hilman
2011-03-19 0:27 ` Tony Lindgren
2011-03-19 4:34 ` Santosh Shilimkar
2011-03-21 17:07 ` Tony Lindgren
2011-03-21 18:33 ` Kevin Hilman
2011-03-21 19:11 ` Tony Lindgren
2011-03-25 6:55 ` DebBarma, Tarun Kanti
2011-03-25 15:55 ` Tony Lindgren
2011-03-29 17:13 ` Tony Lindgren
2011-03-29 17:52 ` Tony Lindgren
2011-03-10 23:21 ` Kevin Hilman
2011-03-11 4:13 ` DebBarma, Tarun Kanti
2011-03-08 23:45 ` [PATCH v12 5/9] OMAP: dmtimer: platform driver Tarun Kanti DebBarma
2011-03-08 23:45 ` [PATCH v12 6/9] dmtimer: switch-over to platform device driver Tarun Kanti DebBarma
2011-03-09 22:02 ` Tony Lindgren
2011-03-10 15:27 ` DebBarma, Tarun Kanti
2011-03-10 17:56 ` Tony Lindgren
2011-03-11 5:35 ` DebBarma, Tarun Kanti
2011-03-11 12:45 ` G, Manjunath Kondaiah
2011-03-11 19:15 ` Tony Lindgren
2011-03-12 4:20 ` G, Manjunath Kondaiah
2011-03-11 19:14 ` Tony Lindgren
2011-03-14 6:48 ` DebBarma, Tarun Kanti
2011-03-08 23:45 ` [PATCH v12 7/9] OMAP: dmtimer: pm_runtime support Tarun Kanti DebBarma
2011-03-08 23:45 ` [PATCH v12 8/9] OMAP: dmtimer: add timeout to low-level routines Tarun Kanti DebBarma
2011-03-08 23:45 ` [PATCH v12 9/9] OMAP: dmtimer: use mutex instead of spinlock Tarun Kanti DebBarma
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=1299627948-20040-3-git-send-email-tarun.kanti@ti.com \
--to=tarun.kanti@ti.com \
--cc=b-cousson@ti.com \
--cc=linux-omap@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).