From: Mike Turquette <mturquette@linaro.org>
To: Tero Kristo <t-kristo@ti.com>,
linux-omap@vger.kernel.org, paul@pwsan.com, tony@atomide.com,
nm@ti.com, rnayak@ti.com
Cc: linux-arm-kernel@lists.infradead.org,
devicetree-discuss@lists.ozlabs.org
Subject: Re: [PATCH 4/4] ARM: DRA7: clockdomain data: add init file for dra7
Date: Fri, 28 Jun 2013 14:04:30 -0700 [thread overview]
Message-ID: <20130628210430.14831.99127@quantum> (raw)
In-Reply-To: <1372322299-25046-5-git-send-email-t-kristo@ti.com>
Quoting Tero Kristo (2013-06-27 01:38:19)
> cclock7xx_data.c now contains only init function and the clkdev mapping
> that is still needed by some drivers. Eventually most of this file can
> be removed, once a common location for the clk init can be found, and
> the clkdev mapping is no longer needed.
>
> Signed-off-by: Tero Kristo <t-kristo@ti.com>
> ---
> arch/arm/mach-omap2/cclock7xx_data.c | 93 ++++++++++++++++++++++++++++++++++
> 1 file changed, 93 insertions(+)
> create mode 100644 arch/arm/mach-omap2/cclock7xx_data.c
Why not drivers/clk/omap/clk-dra7xx.c?
Regards,
Mike
>
> diff --git a/arch/arm/mach-omap2/cclock7xx_data.c b/arch/arm/mach-omap2/cclock7xx_data.c
> new file mode 100644
> index 0000000..dba528a
> --- /dev/null
> +++ b/arch/arm/mach-omap2/cclock7xx_data.c
> @@ -0,0 +1,83 @@
> +/*
> + * DRA7xx Clock data
> + *
> + * Copyright (C) 2013 Texas Instruments, Inc.
> + *
> + * Paul Walmsley (paul@pwsan.com)
> + * Rajendra Nayak (rnayak@ti.com)
> + * Benoit Cousson (b-cousson@ti.com)
> + * Mike Turquette (mturquette@linaro.org)
> + * Tero Kristo (t-kristo@ti.com)
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/list.h>
> +#include <linux/clk-provider.h>
> +#include <linux/clkdev.h>
> +#include <linux/io.h>
> +#include <linux/clk/omap.h>
> +
> +#include "soc.h"
> +#include "clock.h"
> +
> +#define DRA7_DPLL_ABE_DEFFREQ 361267200
> +#define DRA7_DPLL_GMAC_DEFFREQ 1000000000
> +
> +/*
> + * clkdev
> + */
> +
> +static struct omap_dt_clk dra7xx_clks[] = {
> + DT_CLK(NULL, "timer_32k_ck", "sys_32k_ck"),
> + DT_CLK("4ae18000.timer", "timer_sys_ck", "sys_clkin2"),
> + DT_CLK("48032000.timer", "timer_sys_ck", "sys_clkin2"),
> + DT_CLK("48034000.timer", "timer_sys_ck", "sys_clkin2"),
> + DT_CLK("48036000.timer", "timer_sys_ck", "sys_clkin2"),
> + DT_CLK("4803e000.timer", "timer_sys_ck", "sys_clkin2"),
> + DT_CLK("48086000.timer", "timer_sys_ck", "sys_clkin2"),
> + DT_CLK("48088000.timer", "timer_sys_ck", "sys_clkin2"),
> + DT_CLK("48820000.timer", "timer_sys_ck", "timer_sys_clk_div"),
> + DT_CLK("48822000.timer", "timer_sys_ck", "timer_sys_clk_div"),
> + DT_CLK("48824000.timer", "timer_sys_ck", "timer_sys_clk_div"),
> + DT_CLK("48826000.timer", "timer_sys_ck", "timer_sys_clk_div"),
> + DT_CLK(NULL, "sys_clkin", "sys_clkin1"),
> +};
> +
> +int __init dra7xx_clk_init(void)
> +{
> + struct clk *abe_dpll_mux, *sys_clkin2, *dpll_ck;
> + int rc;
> + /*
> + * Must stay commented until all OMAP SoC drivers are
> + * converted to runtime PM, or drivers may start crashing
> + *
> + * omap2_clk_disable_clkdm_control();
> + */
> +
> + dt_omap_clk_init();
> +
> + omap_dt_clocks_register(dra7xx_clks, ARRAY_SIZE(dra7xx_clks));
> +
> + omap2_clk_disable_autoidle_all();
> +
> + abe_dpll_mux = clk_get_sys(NULL, "abe_dpll_sys_clk_mux");
> + sys_clkin2 = clk_get_sys(NULL, "sys_clkin2");
> + dpll_ck = clk_get_sys(NULL, "dpll_abe_ck");
> +
> + rc = clk_set_parent(abe_dpll_mux, sys_clkin2);
> + if (!rc)
> + rc = clk_set_rate(dpll_ck, DRA7_DPLL_ABE_DEFFREQ);
> + if (rc)
> + pr_err("%s: failed to configure ABE DPLL!\n", __func__);
> +
> + dpll_ck = clk_get_sys(NULL, "dpll_gmac_ck");
> + rc = clk_set_rate(dpll_ck, DRA7_DPLL_GMAC_DEFFREQ);
> + if (rc)
> + pr_err("%s: failed to configure GMAC DPLL!\n", __func__);
> +
> + return 0;
> +}
> --
> 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: mturquette@linaro.org (Mike Turquette)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/4] ARM: DRA7: clockdomain data: add init file for dra7
Date: Fri, 28 Jun 2013 14:04:30 -0700 [thread overview]
Message-ID: <20130628210430.14831.99127@quantum> (raw)
In-Reply-To: <1372322299-25046-5-git-send-email-t-kristo@ti.com>
Quoting Tero Kristo (2013-06-27 01:38:19)
> cclock7xx_data.c now contains only init function and the clkdev mapping
> that is still needed by some drivers. Eventually most of this file can
> be removed, once a common location for the clk init can be found, and
> the clkdev mapping is no longer needed.
>
> Signed-off-by: Tero Kristo <t-kristo@ti.com>
> ---
> arch/arm/mach-omap2/cclock7xx_data.c | 93 ++++++++++++++++++++++++++++++++++
> 1 file changed, 93 insertions(+)
> create mode 100644 arch/arm/mach-omap2/cclock7xx_data.c
Why not drivers/clk/omap/clk-dra7xx.c?
Regards,
Mike
>
> diff --git a/arch/arm/mach-omap2/cclock7xx_data.c b/arch/arm/mach-omap2/cclock7xx_data.c
> new file mode 100644
> index 0000000..dba528a
> --- /dev/null
> +++ b/arch/arm/mach-omap2/cclock7xx_data.c
> @@ -0,0 +1,83 @@
> +/*
> + * DRA7xx Clock data
> + *
> + * Copyright (C) 2013 Texas Instruments, Inc.
> + *
> + * Paul Walmsley (paul at pwsan.com)
> + * Rajendra Nayak (rnayak at ti.com)
> + * Benoit Cousson (b-cousson at ti.com)
> + * Mike Turquette (mturquette at linaro.org)
> + * Tero Kristo (t-kristo at ti.com)
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/list.h>
> +#include <linux/clk-provider.h>
> +#include <linux/clkdev.h>
> +#include <linux/io.h>
> +#include <linux/clk/omap.h>
> +
> +#include "soc.h"
> +#include "clock.h"
> +
> +#define DRA7_DPLL_ABE_DEFFREQ 361267200
> +#define DRA7_DPLL_GMAC_DEFFREQ 1000000000
> +
> +/*
> + * clkdev
> + */
> +
> +static struct omap_dt_clk dra7xx_clks[] = {
> + DT_CLK(NULL, "timer_32k_ck", "sys_32k_ck"),
> + DT_CLK("4ae18000.timer", "timer_sys_ck", "sys_clkin2"),
> + DT_CLK("48032000.timer", "timer_sys_ck", "sys_clkin2"),
> + DT_CLK("48034000.timer", "timer_sys_ck", "sys_clkin2"),
> + DT_CLK("48036000.timer", "timer_sys_ck", "sys_clkin2"),
> + DT_CLK("4803e000.timer", "timer_sys_ck", "sys_clkin2"),
> + DT_CLK("48086000.timer", "timer_sys_ck", "sys_clkin2"),
> + DT_CLK("48088000.timer", "timer_sys_ck", "sys_clkin2"),
> + DT_CLK("48820000.timer", "timer_sys_ck", "timer_sys_clk_div"),
> + DT_CLK("48822000.timer", "timer_sys_ck", "timer_sys_clk_div"),
> + DT_CLK("48824000.timer", "timer_sys_ck", "timer_sys_clk_div"),
> + DT_CLK("48826000.timer", "timer_sys_ck", "timer_sys_clk_div"),
> + DT_CLK(NULL, "sys_clkin", "sys_clkin1"),
> +};
> +
> +int __init dra7xx_clk_init(void)
> +{
> + struct clk *abe_dpll_mux, *sys_clkin2, *dpll_ck;
> + int rc;
> + /*
> + * Must stay commented until all OMAP SoC drivers are
> + * converted to runtime PM, or drivers may start crashing
> + *
> + * omap2_clk_disable_clkdm_control();
> + */
> +
> + dt_omap_clk_init();
> +
> + omap_dt_clocks_register(dra7xx_clks, ARRAY_SIZE(dra7xx_clks));
> +
> + omap2_clk_disable_autoidle_all();
> +
> + abe_dpll_mux = clk_get_sys(NULL, "abe_dpll_sys_clk_mux");
> + sys_clkin2 = clk_get_sys(NULL, "sys_clkin2");
> + dpll_ck = clk_get_sys(NULL, "dpll_abe_ck");
> +
> + rc = clk_set_parent(abe_dpll_mux, sys_clkin2);
> + if (!rc)
> + rc = clk_set_rate(dpll_ck, DRA7_DPLL_ABE_DEFFREQ);
> + if (rc)
> + pr_err("%s: failed to configure ABE DPLL!\n", __func__);
> +
> + dpll_ck = clk_get_sys(NULL, "dpll_gmac_ck");
> + rc = clk_set_rate(dpll_ck, DRA7_DPLL_GMAC_DEFFREQ);
> + if (rc)
> + pr_err("%s: failed to configure GMAC DPLL!\n", __func__);
> +
> + return 0;
> +}
> --
> 1.7.9.5
next prev parent reply other threads:[~2013-06-28 21:04 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-27 8:38 [PATCH 0/4] ARM: OMAP5 and DRA7 clock data Tero Kristo
2013-06-27 8:38 ` Tero Kristo
2013-06-27 8:38 ` [PATCH 1/4] ARM: dts: omap5 " Tero Kristo
2013-06-27 8:38 ` Tero Kristo
2013-06-27 8:38 ` [PATCH 2/4] ARM: OMAP5: clockdomain data: add init file for omap54xx Tero Kristo
2013-06-27 8:38 ` Tero Kristo
2013-06-27 8:44 ` Felipe Balbi
2013-06-27 8:44 ` Felipe Balbi
2013-06-27 9:24 ` Tero Kristo
2013-06-27 9:24 ` Tero Kristo
2013-06-27 10:06 ` Felipe Balbi
2013-06-27 10:06 ` Felipe Balbi
2013-06-28 21:03 ` Mike Turquette
2013-06-28 21:03 ` Mike Turquette
2013-07-08 7:28 ` Tero Kristo
2013-07-08 7:28 ` Tero Kristo
2013-06-27 8:38 ` [PATCH 3/4] ARM: dts: dra7xx clock data Tero Kristo
2013-06-27 8:38 ` Tero Kristo
2013-06-27 8:38 ` [PATCH 4/4] ARM: DRA7: clockdomain data: add init file for dra7 Tero Kristo
2013-06-27 8:38 ` Tero Kristo
2013-06-28 21:04 ` Mike Turquette [this message]
2013-06-28 21:04 ` Mike Turquette
2013-07-08 7:29 ` Tero Kristo
2013-07-08 7:29 ` Tero Kristo
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=20130628210430.14831.99127@quantum \
--to=mturquette@linaro.org \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=nm@ti.com \
--cc=paul@pwsan.com \
--cc=rnayak@ti.com \
--cc=t-kristo@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.