From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shubhrajyoti Subject: Re: [REPOST PATCH 1/2 v4] OMAP2+: hwmod: Add API to enable IO ring wakeup. Date: Mon, 14 Nov 2011 18:24:29 +0530 Message-ID: <4EC10F85.8080407@ti.com> References: <1309603946-25395-2-git-send-email-govindraj.raja@ti.com> <1309755315-28564-1-git-send-email-govindraj.raja@ti.com> <4EC0FF2D.5040006@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from na3sys009aob106.obsmtp.com ([74.125.149.76]:41230 "EHLO na3sys009aog106.obsmtp.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752349Ab1KNMyh (ORCPT ); Mon, 14 Nov 2011 07:54:37 -0500 Received: by mail-yx0-f169.google.com with SMTP id m10so2772748yen.0 for ; Mon, 14 Nov 2011 04:54:36 -0800 (PST) In-Reply-To: <4EC0FF2D.5040006@ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: "Govindraj.R" Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tony Lindgren , Kevin Hilman , Paul Walmsley , Tero Kristo On Monday 14 November 2011 05:14 PM, Shubhrajyoti wrote: > On Monday 04 July 2011 10:25 AM, Govindraj.R wrote: >> Add API to enable IO pad wakeup capability based on mux dynamic pad and >> wake_up enable flag available from hwmod_mux initialization. >> >> Use the wakeup_enable flag and enable wakeup capability >> for the given pads. Wakeup capability will be enabled/disabled >> during hwmod idle transition based on whether wakeup_flag is >> set or cleared. >> >> Map the enable/disable pad wakeup API's to hwmod_wakeup_enable/disable. >> >> Signed-off-by: Govindraj.R >> --- >> arch/arm/mach-omap2/omap_hwmod.c | 59 ++++++++++++++++++++++++++++++++++++++ >> 1 files changed, 59 insertions(+), 0 deletions(-) >> >> diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c >> index 293fa6c..3b28e0a 100644 >> --- a/arch/arm/mach-omap2/omap_hwmod.c >> +++ b/arch/arm/mach-omap2/omap_hwmod.c >> @@ -1770,6 +1770,34 @@ static int __init omap_hwmod_setup_all(void) >> core_initcall(omap_hwmod_setup_all); >> >> /** >> + * omap_hwmod_set_ioring_wakeup - enable io pad wakeup flag. >> + * @oh: struct omap_hwmod * >> + * @set: bool value indicating to set or clear wakeup status. >> + * >> + * Set or Clear wakeup flag for the io_pad. >> + */ >> +static int omap_hwmod_set_ioring_wakeup(struct omap_hwmod *oh, bool set_wake) >> +{ >> + struct omap_device_pad *pad; >> + int ret = -EINVAL, j; >> + >> + if (oh->mux && oh->mux->enabled) { >> + for (j = 0; j < oh->mux->nr_pads_dynamic; j++) { >> + pad = oh->mux->pads_dynamic[j]; >> + if (pad->flags & OMAP_DEVICE_PAD_WAKEUP) { >> + if (set_wake) >> + pad->idle |= OMAP_WAKEUP_EN; >> + else >> + pad->idle &= ~OMAP_WAKEUP_EN; > Will this not erase the other bits ? > Should we read and erase only the wakeup bits. > Am I missing something ? My bad please ignore >> + ret = 0; >> + } >> + } >> + } >> + >> + return ret; >> +} >> + >> +/** >> * omap_hwmod_enable - enable an omap_hwmod >> * @oh: struct omap_hwmod * >> * >> @@ -2097,6 +2125,35 @@ int omap_hwmod_del_initiator_dep(struct omap_hwmod *oh, >> { >> return _del_initiator_dep(oh, init_oh); >> } >> +/** >> + * omap_hwmod_enable_ioring_wakeup - Set wakeup flag for iopad. >> + * @oh: struct omap_hwmod * >> + * >> + * Traverse through dynamic pads, if pad is enabled then >> + * set wakeup enable bit flag for the mux pin. Wakeup pad bit >> + * will be set during hwmod idle transistion. >> + * Return error if pads are not enabled or not available. >> + */ >> +int omap_hwmod_enable_ioring_wakeup(struct omap_hwmod *oh) >> +{ >> + /* Enable pad wake-up capability */ >> + return omap_hwmod_set_ioring_wakeup(oh, true); >> +} >> + >> +/** >> + * omap_hwmod_disable_ioring_wakeup - Clear wakeup flag for iopad. >> + * @oh: struct omap_hwmod * >> + * >> + * Traverse through dynamic pads, if pad is enabled then >> + * clear wakeup enable bit flag for the mux pin. Wakeup pad bit >> + * will be set during hwmod idle transistion. >> + * Return error if pads are not enabled or not available. >> + */ >> +int omap_hwmod_disable_ioring_wakeup(struct omap_hwmod *oh) >> +{ >> + /* Disable pad wakeup capability */ >> + return omap_hwmod_set_ioring_wakeup(oh, false); >> +} >> >> /** >> * omap_hwmod_enable_wakeup - allow device to wake up the system >> @@ -2123,6 +2180,7 @@ int omap_hwmod_enable_wakeup(struct omap_hwmod *oh) >> v = oh->_sysc_cache; >> _enable_wakeup(oh, &v); >> _write_sysconfig(v, oh); >> + omap_hwmod_enable_ioring_wakeup(oh); >> spin_unlock_irqrestore(&oh->_lock, flags); >> >> return 0; >> @@ -2153,6 +2211,7 @@ int omap_hwmod_disable_wakeup(struct omap_hwmod *oh) >> v = oh->_sysc_cache; >> _disable_wakeup(oh, &v); >> _write_sysconfig(v, oh); >> + omap_hwmod_disable_ioring_wakeup(oh); >> spin_unlock_irqrestore(&oh->_lock, flags); >> >> return 0; From mboxrd@z Thu Jan 1 00:00:00 1970 From: shubhrajyoti@ti.com (Shubhrajyoti) Date: Mon, 14 Nov 2011 18:24:29 +0530 Subject: [REPOST PATCH 1/2 v4] OMAP2+: hwmod: Add API to enable IO ring wakeup. In-Reply-To: <4EC0FF2D.5040006@ti.com> References: <1309603946-25395-2-git-send-email-govindraj.raja@ti.com> <1309755315-28564-1-git-send-email-govindraj.raja@ti.com> <4EC0FF2D.5040006@ti.com> Message-ID: <4EC10F85.8080407@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Monday 14 November 2011 05:14 PM, Shubhrajyoti wrote: > On Monday 04 July 2011 10:25 AM, Govindraj.R wrote: >> Add API to enable IO pad wakeup capability based on mux dynamic pad and >> wake_up enable flag available from hwmod_mux initialization. >> >> Use the wakeup_enable flag and enable wakeup capability >> for the given pads. Wakeup capability will be enabled/disabled >> during hwmod idle transition based on whether wakeup_flag is >> set or cleared. >> >> Map the enable/disable pad wakeup API's to hwmod_wakeup_enable/disable. >> >> Signed-off-by: Govindraj.R >> --- >> arch/arm/mach-omap2/omap_hwmod.c | 59 ++++++++++++++++++++++++++++++++++++++ >> 1 files changed, 59 insertions(+), 0 deletions(-) >> >> diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c >> index 293fa6c..3b28e0a 100644 >> --- a/arch/arm/mach-omap2/omap_hwmod.c >> +++ b/arch/arm/mach-omap2/omap_hwmod.c >> @@ -1770,6 +1770,34 @@ static int __init omap_hwmod_setup_all(void) >> core_initcall(omap_hwmod_setup_all); >> >> /** >> + * omap_hwmod_set_ioring_wakeup - enable io pad wakeup flag. >> + * @oh: struct omap_hwmod * >> + * @set: bool value indicating to set or clear wakeup status. >> + * >> + * Set or Clear wakeup flag for the io_pad. >> + */ >> +static int omap_hwmod_set_ioring_wakeup(struct omap_hwmod *oh, bool set_wake) >> +{ >> + struct omap_device_pad *pad; >> + int ret = -EINVAL, j; >> + >> + if (oh->mux && oh->mux->enabled) { >> + for (j = 0; j < oh->mux->nr_pads_dynamic; j++) { >> + pad = oh->mux->pads_dynamic[j]; >> + if (pad->flags & OMAP_DEVICE_PAD_WAKEUP) { >> + if (set_wake) >> + pad->idle |= OMAP_WAKEUP_EN; >> + else >> + pad->idle &= ~OMAP_WAKEUP_EN; > Will this not erase the other bits ? > Should we read and erase only the wakeup bits. > Am I missing something ? My bad please ignore >> + ret = 0; >> + } >> + } >> + } >> + >> + return ret; >> +} >> + >> +/** >> * omap_hwmod_enable - enable an omap_hwmod >> * @oh: struct omap_hwmod * >> * >> @@ -2097,6 +2125,35 @@ int omap_hwmod_del_initiator_dep(struct omap_hwmod *oh, >> { >> return _del_initiator_dep(oh, init_oh); >> } >> +/** >> + * omap_hwmod_enable_ioring_wakeup - Set wakeup flag for iopad. >> + * @oh: struct omap_hwmod * >> + * >> + * Traverse through dynamic pads, if pad is enabled then >> + * set wakeup enable bit flag for the mux pin. Wakeup pad bit >> + * will be set during hwmod idle transistion. >> + * Return error if pads are not enabled or not available. >> + */ >> +int omap_hwmod_enable_ioring_wakeup(struct omap_hwmod *oh) >> +{ >> + /* Enable pad wake-up capability */ >> + return omap_hwmod_set_ioring_wakeup(oh, true); >> +} >> + >> +/** >> + * omap_hwmod_disable_ioring_wakeup - Clear wakeup flag for iopad. >> + * @oh: struct omap_hwmod * >> + * >> + * Traverse through dynamic pads, if pad is enabled then >> + * clear wakeup enable bit flag for the mux pin. Wakeup pad bit >> + * will be set during hwmod idle transistion. >> + * Return error if pads are not enabled or not available. >> + */ >> +int omap_hwmod_disable_ioring_wakeup(struct omap_hwmod *oh) >> +{ >> + /* Disable pad wakeup capability */ >> + return omap_hwmod_set_ioring_wakeup(oh, false); >> +} >> >> /** >> * omap_hwmod_enable_wakeup - allow device to wake up the system >> @@ -2123,6 +2180,7 @@ int omap_hwmod_enable_wakeup(struct omap_hwmod *oh) >> v = oh->_sysc_cache; >> _enable_wakeup(oh, &v); >> _write_sysconfig(v, oh); >> + omap_hwmod_enable_ioring_wakeup(oh); >> spin_unlock_irqrestore(&oh->_lock, flags); >> >> return 0; >> @@ -2153,6 +2211,7 @@ int omap_hwmod_disable_wakeup(struct omap_hwmod *oh) >> v = oh->_sysc_cache; >> _disable_wakeup(oh, &v); >> _write_sysconfig(v, oh); >> + omap_hwmod_disable_ioring_wakeup(oh); >> spin_unlock_irqrestore(&oh->_lock, flags); >> >> return 0;