From: Benoit Parrot <bparrot@ti.com>
To: Tony Lindgren <tony@atomide.com>, Tero Kristo <t-kristo@ti.com>,
Rob Herring <robh+dt@kernel.org>
Cc: <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-omap@vger.kernel.org>, <linux-media@vger.kernel.org>,
Benoit Parrot <bparrot@ti.com>
Subject: [Patch 2/6] ARM: DRA7: hwmod: Add CAL nodes
Date: Thu, 12 Oct 2017 14:27:15 -0500 [thread overview]
Message-ID: <20171012192719.15193-3-bparrot@ti.com> (raw)
In-Reply-To: <20171012192719.15193-1-bparrot@ti.com>
This patch adds the required hwmod nodes to support the Camera
Adaptation Layer (CAL) for the DRA72 family of devices.
- Added CAL hwmod entry in the DRA72x section.
The DRA72x TRM (Literature Number SPRUHP2x) states that CAL only
support NO_IDLE, FORCE_IDLE and SMART_IDLE.
Although CAL does not support standby mode per se hwmod would not
enabled the functional/interface clock if module is not a master.
Hence the SWSUP mode flags ifor SIDLE ans MSTANDBY are also enabled.
This ensure that i/f clocks are available when CAL is enabled.
Signed-off-by: Benoit Parrot <bparrot@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 44 +++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index 2f4f7002f38d..fc53b498975c 100644
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -240,6 +240,41 @@ static struct omap_hwmod dra7xx_bb2d_hwmod = {
};
/*
+ * 'cal' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_cal_sysc = {
+ .sysc_offs = 0x0010,
+ .sysc_flags = (SYSC_HAS_SIDLEMODE | SYSC_HAS_RESET_STATUS |
+ SYSC_HAS_SOFTRESET | SYSC_HAS_MIDLEMODE),
+ .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+ MSTANDBY_FORCE | MSTANDBY_NO),
+ .sysc_fields = &omap_hwmod_sysc_type2,
+};
+
+static struct omap_hwmod_class dra7xx_cal_hwmod_class = {
+ .name = "cal",
+ .sysc = &dra7xx_cal_sysc,
+};
+
+/* cal */
+static struct omap_hwmod dra7xx_cal_hwmod = {
+ .name = "cal",
+ .class = &dra7xx_cal_hwmod_class,
+ .clkdm_name = "cam_clkdm",
+ .main_clk = "vip2_gclk_mux",
+ .flags = (HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY),
+ .prcm = {
+ .omap4 = {
+ .clkctrl_offs = DRA7XX_CM_CAM_VIP2_CLKCTRL_OFFSET,
+ .context_offs = DRA7XX_RM_CAM_VIP2_CONTEXT_OFFSET,
+ .modulemode = MODULEMODE_HWCTRL,
+ },
+ },
+};
+
+/*
* 'counter' class
*
*/
@@ -3901,6 +3936,14 @@ static struct omap_hwmod_ocp_if dra7xx_l4_per2__vcp2 = {
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
+/* l4_per3 -> cal */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__cal = {
+ .master = &dra7xx_l4_per3_hwmod,
+ .slave = &dra7xx_cal_hwmod,
+ .clk = "l3_iclk_div",
+ .user = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
/* l4_wkup -> wd_timer2 */
static struct omap_hwmod_ocp_if dra7xx_l4_wkup__wd_timer2 = {
.master = &dra7xx_l4_wkup_hwmod,
@@ -4082,6 +4125,7 @@ static struct omap_hwmod_ocp_if *dra74x_hwmod_ocp_ifs[] __initdata = {
};
static struct omap_hwmod_ocp_if *dra72x_hwmod_ocp_ifs[] __initdata = {
+ &dra7xx_l4_per3__cal,
NULL,
};
--
2.9.0
next prev parent reply other threads:[~2017-10-12 19:27 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-12 19:27 [Patch 0/6] ARM: dts/hwmod: Add CAL and VPE nodes Benoit Parrot
2017-10-12 19:27 ` [Patch 1/6] ARM: dts: DRA72: Add CAL dtsi node Benoit Parrot
2017-10-13 16:54 ` Tony Lindgren
2017-10-13 16:55 ` Benoit Parrot
2017-10-12 19:27 ` Benoit Parrot [this message]
2017-10-13 16:56 ` [Patch 2/6] ARM: DRA7: hwmod: Add CAL nodes Tony Lindgren
2017-10-13 17:58 ` Benoit Parrot
2017-10-12 19:27 ` [Patch 3/6] ARM: OMAP: DRA7xx: Make CAM clock domain SWSUP only Benoit Parrot
2017-10-13 17:01 ` Tony Lindgren
2017-10-13 17:59 ` Benoit Parrot
2017-10-13 18:03 ` Tony Lindgren
2017-10-12 19:27 ` [Patch 4/6] dt-bindings: media: ti-vpe: Document VPE driver Benoit Parrot
2017-10-17 21:00 ` Rob Herring
2017-10-18 13:02 ` Benoit Parrot
2017-10-19 21:06 ` Rob Herring
2017-10-19 21:20 ` Tony Lindgren
2017-10-12 19:27 ` [Patch 5/6] ARM: DRA7: hwmod: Add VPE nodes Benoit Parrot
2017-10-13 17:05 ` Tony Lindgren
2017-10-13 18:05 ` Benoit Parrot
2017-10-13 19:01 ` Tony Lindgren
2017-10-12 19:27 ` [Patch 6/6] ARM: dts: dra7: Add VPE dtsi node Benoit Parrot
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=20171012192719.15193-3-bparrot@ti.com \
--to=bparrot@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=t-kristo@ti.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
all inboxes | Powered by JetHome®