Re: [PATCH 1/2] cpufreq: cpufreq-cpu0: support for clock which are not in DT yet.
On Tuesday 12 March 2013 04:35 AM, Nishanth Menon wrote:
> On certain SoCs like variants of OMAP, the clock conversion to DT
> is not complete. In short, the ability to:
> cpus {
> cpu@0 {
> clocks = <&cpuclk 0>;
> };
> };
> is not possible. However, the clock node is registered.
> Allow for clk names to be provided as string so as to be used when needed.
> Example (for OMAP3630):
> cpus {
> cpu@0 {
> clock-name = "cpufreq_ck";
> };
> };
>
> Cc: "Rafael J. Wysocki"
> Cc: Santosh Shilimkar
> Cc: Shawn Guo
> Cc: linux-ker...@vger.kernel.org
> Cc: cpuf...@vger.kernel.org
> Cc: linux...@vger.kernel.org
> Cc: linux-omap@vger.kernel.org
>
> Signed-off-by: Nishanth Menon
> ---
Seems a reasonable to me.
Acked-by: Santosh Shilimkar
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] cpufreq: cpufreq-cpu0: support for clock which are not in DT yet.
On Mon, Mar 11, 2013 at 06:05:29PM -0500, Nishanth Menon wrote:
> On certain SoCs like variants of OMAP, the clock conversion to DT
> is not complete. In short, the ability to:
> cpus {
> cpu@0 {
> clocks = <&cpuclk 0>;
> };
> };
> is not possible. However, the clock node is registered.
> Allow for clk names to be provided as string so as to be used when needed.
> Example (for OMAP3630):
> cpus {
> cpu@0 {
> clock-name = "cpufreq_ck";
> };
> };
>
I'm not sure why the patch is needed at all. For platform that is
unable to look up clock from device tree yet, something like the
following in kernel will just help cpufreq-cpu0 find the clock, if
you instantiate cpufreq-cpu0 driver in the same way that
highbank-cpufreq does.
clk_register_clkdev(cpuclk, NULL, "cpufreq-cpu0.0");
Shawn
> Cc: "Rafael J. Wysocki"
> Cc: Santosh Shilimkar
> Cc: Shawn Guo
> Cc: linux-ker...@vger.kernel.org
> Cc: cpuf...@vger.kernel.org
> Cc: linux...@vger.kernel.org
> Cc: linux-omap@vger.kernel.org
>
> Signed-off-by: Nishanth Menon
> ---
> .../devicetree/bindings/cpufreq/cpufreq-cpu0.txt |3 +++
> drivers/cpufreq/cpufreq-cpu0.c |6 +-
> 2 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
> b/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
> index 4416ccc..f180963 100644
> --- a/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
> +++ b/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
> @@ -12,6 +12,9 @@ Required properties:
>for details
>
> Optional properties:
> +- clock-name: If the clock is not converted to device tree, then describe
> + the clock name as a string. This may also be replaced with clocks=<&cpuclk>
> + cpu clocks has already been converted to device tree.
> - clock-latency: Specify the possible maximum transition latency for clock,
>in unit of nanoseconds.
> - voltage-tolerance: Specify the CPU voltage tolerance in percentage.
> diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c
> index 4e5b7fb..28223c9 100644
> --- a/drivers/cpufreq/cpufreq-cpu0.c
> +++ b/drivers/cpufreq/cpufreq-cpu0.c
> @@ -180,6 +180,7 @@ static int cpu0_cpufreq_probe(struct platform_device
> *pdev)
> {
> struct device_node *np;
> int ret;
> + const char *clk_name = NULL;
>
> for_each_child_of_node(of_find_node_by_path("/cpus"), np) {
> if (of_get_property(np, "operating-points", NULL))
> @@ -194,7 +195,10 @@ static int cpu0_cpufreq_probe(struct platform_device
> *pdev)
> cpu_dev = &pdev->dev;
> cpu_dev->of_node = np;
>
> - cpu_clk = devm_clk_get(cpu_dev, NULL);
> + /* If clocks are not in DT yet, allow to define it part of CPU node */
> + of_property_read_string(np, "clock-name", &clk_name);
> +
> + cpu_clk = devm_clk_get(cpu_dev, clk_name);
> if (IS_ERR(cpu_clk)) {
> ret = PTR_ERR(cpu_clk);
> pr_err("failed to get cpu0 clock: %d\n", ret);
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] cpufreq: cpufreq-cpu0: support for clock which are not in DT yet.
Hi Guys,
On 03/12/2013 06:03 AM, Santosh Shilimkar wrote:
> On Tuesday 12 March 2013 04:35 AM, Nishanth Menon wrote:
>> On certain SoCs like variants of OMAP, the clock conversion to DT
>> is not complete. In short, the ability to:
>> cpus {
>> cpu@0 {
>> clocks = <&cpuclk 0>;
>> };
>> };
>> is not possible. However, the clock node is registered.
>> Allow for clk names to be provided as string so as to be used when needed.
>> Example (for OMAP3630):
>> cpus {
>> cpu@0 {
>> clock-name = "cpufreq_ck";
>> };
>> };
>>
>> Cc: "Rafael J. Wysocki"
>> Cc: Santosh Shilimkar
>> Cc: Shawn Guo
>> Cc: linux-ker...@vger.kernel.org
>> Cc: cpuf...@vger.kernel.org
>> Cc: linux...@vger.kernel.org
>> Cc: linux-omap@vger.kernel.org
>>
>> Signed-off-by: Nishanth Menon
>> ---
> Seems a reasonable to me.
No, it is not...
You cannot add a temp binding just because the OMAP support is not
there, since the real binding already exist.
You need to register properly a clock provider to be able to reference
it.
If you do need a hacky temp code you could do it in OMAP code but not in
the binding.
Regards,
Benoit
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] cpufreq: cpufreq-cpu0: support for clock which are not in DT yet.
On 15:24-20130312, Benoit Cousson wrote:
> Hi Guys,
>
> On 03/12/2013 06:03 AM, Santosh Shilimkar wrote:
> > On Tuesday 12 March 2013 04:35 AM, Nishanth Menon wrote:
> >> On certain SoCs like variants of OMAP, the clock conversion to DT
> >> is not complete. In short, the ability to:
> >> cpus {
> >> cpu@0 {
> >>clocks = <&cpuclk 0>;
> >> };
> >> };
> >> is not possible. However, the clock node is registered.
> >> Allow for clk names to be provided as string so as to be used when needed.
> >> Example (for OMAP3630):
> >> cpus {
> >> cpu@0 {
> >>clock-name = "cpufreq_ck";
> >> };
> >> };
> >>
> >> Cc: "Rafael J. Wysocki"
> >> Cc: Santosh Shilimkar
> >> Cc: Shawn Guo
> >> Cc: linux-ker...@vger.kernel.org
> >> Cc: cpuf...@vger.kernel.org
> >> Cc: linux...@vger.kernel.org
> >> Cc: linux-omap@vger.kernel.org
> >>
> >> Signed-off-by: Nishanth Menon
> >> ---
> > Seems a reasonable to me.
>
> No, it is not...
>
> You cannot add a temp binding just because the OMAP support is not
> there, since the real binding already exist.
>
> You need to register properly a clock provider to be able to reference
> it.
> If you do need a hacky temp code you could do it in OMAP code but not in
> the binding.
OK. My intent is to remove omap-cpufreq.c. So, I guess I could do
something like the following (not tested yet), but would that be the
right approach?
diff --git a/arch/arm/mach-omap2/cclock2420_data.c
b/arch/arm/mach-omap2/cclock2420_data.c
index 0f0a97c..c3017deb 100644
--- a/arch/arm/mach-omap2/cclock2420_data.c
+++ b/arch/arm/mach-omap2/cclock2420_data.c
@@ -1885,7 +1885,7 @@ static struct omap_clk omap2420_clks[] = {
CLK(NULL, "timer_32k_ck", &func_32k_ck, CK_242X),
CLK(NULL, "timer_sys_ck", &sys_ck,CK_242X),
CLK(NULL, "timer_ext_ck", &alt_ck,CK_242X),
- CLK(NULL, "cpufreq_ck", &virt_prcm_set, CK_242X),
+ CLK(NULL, "cpufreq-cpu0.0", &virt_prcm_set, CK_242X),
};
diff --git a/arch/arm/mach-omap2/cclock2430_data.c
b/arch/arm/mach-omap2/cclock2430_data.c
index aed8f74..7000ca4 100644
--- a/arch/arm/mach-omap2/cclock2430_data.c
+++ b/arch/arm/mach-omap2/cclock2430_data.c
@@ -2001,7 +2001,7 @@ static struct omap_clk omap2430_clks[] = {
CLK(NULL, "timer_32k_ck", &func_32k_ck, CK_243X),
CLK(NULL, "timer_sys_ck", &sys_ck,CK_243X),
CLK(NULL, "timer_ext_ck", &alt_ck,CK_243X),
- CLK(NULL, "cpufreq_ck", &virt_prcm_set, CK_243X),
+ CLK(NULL, "cpufreq-cpu0.0", &virt_prcm_set, CK_243X),
};
static const char *enable_init_clks[] = {
diff --git a/arch/arm/mach-omap2/cclock3xxx_data.c
b/arch/arm/mach-omap2/cclock3xxx_data.c
index 4579c3c..7a1dfde 100644
--- a/arch/arm/mach-omap2/cclock3xxx_data.c
+++ b/arch/arm/mach-omap2/cclock3xxx_data.c
@@ -3501,7 +3501,7 @@ static struct omap_clk omap3xxx_clks[] = {
CLK(NULL, "uart4_ick",&uart4_ick_am35xx, CK_AM35XX),
CLK(NULL, "timer_32k_ck", &omap_32k_fck, CK_3XXX),
CLK(NULL, "timer_sys_ck", &sys_ck,CK_3XXX),
- CLK(NULL, "cpufreq_ck", &dpll1_ck, CK_3XXX),
+ CLK(NULL, "cpufreq-cpu0.0", &dpll1_ck, CK_3XXX),
};
static const char *enable_init_clks[] = {
diff --git a/arch/arm/mach-omap2/cclock44xx_data.c
b/arch/arm/mach-omap2/cclock44xx_data.c
index 3d58f33..5fad1da 100644
--- a/arch/arm/mach-omap2/cclock44xx_data.c
+++ b/arch/arm/mach-omap2/cclock44xx_data.c
@@ -1660,7 +1660,7 @@ static struct omap_clk omap44xx_clks[] = {
CLK("4013a000.timer", "timer_sys_ck", &syc_clk_div_ck,
CK_443X),
CLK("4013c000.timer", "timer_sys_ck", &syc_clk_div_ck,
CK_443X),
CLK("4013e000.timer", "timer_sys_ck", &syc_clk_div_ck,
CK_443X),
- CLK(NULL, "cpufreq_ck", &dpll_mpu_ck, CK_443X),
+ CLK(NULL, "cpufreq-cpu0.0", &dpll_mpu_ck, CK_443X),
};
int __init omap4xxx_clk_init(void)
--
Regards,
Nishanth Menon
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH 1/2] cpufreq: cpufreq-cpu0: support for clock which are not in DT yet.
Hi Nishanth,
> -Original Message-
> From: linux-omap-ow...@vger.kernel.org [mailto:linux-omap-
> ow...@vger.kernel.org] On Behalf Of Menon, Nishanth
> Sent: Tuesday, March 12, 2013 8:06 PM
> To: Cousson, Benoit
> Cc: Shilimkar, Santosh; cpufreq; Rafael J. Wysocki; Shawn Guo; linux-
> ker...@vger.kernel.org; linux...@vger.kernel.org; linux-
> o...@vger.kernel.org
> Subject: Re: [PATCH 1/2] cpufreq: cpufreq-cpu0: support for clock which
> are not in DT yet.
>
> On 15:24-20130312, Benoit Cousson wrote:
> > Hi Guys,
> >
> > On 03/12/2013 06:03 AM, Santosh Shilimkar wrote:
> > > On Tuesday 12 March 2013 04:35 AM, Nishanth Menon wrote:
> > >> On certain SoCs like variants of OMAP, the clock conversion to DT
> > >> is not complete. In short, the ability to:
> > >> cpus {
> > >> cpu@0 {
> > >> clocks = <&cpuclk 0>;
> > >> };
> > >> };
> > >> is not possible. However, the clock node is registered.
> > >> Allow for clk names to be provided as string so as to be used when
> needed.
> > >> Example (for OMAP3630):
> > >> cpus {
> > >> cpu@0 {
> > >> clock-name = "cpufreq_ck";
> > >> };
> > >> };
> > >>
> > >> Cc: "Rafael J. Wysocki"
> > >> Cc: Santosh Shilimkar
> > >> Cc: Shawn Guo
> > >> Cc: linux-ker...@vger.kernel.org
> > >> Cc: cpuf...@vger.kernel.org
> > >> Cc: linux...@vger.kernel.org
> > >> Cc: linux-omap@vger.kernel.org
> > >>
> > >> Signed-off-by: Nishanth Menon
> > >> ---
> > > Seems a reasonable to me.
> >
> > No, it is not...
> >
> > You cannot add a temp binding just because the OMAP support is not
> > there, since the real binding already exist.
> >
> > You need to register properly a clock provider to be able to
> reference
> > it.
> > If you do need a hacky temp code you could do it in OMAP code but not
> > in the binding.
>
> OK. My intent is to remove omap-cpufreq.c. So, I guess I could do
> something like the following (not tested yet), but would that be the
> right approach?
Similar attempt was done for am33xx_clks in this by Shawn:
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg84157.html
>
> diff --git a/arch/arm/mach-omap2/cclock2420_data.c b/arch/arm/mach-
> omap2/cclock2420_data.c
> index 0f0a97c..c3017deb 100644
> --- a/arch/arm/mach-omap2/cclock2420_data.c
> +++ b/arch/arm/mach-omap2/cclock2420_data.c
> @@ -1885,7 +1885,7 @@ static struct omap_clk omap2420_clks[] = {
> CLK(NULL, "timer_32k_ck", &func_32k_ck, CK_242X),
> CLK(NULL, "timer_sys_ck", &sys_ck,CK_242X),
> CLK(NULL, "timer_ext_ck", &alt_ck,CK_242X),
> - CLK(NULL, "cpufreq_ck", &virt_prcm_set, CK_242X),
> + CLK(NULL, "cpufreq-cpu0.0", &virt_prcm_set, CK_242X),
> };
>
>
> diff --git a/arch/arm/mach-omap2/cclock2430_data.c b/arch/arm/mach-
> omap2/cclock2430_data.c
> index aed8f74..7000ca4 100644
> --- a/arch/arm/mach-omap2/cclock2430_data.c
> +++ b/arch/arm/mach-omap2/cclock2430_data.c
> @@ -2001,7 +2001,7 @@ static struct omap_clk omap2430_clks[] = {
> CLK(NULL, "timer_32k_ck", &func_32k_ck, CK_243X),
> CLK(NULL, "timer_sys_ck", &sys_ck,CK_243X),
> CLK(NULL, "timer_ext_ck", &alt_ck,CK_243X),
> - CLK(NULL, "cpufreq_ck", &virt_prcm_set, CK_243X),
> + CLK(NULL, "cpufreq-cpu0.0", &virt_prcm_set, CK_243X),
Device name and the clk_name should be interchanged right?
Something like this?
CLK("cpufreq-cpu0.0",NULL, &virt_prcm_set, CK_243X),
If yes the same should apply to all the instances.
> };
>
> static const char *enable_init_clks[] = { diff --git a/arch/arm/mach-
> omap2/cclock3xxx_data.c b/arch/arm/mach-omap2/cclock3xxx_data.c
> index 4579c3c..7a1dfde 100644
> --- a/arch/arm/mach-omap2/cclock3xxx_data.c
> +++ b/arch/arm/mach-omap2/cclock3xxx_data.c
> @@ -3501,7 +3501,7 @@ static struct omap_clk omap3xxx_clks[] = {
> CLK(NULL, "uart4_ick",&uart4_ick_am35xx, CK_AM35XX),
> CLK(NULL, "timer_32k_ck", &omap_32k_fck, CK_3XXX),
> CLK(NULL, "timer_sys_ck", &sys_ck,CK_3XXX),
> - CLK(NULL, "cpufreq_ck", &dpll1_ck, CK_3XXX),
> + CLK(NULL,
Re: [PATCH 1/2] cpufreq: cpufreq-cpu0: support for clock which are not in DT yet.
On 10:17-20130312, J, KEERTHY wrote: > > OK. My intent is to remove omap-cpufreq.c. So, I guess I could do > > something like the following (not tested yet), but would that be the > > right approach? > > Similar attempt was done for am33xx_clks in this by Shawn: > > http://www.mail-archive.com/linux-omap@vger.kernel.org/msg84157.html Thanks on the same and all inputs folks. Based on the discussion, will give it another shot to make the patch apply for all OMAPs - Since we are gradually transitioning to DT, we should be able to gradually drop features to being enabled only in DT supported boot. This will allow us to remove redundant drivers from the kernel. I hope this sounds reasonable to all. -- Regards, Nishanth Menon -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
