From: Vaibhav Hiremath <hvaibhav@ti.com>
To: linux-omap@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org, marc.zyngier@arm.com,
johnstul@us.ibm.com, Vaibhav Hiremath <hvaibhav@ti.com>,
Felipe Balbi <balbi@ti.com>, Benoit Cousson <b-cousson@ti.com>,
Tony Lindgren <tony@atomide.com>, Paul Walmsley <paul@pwsan.com>
Subject: [PATCH 3/3] ARM: OMAP2+: hwmod data: Add 32k-sync timer data to hwmod database
Date: Thu, 19 Jan 2012 19:58:24 +0530 [thread overview]
Message-ID: <1326983304-14619-4-git-send-email-hvaibhav@ti.com> (raw)
In-Reply-To: <1326983304-14619-1-git-send-email-hvaibhav@ti.com>
Add 32k-sync timer hwmod data to omap2 & 3 hwmod table
and also enable existing hwmod data for omap4 (was disabled before).
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Paul Walmsley <paul@pwsan.com>
---
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 53 ++++++++++++++++++++++++++++
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 52 +++++++++++++++++++++++++++
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 51 ++++++++++++++++++++++++++
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
4 files changed, 157 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index a5409ce..2091a5c 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -54,6 +54,7 @@ static struct omap_hwmod omap2420_gpio4_hwmod;
static struct omap_hwmod omap2420_dma_system_hwmod;
static struct omap_hwmod omap2420_mcspi1_hwmod;
static struct omap_hwmod omap2420_mcspi2_hwmod;
+static struct omap_hwmod omap2420_counter_32k_hwmod;
/* L3 -> L4_CORE interface */
static struct omap_hwmod_ocp_if omap2420_l3_main__l4_core = {
@@ -1513,6 +1514,55 @@ static struct omap_hwmod omap2420_mcbsp2_hwmod = {
.slaves_cnt = ARRAY_SIZE(omap2420_mcbsp2_slaves),
};
+/*
+ * '32K sync counter' class
+ * 32-bit ordinary counter, clocked by the falling edge of the 32 khz clock
+ */
+static struct omap_hwmod_class omap2420_counter_hwmod_class = {
+ .name = "counter",
+};
+
+/* counter_32k */
+static struct omap_hwmod_addr_space omap2420_counter_32k_addrs[] = {
+ {
+ .pa_start = 0x48004000,
+ .pa_end = 0x48004000 + SZ_4K,
+ .flags = ADDR_TYPE_RT
+ },
+ { }
+};
+
+/* l4_wkup -> counter_32k */
+static struct omap_hwmod_ocp_if omap2420_l4_wkup__counter_32k = {
+ .master = &omap2420_l4_wkup_hwmod,
+ .slave = &omap2420_counter_32k_hwmod,
+ .clk = "l4_ck",
+ .addr = omap2420_counter_32k_addrs,
+ .user = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* counter_32k slave ports */
+static struct omap_hwmod_ocp_if *omap2420_counter_32k_slaves[] = {
+ &omap2420_l4_wkup__counter_32k,
+};
+
+static struct omap_hwmod omap2420_counter_32k_hwmod = {
+ .name = "counter_32k",
+ .class = &omap2420_counter_hwmod_class,
+ .main_clk = "sync_32k_ick",
+ .prcm = {
+ .omap2 = {
+ .module_offs = WKUP_MOD,
+ .prcm_reg_id = 1,
+ .module_bit = OMAP24XX_ST_32KSYNC_SHIFT,
+ .idlest_reg_id = 1,
+ .idlest_idle_bit = OMAP24XX_ST_32KSYNC_SHIFT,
+ },
+ },
+ .slaves = omap2420_counter_32k_slaves,
+ .slaves_cnt = ARRAY_SIZE(omap2420_counter_32k_slaves),
+};
+
static __initdata struct omap_hwmod *omap2420_hwmods[] = {
&omap2420_l3_main_hwmod,
&omap2420_l4_core_hwmod,
@@ -1565,6 +1615,9 @@ static __initdata struct omap_hwmod *omap2420_hwmods[] = {
/* mcspi class */
&omap2420_mcspi1_hwmod,
&omap2420_mcspi2_hwmod,
+
+ /* 32k sync timer */
+ &omap2420_counter_32k_hwmod,
NULL,
};
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index c4f56cb..f7cc4bb 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -64,6 +64,7 @@ static struct omap_hwmod omap2430_mcspi2_hwmod;
static struct omap_hwmod omap2430_mcspi3_hwmod;
static struct omap_hwmod omap2430_mmc1_hwmod;
static struct omap_hwmod omap2430_mmc2_hwmod;
+static struct omap_hwmod omap2430_counter_32k_hwmod;
/* L3 -> L4_CORE interface */
static struct omap_hwmod_ocp_if omap2430_l3_main__l4_core = {
@@ -2001,6 +2002,55 @@ static struct omap_hwmod omap2430_mmc2_hwmod = {
.class = &omap2430_mmc_class,
};
+/*
+ * '32K sync counter' class
+ * 32-bit ordinary counter, clocked by the falling edge of the 32 khz clock
+ */
+static struct omap_hwmod_class omap2430_counter_hwmod_class = {
+ .name = "counter",
+};
+
+/* counter_32k */
+static struct omap_hwmod_addr_space omap2430_counter_32k_addrs[] = {
+ {
+ .pa_start = 0x49020000,
+ .pa_end = 0x49020000 + SZ_4K,
+ .flags = ADDR_TYPE_RT
+ },
+ { }
+};
+
+/* l4_wkup -> counter_32k */
+static struct omap_hwmod_ocp_if omap2430_l4_wkup__counter_32k = {
+ .master = &omap2430_l4_wkup_hwmod,
+ .slave = &omap2430_counter_32k_hwmod,
+ .clk = "l4_ck",
+ .addr = omap2430_counter_32k_addrs,
+ .user = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* counter_32k slave ports */
+static struct omap_hwmod_ocp_if *omap2430_counter_32k_slaves[] = {
+ &omap2430_l4_wkup__counter_32k,
+};
+
+static struct omap_hwmod omap2430_counter_32k_hwmod = {
+ .name = "counter_32k",
+ .class = &omap2430_counter_hwmod_class,
+ .main_clk = "sync_32k_ick",
+ .prcm = {
+ .omap2 = {
+ .module_offs = WKUP_MOD,
+ .prcm_reg_id = 1,
+ .module_bit = OMAP24XX_ST_32KSYNC_SHIFT,
+ .idlest_reg_id = 1,
+ .idlest_idle_bit = OMAP24XX_ST_32KSYNC_SHIFT,
+ },
+ },
+ .slaves = omap2430_counter_32k_slaves,
+ .slaves_cnt = ARRAY_SIZE(omap2430_counter_32k_slaves),
+};
+
static __initdata struct omap_hwmod *omap2430_hwmods[] = {
&omap2430_l3_main_hwmod,
&omap2430_l4_core_hwmod,
@@ -2064,6 +2114,8 @@ static __initdata struct omap_hwmod *omap2430_hwmods[] = {
/* usbotg class*/
&omap2430_usbhsotg_hwmod,
+ /* 32k sync timer */
+ &omap2430_counter_32k_hwmod,
NULL,
};
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 5324e8d..19a3591 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -86,6 +86,7 @@ static struct omap_hwmod omap3xxx_mcbsp2_sidetone_hwmod;
static struct omap_hwmod omap3xxx_mcbsp3_sidetone_hwmod;
static struct omap_hwmod omap3xxx_usb_host_hs_hwmod;
static struct omap_hwmod omap3xxx_usb_tll_hs_hwmod;
+static struct omap_hwmod omap3xxx_counter_32k_hwmod;
/* L3 -> L4_CORE interface */
static struct omap_hwmod_ocp_if omap3xxx_l3_main__l4_core = {
@@ -3498,6 +3499,55 @@ static struct omap_hwmod omap3xxx_usb_tll_hs_hwmod = {
.slaves_cnt = ARRAY_SIZE(omap3xxx_usb_tll_hs_slaves),
};
+/*
+ * '32K sync counter' class
+ * 32-bit ordinary counter, clocked by the falling edge of the 32 khz clock
+ */
+static struct omap_hwmod_class omap3xxx_counter_hwmod_class = {
+ .name = "counter",
+};
+
+/* counter_32k */
+static struct omap_hwmod_addr_space omap3xxx_counter_32k_addrs[] = {
+ {
+ .pa_start = 0x48320000,
+ .pa_end = 0x48320000 + SZ_4K,
+ .flags = ADDR_TYPE_RT
+ },
+ { }
+};
+
+/* l4_wkup -> counter_32k */
+static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__counter_32k = {
+ .master = &omap3xxx_l4_wkup_hwmod,
+ .slave = &omap3xxx_counter_32k_hwmod,
+ .clk = "wkup_l4_ick",
+ .addr = omap3xxx_counter_32k_addrs,
+ .user = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* counter_32k slave ports */
+static struct omap_hwmod_ocp_if *omap3xxx_counter_32k_slaves[] = {
+ &omap3xxx_l4_wkup__counter_32k,
+};
+
+static struct omap_hwmod omap3xxx_counter_32k_hwmod = {
+ .name = "counter_32k",
+ .class = &omap3xxx_counter_hwmod_class,
+ .main_clk = "omap_32ksync_ick",
+ .prcm = {
+ .omap2 = {
+ .module_offs = WKUP_MOD,
+ .prcm_reg_id = 1,
+ .module_bit = OMAP3430_ST_32KSYNC_SHIFT,
+ .idlest_reg_id = 1,
+ .idlest_idle_bit = OMAP3430_ST_32KSYNC_SHIFT,
+ },
+ },
+ .slaves = omap3xxx_counter_32k_slaves,
+ .slaves_cnt = ARRAY_SIZE(omap3xxx_counter_32k_slaves),
+};
+
static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
&omap3xxx_l3_main_hwmod,
&omap3xxx_l4_core_hwmod,
@@ -3561,6 +3611,7 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
&omap34xx_mcspi3,
&omap34xx_mcspi4,
+ &omap3xxx_counter_32k_hwmod,
NULL,
};
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index f9f1510..cd60b13 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -5510,7 +5510,7 @@ static __initdata struct omap_hwmod *omap44xx_hwmods[] = {
&omap44xx_bandgap_hwmod,
/* counter class */
-/* &omap44xx_counter_32k_hwmod, */
+ &omap44xx_counter_32k_hwmod,
/* dma class */
&omap44xx_dma_system_hwmod,
--
1.7.0.4
next prev parent reply other threads:[~2012-01-19 14:34 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-19 14:28 [PATCH 0/3] ARM: OMAP1/2+: 32k-timer: Add hwmod lookup for 32k-timer Vaibhav Hiremath
2012-01-19 14:28 ` [PATCH 1/3] ARM: OMAP2+: 32k-counter: Use hwmod lookup to check presence of 32k timer Vaibhav Hiremath
2012-01-23 23:38 ` Kevin Hilman
2012-01-24 8:53 ` Hiremath, Vaibhav
2012-01-24 17:47 ` Kevin Hilman
2012-02-01 8:00 ` Hiremath, Vaibhav
2012-03-13 11:37 ` Ming Lei
2012-03-19 11:11 ` Hiremath, Vaibhav
2012-03-19 11:44 ` Ming Lei
2012-03-19 12:15 ` Santosh Shilimkar
2012-03-21 11:42 ` Hiremath, Vaibhav
2012-03-21 14:00 ` Shilimkar, Santosh
2012-03-28 14:16 ` Hiremath, Vaibhav
2012-03-28 14:20 ` Shilimkar, Santosh
2012-03-28 14:37 ` Hiremath, Vaibhav
2012-03-28 14:49 ` Shilimkar, Santosh
2012-03-30 6:34 ` Hiremath, Vaibhav
2012-03-30 7:41 ` Shilimkar, Santosh
2012-03-30 8:32 ` Hiremath, Vaibhav
2012-03-30 8:38 ` Santosh Shilimkar
2012-03-30 9:12 ` Hiremath, Vaibhav
2012-03-30 9:20 ` Shilimkar, Santosh
2012-03-30 9:28 ` Hiremath, Vaibhav
2012-03-30 9:42 ` Shilimkar, Santosh
2012-03-30 11:29 ` Hiremath, Vaibhav
2012-03-30 11:35 ` Santosh Shilimkar
2012-03-31 1:30 ` Ming Lei
2012-03-31 6:30 ` Shilimkar, Santosh
2012-03-31 8:39 ` Ming Lei
2012-03-31 19:10 ` Shilimkar, Santosh
2012-04-01 1:39 ` Ming Lei
2012-04-01 5:53 ` Shilimkar, Santosh
2012-04-02 18:35 ` Kevin Hilman
2012-04-03 5:50 ` Shilimkar, Santosh
2012-04-03 15:35 ` Hiremath, Vaibhav
2012-04-04 9:04 ` Shilimkar, Santosh
2012-04-04 10:39 ` Hiremath, Vaibhav
2012-04-05 9:36 ` Hiremath, Vaibhav
2012-04-05 9:52 ` Russell King - ARM Linux
2012-04-05 10:31 ` Hiremath, Vaibhav
2012-04-05 10:46 ` Santosh Shilimkar
2012-04-05 21:33 ` Kevin Hilman
2012-04-06 5:21 ` Hiremath, Vaibhav
2012-04-06 18:04 ` Tony Lindgren
2012-04-09 6:19 ` Hiremath, Vaibhav
2012-04-09 20:18 ` Jon Hunter
2012-04-10 5:42 ` Hiremath, Vaibhav
2012-04-10 8:44 ` Russell King - ARM Linux
2012-04-10 8:57 ` Santosh Shilimkar
2012-04-10 9:29 ` Russell King - ARM Linux
2012-04-10 9:51 ` Shilimkar, Santosh
2012-04-10 21:03 ` Jon Hunter
2012-04-11 1:00 ` Ming Lei
2012-04-11 7:47 ` Shilimkar, Santosh
2012-04-06 21:18 ` Kevin Hilman
2012-04-09 6:25 ` Hiremath, Vaibhav
2012-03-21 11:29 ` Hiremath, Vaibhav
2012-03-23 8:20 ` Ming Lei
2012-03-30 6:39 ` Hiremath, Vaibhav
2012-03-05 22:55 ` Tony Lindgren
2012-03-07 9:48 ` Hiremath, Vaibhav
2012-03-09 17:58 ` Hiremath, Vaibhav
2012-03-12 9:39 ` Felipe Balbi
2012-03-12 9:48 ` Hiremath, Vaibhav
2012-03-12 10:17 ` Felipe Balbi
2012-03-12 10:39 ` Hiremath, Vaibhav
2012-01-19 14:28 ` [PATCH 2/3] ARM: OMAP2/3: Add idle_st bits for ST_32KSYNC timer to prcm-common header Vaibhav Hiremath
2012-03-05 22:56 ` Tony Lindgren
2012-03-07 9:49 ` Hiremath, Vaibhav
2012-01-19 14:28 ` Vaibhav Hiremath [this message]
2012-01-23 8:47 ` [PATCH 0/3] ARM: OMAP1/2+: 32k-timer: Add hwmod lookup for 32k-timer Hiremath, Vaibhav
2012-03-05 22:57 ` Tony Lindgren
2012-03-07 9:50 ` 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=1326983304-14619-4-git-send-email-hvaibhav@ti.com \
--to=hvaibhav@ti.com \
--cc=b-cousson@ti.com \
--cc=balbi@ti.com \
--cc=johnstul@us.ibm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=paul@pwsan.com \
--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 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).