From: Tony Lindgren <tony@atomide.com>
To: Paul Walmsley <paul@pwsan.com>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL] ARM: OMAP2+: hwmod data: cleanup in preparation for link array removal
Date: Thu, 8 Mar 2012 17:40:16 -0800 [thread overview]
Message-ID: <20120309014016.GC12083@atomide.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1203072102150.21662@utopia.booyaka.com>
Hi Paul,
* Paul Walmsley <paul@pwsan.com> [120307 19:34]:
> Hi Tony
>
> The following changes since commit b8a633451951d149494076393698880453bf6bfe:
>
> ARM: OMAP: hwmod: add softreset delay field and OMAP4 data (2012-02-28 03:46:31 -0700)
>
> are available in the git repository at:
>
> git://git.pwsan.com/linux-2.6 hwmod_data_cleanup_3.4
>
> for you to fetch changes up to a2d4b88dd32b02e8b5088e0d64b3c102c0852210:
>
> ARM: OMAP2+: hwmod: extend OCP_* register offsets from 16 to 32 bits (2012-02-28 03:49:34 -0700)
>
> (This branch is based on the 'hwmod_code_cleanup_3.4' branch, pull req
> sent previously)
Got these now merged into l-o master, but ran into a merge
conflict with already queued sr branch. Resolved it by using
your version except left out vdd_name. As the namings have
changed for smartreflex, now I suspect it's broken for the
interrupts..
Care to take a look and see how we should deal with this?
My merge resolution below for reference.
Regards,
Tony
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@@ -2684,9 -2736,10 +2736,9 @@@ static struct omap_hwmod_ocp_if *omap34
};
static struct omap_hwmod omap34xx_sr1_hwmod = {
- .name = "sr1_hwmod",
+ .name = "sr1",
.class = &omap34xx_smartreflex_hwmod_class,
.main_clk = "sr1_fck",
- .vdd_name = "mpu_iva",
.prcm = {
.omap2 = {
.prcm_reg_id = 1,
@@@ -2703,10 -2754,15 +2753,14 @@@
.flags = HWMOD_SET_DEFAULT_CLOCKACT,
};
+ static struct omap_hwmod_ocp_if *omap36xx_sr1_slaves[] = {
+ &omap36xx_l4_core__sr1,
+ };
+
static struct omap_hwmod omap36xx_sr1_hwmod = {
- .name = "sr1_hwmod",
+ .name = "sr1",
.class = &omap36xx_smartreflex_hwmod_class,
.main_clk = "sr1_fck",
- .vdd_name = "mpu_iva",
.prcm = {
.omap2 = {
.prcm_reg_id = 1,
@@@ -2732,9 -2782,10 +2780,9 @@@ static struct omap_hwmod_ocp_if *omap34
};
static struct omap_hwmod omap34xx_sr2_hwmod = {
- .name = "sr2_hwmod",
+ .name = "sr2",
.class = &omap34xx_smartreflex_hwmod_class,
.main_clk = "sr2_fck",
- .vdd_name = "core",
.prcm = {
.omap2 = {
.prcm_reg_id = 1,
@@@ -2751,10 -2800,15 +2797,14 @@@
.flags = HWMOD_SET_DEFAULT_CLOCKACT,
};
+ static struct omap_hwmod_ocp_if *omap36xx_sr2_slaves[] = {
+ &omap36xx_l4_core__sr2,
+ };
+
static struct omap_hwmod omap36xx_sr2_hwmod = {
- .name = "sr2_hwmod",
+ .name = "sr2",
.class = &omap36xx_smartreflex_hwmod_class,
.main_clk = "sr2_fck",
- .vdd_name = "core",
.prcm = {
.omap2 = {
.prcm_reg_id = 1,
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] ARM: OMAP2+: hwmod data: cleanup in preparation for link array removal
Date: Thu, 8 Mar 2012 17:40:16 -0800 [thread overview]
Message-ID: <20120309014016.GC12083@atomide.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1203072102150.21662@utopia.booyaka.com>
Hi Paul,
* Paul Walmsley <paul@pwsan.com> [120307 19:34]:
> Hi Tony
>
> The following changes since commit b8a633451951d149494076393698880453bf6bfe:
>
> ARM: OMAP: hwmod: add softreset delay field and OMAP4 data (2012-02-28 03:46:31 -0700)
>
> are available in the git repository at:
>
> git://git.pwsan.com/linux-2.6 hwmod_data_cleanup_3.4
>
> for you to fetch changes up to a2d4b88dd32b02e8b5088e0d64b3c102c0852210:
>
> ARM: OMAP2+: hwmod: extend OCP_* register offsets from 16 to 32 bits (2012-02-28 03:49:34 -0700)
>
> (This branch is based on the 'hwmod_code_cleanup_3.4' branch, pull req
> sent previously)
Got these now merged into l-o master, but ran into a merge
conflict with already queued sr branch. Resolved it by using
your version except left out vdd_name. As the namings have
changed for smartreflex, now I suspect it's broken for the
interrupts..
Care to take a look and see how we should deal with this?
My merge resolution below for reference.
Regards,
Tony
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@@ -2684,9 -2736,10 +2736,9 @@@ static struct omap_hwmod_ocp_if *omap34
};
static struct omap_hwmod omap34xx_sr1_hwmod = {
- .name = "sr1_hwmod",
+ .name = "sr1",
.class = &omap34xx_smartreflex_hwmod_class,
.main_clk = "sr1_fck",
- .vdd_name = "mpu_iva",
.prcm = {
.omap2 = {
.prcm_reg_id = 1,
@@@ -2703,10 -2754,15 +2753,14 @@@
.flags = HWMOD_SET_DEFAULT_CLOCKACT,
};
+ static struct omap_hwmod_ocp_if *omap36xx_sr1_slaves[] = {
+ &omap36xx_l4_core__sr1,
+ };
+
static struct omap_hwmod omap36xx_sr1_hwmod = {
- .name = "sr1_hwmod",
+ .name = "sr1",
.class = &omap36xx_smartreflex_hwmod_class,
.main_clk = "sr1_fck",
- .vdd_name = "mpu_iva",
.prcm = {
.omap2 = {
.prcm_reg_id = 1,
@@@ -2732,9 -2782,10 +2780,9 @@@ static struct omap_hwmod_ocp_if *omap34
};
static struct omap_hwmod omap34xx_sr2_hwmod = {
- .name = "sr2_hwmod",
+ .name = "sr2",
.class = &omap34xx_smartreflex_hwmod_class,
.main_clk = "sr2_fck",
- .vdd_name = "core",
.prcm = {
.omap2 = {
.prcm_reg_id = 1,
@@@ -2751,10 -2800,15 +2797,14 @@@
.flags = HWMOD_SET_DEFAULT_CLOCKACT,
};
+ static struct omap_hwmod_ocp_if *omap36xx_sr2_slaves[] = {
+ &omap36xx_l4_core__sr2,
+ };
+
static struct omap_hwmod omap36xx_sr2_hwmod = {
- .name = "sr2_hwmod",
+ .name = "sr2",
.class = &omap36xx_smartreflex_hwmod_class,
.main_clk = "sr2_fck",
- .vdd_name = "core",
.prcm = {
.omap2 = {
.prcm_reg_id = 1,
next prev parent reply other threads:[~2012-03-09 1:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 4:06 [GIT PULL] ARM: OMAP2+: hwmod data: cleanup in preparation for link array removal Paul Walmsley
2012-03-08 4:06 ` Paul Walmsley
2012-03-09 1:40 ` Tony Lindgren [this message]
2012-03-09 1:40 ` Tony Lindgren
2012-03-09 1:57 ` Paul Walmsley
2012-03-09 1:57 ` Paul Walmsley
2012-03-09 2:04 ` Paul Walmsley
2012-03-09 2:04 ` Paul Walmsley
2012-03-09 2:16 ` Tony Lindgren
2012-03-09 2:16 ` Tony Lindgren
2012-03-09 3:55 ` [GIT PULL v2] " Paul Walmsley
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=20120309014016.GC12083@atomide.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.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.