From: Santosh Shilimkar <santosh.shilimkar@ti.com>
To: linux-omap@vger.kernel.org
Cc: tony@atomide.com, linux-arm-kernel@lists.infradead.org,
Rajendra Nayak <rnayak@ti.com>
Subject: [PATCH 8/8] ARM: OMAP5: clock: No Freqsel on OMAP5 devices
Date: Wed, 20 Feb 2013 20:57:14 +0530 [thread overview]
Message-ID: <1361374034-21831-9-git-send-email-santosh.shilimkar@ti.com> (raw)
In-Reply-To: <1361374034-21831-1-git-send-email-santosh.shilimkar@ti.com>
From: Rajendra Nayak <rnayak@ti.com>
OMAP5 does not have freqsel either, so add the missing
checks for !soc_is_omap54xx()
Reported-by: Archit Taneja <archit@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
---
arch/arm/mach-omap2/dpll3xxx.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/dpll3xxx.c b/arch/arm/mach-omap2/dpll3xxx.c
index 0a02aab5..6e3811b 100644
--- a/arch/arm/mach-omap2/dpll3xxx.c
+++ b/arch/arm/mach-omap2/dpll3xxx.c
@@ -310,7 +310,8 @@ static int omap3_noncore_dpll_program(struct clk_hw_omap *clk, u16 freqsel)
* Set jitter correction. No jitter correction for OMAP4 and 3630
* since freqsel field is no longer present
*/
- if (!soc_is_am33xx() && !cpu_is_omap44xx() && !cpu_is_omap3630()) {
+ if (!soc_is_am33xx() && !cpu_is_omap44xx() && !cpu_is_omap3630()
+ && !soc_is_omap54xx()) {
v = __raw_readl(dd->control_reg);
v &= ~dd->freqsel_mask;
v |= freqsel << __ffs(dd->freqsel_mask);
@@ -501,7 +502,8 @@ int omap3_noncore_dpll_set_rate(struct clk_hw *hw, unsigned long rate,
return -EINVAL;
/* No freqsel on OMAP4 and OMAP3630 */
- if (!cpu_is_omap44xx() && !cpu_is_omap3630()) {
+ if (!cpu_is_omap44xx() && !cpu_is_omap3630()
+ && !soc_is_omap54xx()) {
freqsel = _omap3_dpll_compute_freqsel(clk,
dd->last_rounded_n);
WARN_ON(!freqsel);
--
1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: santosh.shilimkar@ti.com (Santosh Shilimkar)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 8/8] ARM: OMAP5: clock: No Freqsel on OMAP5 devices
Date: Wed, 20 Feb 2013 20:57:14 +0530 [thread overview]
Message-ID: <1361374034-21831-9-git-send-email-santosh.shilimkar@ti.com> (raw)
In-Reply-To: <1361374034-21831-1-git-send-email-santosh.shilimkar@ti.com>
From: Rajendra Nayak <rnayak@ti.com>
OMAP5 does not have freqsel either, so add the missing
checks for !soc_is_omap54xx()
Reported-by: Archit Taneja <archit@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
---
arch/arm/mach-omap2/dpll3xxx.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/dpll3xxx.c b/arch/arm/mach-omap2/dpll3xxx.c
index 0a02aab5..6e3811b 100644
--- a/arch/arm/mach-omap2/dpll3xxx.c
+++ b/arch/arm/mach-omap2/dpll3xxx.c
@@ -310,7 +310,8 @@ static int omap3_noncore_dpll_program(struct clk_hw_omap *clk, u16 freqsel)
* Set jitter correction. No jitter correction for OMAP4 and 3630
* since freqsel field is no longer present
*/
- if (!soc_is_am33xx() && !cpu_is_omap44xx() && !cpu_is_omap3630()) {
+ if (!soc_is_am33xx() && !cpu_is_omap44xx() && !cpu_is_omap3630()
+ && !soc_is_omap54xx()) {
v = __raw_readl(dd->control_reg);
v &= ~dd->freqsel_mask;
v |= freqsel << __ffs(dd->freqsel_mask);
@@ -501,7 +502,8 @@ int omap3_noncore_dpll_set_rate(struct clk_hw *hw, unsigned long rate,
return -EINVAL;
/* No freqsel on OMAP4 and OMAP3630 */
- if (!cpu_is_omap44xx() && !cpu_is_omap3630()) {
+ if (!cpu_is_omap44xx() && !cpu_is_omap3630()
+ && !soc_is_omap54xx()) {
freqsel = _omap3_dpll_compute_freqsel(clk,
dd->last_rounded_n);
WARN_ON(!freqsel);
--
1.7.9.5
next prev parent reply other threads:[~2013-02-20 15:26 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-20 15:27 [PATCH 0/8] ARM: OMAP5: Few updates discovered with es2.0 Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:27 ` [PATCH 1/8] ARM: OMAP5: Update SOC id detection code for ES2 Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:29 ` Felipe Balbi
2013-02-20 15:29 ` Felipe Balbi
2013-02-20 16:03 ` Santosh Shilimkar
2013-02-20 16:03 ` Santosh Shilimkar
2013-02-20 16:27 ` Felipe Balbi
2013-02-20 16:27 ` Felipe Balbi
2013-02-20 16:31 ` Santosh Shilimkar
2013-02-20 16:31 ` Santosh Shilimkar
2013-02-20 16:32 ` Felipe Balbi
2013-02-20 16:32 ` Felipe Balbi
2013-02-20 15:27 ` [PATCH 2/8] ARM: OMAP5: timer: Update the clocksource name as per clock data Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-21 12:52 ` Sergei Shtylyov
2013-02-21 12:52 ` Sergei Shtylyov
2013-02-21 12:57 ` Santosh Shilimkar
2013-02-21 12:57 ` Santosh Shilimkar
2013-02-20 15:27 ` [PATCH 3/8] ARM: OMAP5: prm: Allow prm init to success on OMAP5 SOCs Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:30 ` Felipe Balbi
2013-02-20 15:30 ` Felipe Balbi
2013-02-21 12:50 ` Sergei Shtylyov
2013-02-21 12:50 ` Sergei Shtylyov
2013-02-20 15:27 ` [PATCH 4/8] ARM: OMAP5: Reuse prm read_inst/write_inst Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:27 ` [PATCH 5/8] ARM: OMAP5: Update SAR RAM base address Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:27 ` [PATCH 6/8] ARM: OMAP5: Update SAR memory layout for WakeupGen Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:27 ` [PATCH 7/8] ARM: OMAP5: Make errata i688 workaround available Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar [this message]
2013-02-20 15:27 ` [PATCH 8/8] ARM: OMAP5: clock: No Freqsel on OMAP5 devices Santosh Shilimkar
2013-03-15 8:39 ` Santosh Shilimkar
2013-03-15 8:39 ` Santosh Shilimkar
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=1361374034-21831-9-git-send-email-santosh.shilimkar@ti.com \
--to=santosh.shilimkar@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=rnayak@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 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.