devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nishanth Menon <nm@ti.com>
To: linux-omap@vger.kernel.org
Cc: devicetree-discuss@lists.ozlabs.org,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	"Benoît Cousson" <b-cousson@ti.com>,
	"Tony Lindgren" <tony@atomide.com>,
	"Paul Walmsley" <paul@pwsan.com>,
	"Kevin Hilman" <khilman@deeprootsystems.com>,
	"Mike Turquette" <mturquette@linaro.org>,
	"Nishanth Menon" <nm@ti.com>
Subject: [PATCH V4 6/6] ARM: OMAP3+: use cpu0-cpufreq driver in device tree supported boot
Date: Fri, 12 Apr 2013 17:54:38 -0500	[thread overview]
Message-ID: <1365807278-554-7-git-send-email-nm@ti.com> (raw)
In-Reply-To: <1365807278-554-1-git-send-email-nm@ti.com>

With OMAP3+ and AM33xx supported SoC having defined CPU device tree
entries with operating-points and clock nodes defined, we can now use
the SoC generic cpufreq-cpu0 driver by registering appropriate device.

Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
---
Introduced as a result of alignment in http://marc.info/?t=136450773400004&r=1&w=2
previous versions do not use this approach.

This would probably be good to get merged *after* Rafael's tree is merged in.

[Probably belongs to Kevin/Tony's tree?]

 arch/arm/mach-omap2/pm.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 8d15f9a..6cf95160 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -267,7 +267,12 @@ static void __init omap4_init_voltages(void)
 
 static inline void omap_init_cpufreq(void)
 {
-	struct platform_device_info devinfo = { .name = "omap-cpufreq", };
+	struct platform_device_info devinfo = { };
+
+	if (!of_have_populated_dt())
+		devinfo.name = "omap-cpufreq";
+	else
+		devinfo.name = "cpufreq-cpu0";
 	platform_device_register_full(&devinfo);
 }
 
@@ -301,9 +306,9 @@ int __init omap2_common_pm_late_init(void)
 		/* Smartreflex device init */
 		omap_devinit_smartreflex();
 
-		/* cpufreq dummy device instantiation */
-		omap_init_cpufreq();
 	}
+	/* cpufreq dummy device instantiation */
+	omap_init_cpufreq();
 
 #ifdef CONFIG_SUSPEND
 	suspend_set_ops(&omap_pm_ops);
-- 
1.7.9.5


      parent reply	other threads:[~2013-04-12 22:54 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-12 22:54 [PATCH V4 0/6] ARM: OMAP3+: support cpufreq-cpu0 for device tree boot Nishanth Menon
     [not found] ` <1365807278-554-1-git-send-email-nm-l0cyMroinI0@public.gmane.org>
2013-04-12 22:54   ` [PATCH V4 1/6] clk: OMAP: introduce device tree binding to kernel clock data Nishanth Menon
2013-04-12 23:31     ` Tony Lindgren
     [not found]       ` <20130412233142.GE10155-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2013-04-12 23:39         ` Nishanth Menon
2013-04-13 17:22           ` Tony Lindgren
     [not found]             ` <20130413172210.GM10155-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2013-04-14 21:19               ` Nishanth Menon
2013-04-24 16:28                 ` Mike Turquette
2013-04-25  7:01                   ` Rajendra Nayak
2013-04-15 16:22     ` Stephen Warren
2013-04-15 18:43       ` Nishanth Menon
2013-04-12 22:54   ` [PATCH V4 3/6] ARM: dts: OMAP4: add clock nodes for CPU Nishanth Menon
2013-04-12 22:54 ` [PATCH V4 2/6] ARM: dts: OMAP3: " Nishanth Menon
2013-04-12 22:54 ` [PATCH V4 4/6] ARM: dts: AM33XX: " Nishanth Menon
2013-04-12 22:54 ` [PATCH V4 5/6] ARM: OMAP2+: AM33XX: add lateinit hook for calling pm late init Nishanth Menon
2013-04-12 22:54 ` Nishanth Menon [this message]

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=1365807278-554-7-git-send-email-nm@ti.com \
    --to=nm@ti.com \
    --cc=b-cousson@ti.com \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=khilman@deeprootsystems.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=mturquette@linaro.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).