From: Roger Quadros <rogerq@ti.com>
To: <tony@atomide.com>, Paul Walmsley <paul@pwsan.com>
Cc: <kishon@ti.com>, <george.cherian@ti.com>, <balbi@ti.com>,
<balajitk@ti.com>, <hdegoede@redhat.com>,
<linux-omap@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<devicetree@vger.kernel.org>,
Benoit Cousson <bcousson@baylibre.com>
Subject: Re: [PATCH v4 1/4] ARM: OMAP5: hwmod: Add ocp2scp3 and sata hwmods
Date: Thu, 12 Jun 2014 15:46:39 +0300 [thread overview]
Message-ID: <5399A12F.7010301@ti.com> (raw)
In-Reply-To: <1398274487-24688-1-git-send-email-rogerq@ti.com>
Tony,
Looks like we've missed this for 3.16.
cheers,
-roger
On 04/23/2014 08:34 PM, Roger Quadros wrote:
> From: Keshava Munegowda <keshava_mgowda@ti.com>
>
> Create hwmods for ocp2scp3 and sata modules.
>
> [Roger Q] Clean up.
>
> CC: Benoit Cousson <bcousson@baylibre.com>
> Acked-by: Paul Walmsley <paul@pwsan.com>
> Signed-off-by: Balaji T K <balajitk@ti.com>
> Signed-off-by: Roger Quadros <rogerq@ti.com>
> ---
> arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 73 ++++++++++++++++++++++++++++++
> 1 file changed, 73 insertions(+)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
> index 8923172..e169f90 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
> @@ -1791,6 +1791,77 @@ static struct omap_hwmod omap54xx_wd_timer2_hwmod = {
> },
> };
>
> +/*
> + * 'ocp2scp' class
> + * bridge to transform ocp interface protocol to scp (serial control port)
> + * protocol
> + */
> +/* ocp2scp3 */
> +static struct omap_hwmod omap54xx_ocp2scp3_hwmod;
> +/* l4_cfg -> ocp2scp3 */
> +static struct omap_hwmod_ocp_if omap54xx_l4_cfg__ocp2scp3 = {
> + .master = &omap54xx_l4_cfg_hwmod,
> + .slave = &omap54xx_ocp2scp3_hwmod,
> + .clk = "l4_root_clk_div",
> + .user = OCP_USER_MPU | OCP_USER_SDMA,
> +};
> +
> +static struct omap_hwmod omap54xx_ocp2scp3_hwmod = {
> + .name = "ocp2scp3",
> + .class = &omap54xx_ocp2scp_hwmod_class,
> + .clkdm_name = "l3init_clkdm",
> + .prcm = {
> + .omap4 = {
> + .clkctrl_offs = OMAP54XX_CM_L3INIT_OCP2SCP3_CLKCTRL_OFFSET,
> + .context_offs = OMAP54XX_RM_L3INIT_OCP2SCP3_CONTEXT_OFFSET,
> + .modulemode = MODULEMODE_HWCTRL,
> + },
> + },
> +};
> +
> +/*
> + * 'sata' class
> + * sata: serial ata interface gen2 compliant ( 1 rx/ 1 tx)
> + */
> +
> +static struct omap_hwmod_class_sysconfig omap54xx_sata_sysc = {
> + .sysc_offs = 0x0000,
> + .sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE),
> + .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
> + SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO |
> + MSTANDBY_SMART | MSTANDBY_SMART_WKUP),
> + .sysc_fields = &omap_hwmod_sysc_type2,
> +};
> +
> +static struct omap_hwmod_class omap54xx_sata_hwmod_class = {
> + .name = "sata",
> + .sysc = &omap54xx_sata_sysc,
> +};
> +
> +/* sata */
> +static struct omap_hwmod omap54xx_sata_hwmod = {
> + .name = "sata",
> + .class = &omap54xx_sata_hwmod_class,
> + .clkdm_name = "l3init_clkdm",
> + .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY,
> + .main_clk = "func_48m_fclk",
> + .mpu_rt_idx = 1,
> + .prcm = {
> + .omap4 = {
> + .clkctrl_offs = OMAP54XX_CM_L3INIT_SATA_CLKCTRL_OFFSET,
> + .context_offs = OMAP54XX_RM_L3INIT_SATA_CONTEXT_OFFSET,
> + .modulemode = MODULEMODE_SWCTRL,
> + },
> + },
> +};
> +
> +/* l4_cfg -> sata */
> +static struct omap_hwmod_ocp_if omap54xx_l4_cfg__sata = {
> + .master = &omap54xx_l4_cfg_hwmod,
> + .slave = &omap54xx_sata_hwmod,
> + .clk = "l3_iclk_div",
> + .user = OCP_USER_MPU | OCP_USER_SDMA,
> +};
>
> /*
> * Interfaces
> @@ -2482,6 +2553,8 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = {
> &omap54xx_l4_cfg__usb_tll_hs,
> &omap54xx_l4_cfg__usb_otg_ss,
> &omap54xx_l4_wkup__wd_timer2,
> + &omap54xx_l4_cfg__ocp2scp3,
> + &omap54xx_l4_cfg__sata,
> NULL,
> };
>
>
next prev parent reply other threads:[~2014-06-12 12:46 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-23 17:30 [PATCH v4 0/4] ARM: OMAP: SATA support for OMAP5 & DRA7 Roger Quadros
2014-04-23 17:34 ` [PATCH v4 1/4] ARM: OMAP5: hwmod: Add ocp2scp3 and sata hwmods Roger Quadros
2014-06-12 12:46 ` Roger Quadros [this message]
2014-06-13 4:06 ` Sekhar Nori
2014-06-15 21:59 ` Paul Walmsley
2014-04-23 17:35 ` [PATCH v4 2/4] ARM: dts: omap5: add sata node Roger Quadros
2014-05-14 21:16 ` Tony Lindgren
2014-04-23 17:35 ` [PATCH v4 3/4] ARM: DRA7: hwmod: Add ocp2scp3 and sata hwmods Roger Quadros
2014-06-12 12:47 ` Roger Quadros
2014-06-13 19:07 ` Paul Walmsley
2014-06-15 3:33 ` Paul Walmsley
2014-06-18 7:56 ` Roger Quadros
2014-06-18 8:02 ` Roger Quadros
2014-06-18 10:29 ` Rajendra Nayak
2014-06-18 11:22 ` Roger Quadros
2014-04-23 17:36 ` [PATCH v4 4/4] ARM: dts: dra7: add OCP2SCP3 and SATA nodes Roger Quadros
2014-05-07 8:14 ` Roger Quadros
2014-05-14 21:17 ` Tony Lindgren
2014-05-07 11:58 ` [PATCH v5 " Roger Quadros
2014-05-14 21:18 ` Tony Lindgren
2014-05-06 8:44 ` [PATCH v4 0/4] ARM: OMAP: SATA support for OMAP5 & DRA7 Roger Quadros
2014-05-14 21:20 ` Tony Lindgren
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=5399A12F.7010301@ti.com \
--to=rogerq@ti.com \
--cc=balajitk@ti.com \
--cc=balbi@ti.com \
--cc=bcousson@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=george.cherian@ti.com \
--cc=hdegoede@redhat.com \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--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).