From: nm@ti•com (Nishanth Menon)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCHv4 09/33] CLK: omap: add omap4 clock init file
Date: Tue, 30 Jul 2013 14:33:42 -0500 [thread overview]
Message-ID: <51F81516.3050302@ti.com> (raw)
In-Reply-To: <1374564028-11352-10-git-send-email-t-kristo@ti.com>
On 07/23/2013 02:20 AM, Tero Kristo wrote:
> clk-44xx.c now contains the clock init functionality for omap4, including
> DT clock registration and adding of static clkdev entries.
>
> Signed-off-by: Tero Kristo <t-kristo@ti•com>
> ---
> drivers/clk/omap/clk-44xx.c | 118 +++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 118 insertions(+)
> create mode 100644 drivers/clk/omap/clk-44xx.c
>
> diff --git a/drivers/clk/omap/clk-44xx.c b/drivers/clk/omap/clk-44xx.c
> new file mode 100644
> index 0000000..cc12134
> --- /dev/null
> +++ b/drivers/clk/omap/clk-44xx.c
> @@ -0,0 +1,118 @@
> +/*
> + * OMAP4 Clock data
> + *
> + * Copyright (C) 2009-2012 Texas Instruments, Inc.
> + * Copyright (C) 2009-2010 Nokia Corporation
> + *
> + * Paul Walmsley (paul at pwsan.com)
> + * Rajendra Nayak (rnayak at ti.com)
> + * Benoit Cousson (b-cousson at ti.com)
> + * Mike Turquette (mturquette 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.
> + *
> + * XXX Some of the ES1 clocks have been removed/changed; once support
> + * is added for discriminating clocks by ES level, these should be added back
> + * in.
> + *
> + * XXX All of the remaining MODULEMODE clock nodes should be removed
> + * once the drivers are updated to use pm_runtime or to use the appropriate
> + * upstream clock node for rate/parent selection.
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/list.h>
> +#include <linux/clk-private.h>
> +#include <linux/clkdev.h>
> +#include <linux/io.h>
> +#include <linux/clk/omap.h>
> +
> +/*
> + * OMAP4 ABE DPLL default frequency. In OMAP4460 TRM version V, section
> + * "3.6.3.2.3 CM1_ABE Clock Generator" states that the "DPLL_ABE_X2_CLK
> + * must be set to 196.608 MHz" and hence, the DPLL locked frequency is
> + * half of this value.
> + */
> +#define OMAP4_DPLL_ABE_DEFFREQ 98304000
> +
> +/*
> + * OMAP4 USB DPLL default frequency. In OMAP4430 TRM version V, section
> + * "3.6.3.9.5 DPLL_USB Preferred Settings" shows that the preferred
> + * locked frequency for the USB DPLL is 960MHz.
> + */
> +#define OMAP4_DPLL_USB_DEFFREQ 960000000
> +
> +static struct omap_dt_clk omap44xx_clks[] = {
> + DT_CLK("smp_twd", NULL, "mpu_periphclk"),
> + DT_CLK("omapdss_dss", "ick", "dss_fck"),
> + DT_CLK("usbhs_omap", "fs_fck", "usb_host_fs_fck"),
> + DT_CLK("usbhs_omap", "hs_fck", "usb_host_hs_fck"),
> + DT_CLK("usbhs_omap", "usbtll_ick", "usb_tll_hs_ick"),
> + DT_CLK("usbhs_tll", "usbtll_ick", "usb_tll_hs_ick"),
> + DT_CLK(NULL, "timer_32k_ck", "sys_32k_ck"),
> + /* TODO: Remove "omap_timer.X" aliases once DT migration is complete */
> + DT_CLK("omap_timer.1", "timer_sys_ck", "sys_clkin_ck"),
> + DT_CLK("omap_timer.2", "timer_sys_ck", "sys_clkin_ck"),
> + DT_CLK("omap_timer.3", "timer_sys_ck", "sys_clkin_ck"),
> + DT_CLK("omap_timer.4", "timer_sys_ck", "sys_clkin_ck"),
> + DT_CLK("omap_timer.9", "timer_sys_ck", "sys_clkin_ck"),
> + DT_CLK("omap_timer.10", "timer_sys_ck", "sys_clkin_ck"),
> + DT_CLK("omap_timer.11", "timer_sys_ck", "sys_clkin_ck"),
> + DT_CLK("omap_timer.5", "timer_sys_ck", "syc_clk_div_ck"),
> + DT_CLK("omap_timer.6", "timer_sys_ck", "syc_clk_div_ck"),
> + DT_CLK("omap_timer.7", "timer_sys_ck", "syc_clk_div_ck"),
> + DT_CLK("omap_timer.8", "timer_sys_ck", "syc_clk_div_ck"),
> + DT_CLK("4a318000.timer", "timer_sys_ck", "sys_clkin_ck"),
> + DT_CLK("48032000.timer", "timer_sys_ck", "sys_clkin_ck"),
> + DT_CLK("48034000.timer", "timer_sys_ck", "sys_clkin_ck"),
> + DT_CLK("48036000.timer", "timer_sys_ck", "sys_clkin_ck"),
> + DT_CLK("4803e000.timer", "timer_sys_ck", "sys_clkin_ck"),
> + DT_CLK("48086000.timer", "timer_sys_ck", "sys_clkin_ck"),
> + DT_CLK("48088000.timer", "timer_sys_ck", "sys_clkin_ck"),
> + DT_CLK("40138000.timer", "timer_sys_ck", "syc_clk_div_ck"),
> + DT_CLK("4013a000.timer", "timer_sys_ck", "syc_clk_div_ck"),
> + DT_CLK("4013c000.timer", "timer_sys_ck", "syc_clk_div_ck"),
> + DT_CLK("4013e000.timer", "timer_sys_ck", "syc_clk_div_ck"),
> + DT_CLK(NULL, "cpufreq_ck", "dpll_mpu_ck"),
please remove cpufreq.
> +};
> +
> +int __init omap4xxx_clk_init(void)
> +{
> + int rc;
> + struct clk *abe_dpll_ref, *abe_dpll, *sys_32k_ck, *usb_dpll;
> +
> + /* FIXME register clocks from DT first */
> + dt_omap_clk_init();
> +
> + omap_dt_clocks_register(omap44xx_clks, ARRAY_SIZE(omap44xx_clks));
> +
> + omap2_clk_disable_autoidle_all();
> +
> + /*
> + * On OMAP4460 the ABE DPLL fails to turn on if in idle low-power
> + * state when turning the ABE clock domain. Workaround this by
> + * locking the ABE DPLL on boot.
> + * Lock the ABE DPLL in any case to avoid issues with audio.
> + */
But this code will be called for 4430 and 4460. if the requirement is
only for 4460, then we are not adhering to the spec?
> + abe_dpll_ref = clk_get_sys(NULL, "abe_dpll_refclk_mux_ck");
> + sys_32k_ck = clk_get_sys(NULL, "sys_32k_ck");
> + rc = clk_set_parent(abe_dpll_ref, sys_32k_ck);
> + abe_dpll = clk_get_sys(NULL, "dpll_abe_ck");
> + if (!rc)
> + rc = clk_set_rate(abe_dpll, OMAP4_DPLL_ABE_DEFFREQ);
> + if (rc)
> + pr_err("%s: failed to configure ABE DPLL!\n", __func__);
> +
> + /*
> + * Lock USB DPLL on OMAP4 devices so that the L3INIT power
> + * domain can transition to retention state when not in use.
> + */
> + usb_dpll = clk_get_sys(NULL, "dpll_usb_ck");
> + rc = clk_set_rate(usb_dpll, OMAP4_DPLL_USB_DEFFREQ);
> + if (rc)
> + pr_err("%s: failed to configure USB DPLL!\n", __func__);
^^^^ why cant we have a generic property that does this "automagically"
from dts property to the node?
a) be able to select a parent
b) be able to set a frequency.
c) how do we ensure that CLK_SET_RATE_PARENT are setup for the clock
nodes defined by dt?
> +
> + return 0;
> +}
>
--
Regards,
Nishanth Menon
next prev parent reply other threads:[~2013-07-30 19:33 UTC|newest]
Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-23 7:19 [PATCHv4 00/33] ARM: OMAP: clock conversion to DT Tero Kristo
2013-07-23 7:19 ` [PATCHv4 01/33] CLK: clkdev: add support for looking up clocks from DT Tero Kristo
2013-07-30 15:04 ` Nishanth Menon
2013-07-31 8:43 ` Tero Kristo
2013-07-23 7:19 ` [PATCHv4 02/33] clk: omap: introduce clock driver Tero Kristo
2013-07-30 15:21 ` Nishanth Menon
2013-07-31 8:59 ` Tero Kristo
2013-08-01 13:44 ` Nishanth Menon
2013-08-01 14:59 ` Tero Kristo
2013-07-23 7:19 ` [PATCHv4 03/33] CLK: OMAP4: Add DPLL clock support Tero Kristo
2013-07-30 16:23 ` Nishanth Menon
2013-07-31 9:46 ` Tero Kristo
2013-08-01 14:00 ` Nishanth Menon
2013-08-01 15:08 ` Tero Kristo
2013-08-01 15:13 ` Nishanth Menon
2013-08-01 8:29 ` Rajendra Nayak
2013-08-01 15:10 ` Nishanth Menon
2013-08-01 15:41 ` Tero Kristo
2013-07-23 7:19 ` [PATCHv4 04/33] CLK: omap: move part of the machine specific clock header contents to driver Tero Kristo
2013-07-30 18:22 ` Nishanth Menon
2013-07-31 9:59 ` Tero Kristo
2013-08-01 14:04 ` Nishanth Menon
2013-08-01 15:12 ` Tero Kristo
2013-08-01 15:21 ` Nishanth Menon
2013-07-23 7:20 ` [PATCHv4 05/33] CLK: omap: add DT duplicate clock registration mechanism Tero Kristo
2013-07-30 18:40 ` Nishanth Menon
2013-07-31 10:07 ` Tero Kristo
2013-08-01 14:25 ` Nishanth Menon
2013-08-01 15:18 ` Tero Kristo
2013-08-01 15:24 ` Nishanth Menon
2013-08-01 15:30 ` Tero Kristo
2013-08-02 7:22 ` Tony Lindgren
2013-07-23 7:20 ` [PATCHv4 06/33] CLK: omap: add autoidle support Tero Kristo
2013-07-30 18:56 ` Nishanth Menon
2013-07-31 10:13 ` Tero Kristo
2013-08-01 14:11 ` Nishanth Menon
2013-08-01 15:22 ` Tero Kristo
2013-07-23 7:20 ` [PATCHv4 07/33] CLK: omap: add support for OMAP gate clock Tero Kristo
2013-07-30 19:17 ` Nishanth Menon
2013-07-31 14:45 ` Tero Kristo
2013-08-01 14:33 ` Nishanth Menon
2013-08-01 15:29 ` Tero Kristo
2013-07-23 7:20 ` [PATCHv4 08/33] ARM: dts: omap4 clock data Tero Kristo
2013-07-30 19:27 ` Nishanth Menon
2013-07-31 14:49 ` Tero Kristo
2013-07-23 7:20 ` [PATCHv4 09/33] CLK: omap: add omap4 clock init file Tero Kristo
2013-07-30 19:33 ` Nishanth Menon [this message]
2013-07-31 14:52 ` Tero Kristo
2013-08-01 14:40 ` Nishanth Menon
2013-08-01 15:34 ` Tero Kristo
2013-08-01 16:10 ` Nishanth Menon
2013-07-23 7:20 ` [PATCHv4 10/33] ARM: OMAP4: remove old clock data and link in new clock init code Tero Kristo
2013-07-30 19:42 ` Nishanth Menon
2013-07-31 14:55 ` Tero Kristo
2013-07-23 7:20 ` [PATCHv4 11/33] ARM: dts: omap5 clock data Tero Kristo
2013-07-23 7:20 ` [PATCHv4 12/33] CLK: omap: add omap5 clock init file Tero Kristo
2013-07-23 7:20 ` [PATCHv4 13/33] ARM: dts: dra7 clock data Tero Kristo
2013-07-23 7:20 ` [PATCHv4 14/33] CLK: omap: add dra7 clock init file Tero Kristo
2013-07-23 7:20 ` [PATCHv4 15/33] CLK: OMAP: DPLL: add support for DT property ti, dpll-no-gate Tero Kristo
2013-07-30 19:18 ` [PATCHv4 15/33] CLK: OMAP: DPLL: add support for DT property ti,dpll-no-gate Nishanth Menon
2013-07-31 14:56 ` Tero Kristo
2013-07-23 7:20 ` [PATCHv4 16/33] CLK: OMAP: DPLL: do not of_iomap NULL autoidle register Tero Kristo
2013-07-30 19:49 ` Nishanth Menon
2013-07-31 14:57 ` Tero Kristo
2013-07-23 7:20 ` [PATCHv4 17/33] CLK: DT: add support for set-rate-parent flag Tero Kristo
2013-07-30 19:58 ` Nishanth Menon
2013-07-23 7:20 ` [PATCHv4 18/33] ARM: dts: am33xx clock data Tero Kristo
2013-07-23 7:20 ` [PATCHv4 19/33] CLK: omap: add am33xx clock init file Tero Kristo
2013-07-30 20:00 ` Nishanth Menon
2013-07-31 14:59 ` Tero Kristo
2013-08-01 14:43 ` Nishanth Menon
2013-08-01 15:35 ` Tero Kristo
2013-07-23 7:20 ` [PATCHv4 20/33] ARM: AM33xx: remove old clock data and link in new clock init code Tero Kristo
2013-07-23 7:20 ` [PATCHv4 21/33] CLK: OMAP: DPLL: add omap3 dpll support Tero Kristo
2013-07-30 20:08 ` Nishanth Menon
2013-07-31 15:03 ` Tero Kristo
2013-08-01 14:46 ` Nishanth Menon
2013-07-23 7:20 ` [PATCHv4 22/33] CLK: OMAP: update gate clock setup for OMAP3 Tero Kristo
2013-07-30 20:13 ` Nishanth Menon
2013-07-31 15:05 ` Tero Kristo
2013-07-23 7:20 ` [PATCHv4 23/33] CLK: OMAP: add interface clock support " Tero Kristo
2013-07-30 20:23 ` Nishanth Menon
2013-07-31 15:09 ` Tero Kristo
2013-08-01 14:50 ` Nishanth Menon
2013-07-23 7:20 ` [PATCHv4 24/33] CLK: OMAP: move some defines from machine to driver header Tero Kristo
2013-07-23 7:20 ` [PATCHv4 25/33] ARM: OMAP: hwmod: fix an incorrect clk type cast with _get_clkdm Tero Kristo
2013-07-23 7:20 ` [PATCHv4 26/33] CLK: omap: gate: add support for OMAP36xx dpllx_mx_ck:s Tero Kristo
2013-07-23 7:20 ` [PATCHv4 27/33] ARM: OMAP3: hwmod: initialize clkdm from clkdm_name Tero Kristo
2013-07-23 7:20 ` [PATCHv4 28/33] ARM: dts: omap3 clock data Tero Kristo
2013-07-23 7:20 ` [PATCHv4 30/33] clk: OMAP: DRA7: Add APLL support Tero Kristo
2013-07-23 7:20 ` [PATCHv4 31/33] ARM: dts: clk: Add apll related clocks Tero Kristo
2013-07-23 7:20 ` [PATCHv4 32/33] clk: OMAP: DRA7: Change apll_pcie_m2_ck to fixed factor clock Tero Kristo
2013-07-23 7:20 ` [PATCHv4 33/33] clk: DTS: DRA7: Add PCIe related clock nodes Tero Kristo
2013-07-23 8:24 ` [PATCHv4 00/33] ARM: OMAP: clock conversion to DT Tero Kristo
2013-07-24 14:16 ` Roger Quadros
2013-07-24 14:29 ` Tero Kristo
2013-07-24 14:34 ` Roger Quadros
2013-07-24 14:43 ` Tero Kristo
[not found] ` <1374564028-11352-30-git-send-email-t-kristo@ti.com>
2013-07-30 20:19 ` [PATCHv4 29/33] CLK: omap: add omap3 clock init file Nishanth Menon
2013-07-31 6:35 ` Tony Lindgren
2013-07-31 15:10 ` Tero Kristo
2013-08-02 7:24 ` Tony Lindgren
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=51F81516.3050302@ti.com \
--to=nm@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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