Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1185331
| Path | csiph.com!aioe.org!news.e-liance.net!news.e-liance.net!goblin1!goblin.stu.neva.ru!newsfeed.CARNet.hr!news.spin.it!bofh.it!news.nic.it!robomod |
|---|---|
| From | Paul Walmsley <paul@pwsan.com> |
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH v2 1/6] ARM: OMAP4: PRM: Remove hardcoding of PRM_IO_PMCTRL_OFFSET register |
| Date | Thu, 16 Jul 2015 04:00:05 +0200 |
| Message-ID | <pMGCV-AY-71@gated-at.bofh.it> (permalink) |
| References | <pJQp4-7bG-9@gated-at.bofh.it> <pJQp4-7bG-19@gated-at.bofh.it> |
| X-Original-To | Keerthy <j-keerthy@ti.com> |
| User-Agent | Alpine 2.02 (DEB 1266 2009-07-14) |
| MIME-Version | 1.0 |
| Content-Type | TEXT/PLAIN; charset=US-ASCII |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 94 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | tony@atomide.com, t-kristo@ti.com, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, bcousson@baylibre.com, galak@codeaurora.org, pawel.moll@arm.com |
| X-Original-Date | Thu, 16 Jul 2015 01:54:57 +0000 (UTC) |
| X-Original-Message-ID | <alpine.DEB.2.02.1507160153240.32764@utopia.booyaka.com> |
| X-Original-References | <1436334148-9309-1-git-send-email-j-keerthy@ti.com> <1436334148-9309-2-git-send-email-j-keerthy@ti.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | aioe.org linux.kernel:1185331 |
Show key headers only | View raw
Hi
a few minor comments
On Wed, 8 Jul 2015, Keerthy wrote:
> PRM_IO_PMCTRL_OFFSET need not be same for all SOCs hence
> remove hardcoding and use the value provided by the omap_prcm_irq_setup
> structure.
Please mention here that the reason why you're making this change is to
support AM437x.
>
> Signed-off-by: Keerthy <j-keerthy@ti.com>
> ---
> arch/arm/mach-omap2/prcm-common.h | 1 +
> arch/arm/mach-omap2/prm44xx.c | 11 ++++++-----
> 2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/prcm-common.h b/arch/arm/mach-omap2/prcm-common.h
> index 6ae0b3a..2e60406 100644
> --- a/arch/arm/mach-omap2/prcm-common.h
> +++ b/arch/arm/mach-omap2/prcm-common.h
> @@ -494,6 +494,7 @@ struct omap_prcm_irq {
> struct omap_prcm_irq_setup {
> u16 ack;
> u16 mask;
> + u16 pm_ctrl;
Please add a kerneldoc structure documentation line for this new field, to
match the existing documentation here.
> u8 nr_regs;
> u8 nr_irqs;
> const struct omap_prcm_irq *irqs;
> diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
> index 4541700..8149e5a 100644
> --- a/arch/arm/mach-omap2/prm44xx.c
> +++ b/arch/arm/mach-omap2/prm44xx.c
> @@ -45,6 +45,7 @@ static const struct omap_prcm_irq omap4_prcm_irqs[] = {
> static struct omap_prcm_irq_setup omap4_prcm_irq_setup = {
> .ack = OMAP4_PRM_IRQSTATUS_MPU_OFFSET,
> .mask = OMAP4_PRM_IRQENABLE_MPU_OFFSET,
> + .pm_ctrl = OMAP4_PRM_IO_PMCTRL_OFFSET,
> .nr_regs = 2,
> .irqs = omap4_prcm_irqs,
> .nr_irqs = ARRAY_SIZE(omap4_prcm_irqs),
> @@ -306,10 +307,10 @@ static void omap44xx_prm_reconfigure_io_chain(void)
> omap4_prm_rmw_inst_reg_bits(OMAP4430_WUCLK_CTRL_MASK,
> OMAP4430_WUCLK_CTRL_MASK,
> inst,
> - OMAP4_PRM_IO_PMCTRL_OFFSET);
> + omap4_prcm_irq_setup.pm_ctrl);
> omap_test_timeout(
> (((omap4_prm_read_inst_reg(inst,
> - OMAP4_PRM_IO_PMCTRL_OFFSET) &
> + omap4_prcm_irq_setup.pm_ctrl) &
> OMAP4430_WUCLK_STATUS_MASK) >>
> OMAP4430_WUCLK_STATUS_SHIFT) == 1),
> MAX_IOPAD_LATCH_TIME, i);
> @@ -319,10 +320,10 @@ static void omap44xx_prm_reconfigure_io_chain(void)
> /* Trigger WUCLKIN disable */
> omap4_prm_rmw_inst_reg_bits(OMAP4430_WUCLK_CTRL_MASK, 0x0,
> inst,
> - OMAP4_PRM_IO_PMCTRL_OFFSET);
> + omap4_prcm_irq_setup.pm_ctrl);
> omap_test_timeout(
> (((omap4_prm_read_inst_reg(inst,
> - OMAP4_PRM_IO_PMCTRL_OFFSET) &
> + omap4_prcm_irq_setup.pm_ctrl) &
> OMAP4430_WUCLK_STATUS_MASK) >>
> OMAP4430_WUCLK_STATUS_SHIFT) == 0),
> MAX_IOPAD_LATCH_TIME, i);
> @@ -350,7 +351,7 @@ static void __init omap44xx_prm_enable_io_wakeup(void)
> omap4_prm_rmw_inst_reg_bits(OMAP4430_GLOBAL_WUEN_MASK,
> OMAP4430_GLOBAL_WUEN_MASK,
> inst,
> - OMAP4_PRM_IO_PMCTRL_OFFSET);
> + omap4_prcm_irq_setup.pm_ctrl);
> }
>
> /**
> --
> 1.9.1
>
- Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
Re: [PATCH v2 1/6] ARM: OMAP4: PRM: Remove hardcoding of PRM_IO_PMCTRL_OFFSET register Paul Walmsley <paul@pwsan.com> - 2015-07-16 04:00 +0200
csiph-web