From: mturquette@linaro.org (Mike Turquette)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 03/13] clk: rockchip: add basic infrastructure for clock branches
Date: Tue, 01 Jul 2014 11:45:15 -0700 [thread overview]
Message-ID: <20140701184515.32686.69435@quantum> (raw)
In-Reply-To: <5016876.bZlHhqDB9E@diego>
Quoting Heiko St?bner (2014-06-22 13:44:07)
> +void __init rockchip_clk_register_branches(
> + struct rockchip_clk_branch *list,
> + unsigned int nr_clk)
> +{
> + struct clk *clk;
clk should be initialized to NULL here, otherwise I get a warning down
below ...
> + unsigned int idx;
> + unsigned long flags;
> +
> + for (idx = 0; idx < nr_clk; idx++, list++) {
> + flags = list->flags;
> +
> + /* catch simple muxes */
> + switch (list->branch_type) {
> + case branch_mux:
> + clk = clk_register_mux(NULL, list->name,
> + list->parent_names, list->num_parents,
> + flags, reg_base + list->muxdiv_offset,
> + list->mux_shift, list->mux_width,
> + list->mux_flags, &clk_lock);
> + break;
> + case branch_divider:
> + if (list->div_table)
> + clk = clk_register_divider_table(NULL,
> + list->name, list->parent_names[0],
> + flags, reg_base + list->muxdiv_offset,
> + list->div_shift, list->div_width,
> + list->div_flags, list->div_table,
> + &clk_lock);
> + else
> + clk = clk_register_divider(NULL, list->name,
> + list->parent_names[0], flags,
> + reg_base + list->muxdiv_offset,
> + list->div_shift, list->div_width,
> + list->div_flags, &clk_lock);
> + break;
> + case branch_fraction_divider:
> + /* unimplemented */
> + continue;
> + break;
> + case branch_gate:
> + flags |= CLK_SET_RATE_PARENT;
> +
> + /* keep all gates untouched for now */
> + flags |= CLK_IGNORE_UNUSED;
> +
> + clk = clk_register_gate(NULL, list->name,
> + list->parent_names[0], flags,
> + reg_base + list->gate_offset,
> + list->gate_shift, list->gate_flags, &clk_lock);
> + break;
> + case branch_composite:
> + /* keep all gates untouched for now */
> + flags |= CLK_IGNORE_UNUSED;
> +
> + clk = rockchip_clk_register_branch(list->name,
> + list->parent_names, list->num_parents,
> + reg_base, list->muxdiv_offset, list->mux_shift,
> + list->mux_width, list->mux_flags,
> + list->div_shift, list->div_width,
> + list->div_flags, list->div_table,
> + list->gate_offset, list->gate_shift,
> + list->gate_flags, flags, &clk_lock);
> + break;
> + }
> +
> + if (IS_ERR(clk)) {
... here. gcc throws:
"""
drivers/clk/rockchip/clk.c: In function ?rockchip_clk_register_branches?:
include/linux/err.h:35:22: warning: ?clk? may be used uninitialized in this function [-Wmaybe-uninitialized]
return IS_ERR_VALUE((unsigned long)ptr);
"""
Regards,
Mike
> + pr_err("%s: failed to register clock %s: %ld\n",
> + __func__, list->name, PTR_ERR(clk));
> + continue;
> + }
> +
> + rockchip_clk_add_lookup(clk, list->id);
> + }
> +}
> diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h
> new file mode 100644
> index 0000000..5b051b0
> --- /dev/null
> +++ b/drivers/clk/rockchip/clk.h
> @@ -0,0 +1,250 @@
> +/*
> + * Copyright (c) 2014 MundoReader S.L.
> + * Author: Heiko Stuebner <heiko@sntech.de>
> + *
> + * based on
> + *
> + * samsung/clk.h
> + * Copyright (c) 2013 Samsung Electronics Co., Ltd.
> + * Copyright (c) 2013 Linaro Ltd.
> + * Author: Thomas Abraham <thomas.ab@samsung.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + */
> +
> +#ifndef CLK_ROCKCHIP_CLK_H
> +#define CLK_ROCKCHIP_CLK_H
> +
> +#include <linux/io.h>
> +#include <linux/clk.h>
> +#include <linux/clk-provider.h>
> +
> +#define HIWORD_UPDATE(val, mask, shift) \
> + ((val) << (shift) | (mask) << ((shift) + 16))
> +
> +/* register positions shared by RK2928, RK3066 and RK3188 */
> +#define RK2928_PLL_CON(x) (x * 0x4)
> +#define RK2928_MODE_CON 0x40
> +#define RK2928_CLKSEL_CON(x) (x * 0x4 + 0x44)
> +#define RK2928_CLKGATE_CON(x) (x * 0x4 + 0xd0)
> +#define RK2928_GLB_SRST_FST 0x100
> +#define RK2928_GLB_SRST_SND 0x104
> +#define RK2928_SOFTRST_CON(x) (x * 0x4 + 0x110)
> +#define RK2928_MISC_CON 0x134
> +
> +#define PNAME(x) static const char *x[] __initconst
> +
> +enum rockchip_clk_branch_type {
> + branch_composite,
> + branch_mux,
> + branch_divider,
> + branch_fraction_divider,
> + branch_gate,
> +};
> +
> +struct rockchip_clk_branch {
> + unsigned int id;
> + enum rockchip_clk_branch_type branch_type;
> + const char *name;
> + const char **parent_names;
> + u8 num_parents;
> + unsigned long flags;
> + int muxdiv_offset;
> + u8 mux_shift;
> + u8 mux_width;
> + u8 mux_flags;
> + u8 div_shift;
> + u8 div_width;
> + u8 div_flags;
> + struct clk_div_table *div_table;
> + int gate_offset;
> + u8 gate_shift;
> + u8 gate_flags;
> +};
> +
> +#define COMPOSITE(_id, cname, pnames, f, mo, ms, mw, mf, ds, dw,\
> + df, go, gs, gf) \
> + { \
> + .id = _id, \
> + .branch_type = branch_composite, \
> + .name = cname, \
> + .parent_names = pnames, \
> + .num_parents = ARRAY_SIZE(pnames), \
> + .flags = f, \
> + .muxdiv_offset = mo, \
> + .mux_shift = ms, \
> + .mux_width = mw, \
> + .mux_flags = mf, \
> + .div_shift = ds, \
> + .div_width = dw, \
> + .div_flags = df, \
> + .gate_offset = go, \
> + .gate_shift = gs, \
> + .gate_flags = gf, \
> + }
> +
> +#define COMPOSITE_NOMUX(_id, cname, pname, f, mo, ds, dw, df, \
> + go, gs, gf) \
> + { \
> + .id = _id, \
> + .branch_type = branch_composite, \
> + .name = cname, \
> + .parent_names = (const char *[]){ pname }, \
> + .num_parents = 1, \
> + .flags = f, \
> + .muxdiv_offset = mo, \
> + .div_shift = ds, \
> + .div_width = dw, \
> + .div_flags = df, \
> + .gate_offset = go, \
> + .gate_shift = gs, \
> + .gate_flags = gf, \
> + }
> +
> +#define COMPOSITE_NOMUX_DIVTBL(_id, cname, pname, f, mo, ds, dw,\
> + df, dt, go, gs, gf) \
> + { \
> + .id = _id, \
> + .branch_type = branch_composite, \
> + .name = cname, \
> + .parent_names = (const char *[]){ pname }, \
> + .num_parents = 1, \
> + .flags = f, \
> + .muxdiv_offset = mo, \
> + .div_shift = ds, \
> + .div_width = dw, \
> + .div_flags = df, \
> + .div_table = dt, \
> + .gate_offset = go, \
> + .gate_shift = gs, \
> + .gate_flags = gf, \
> + }
> +
> +#define COMPOSITE_NODIV(_id, cname, pnames, f, mo, ms, mw, mf, \
> + go, gs, gf) \
> + { \
> + .id = _id, \
> + .branch_type = branch_composite, \
> + .name = cname, \
> + .parent_names = pnames, \
> + .num_parents = ARRAY_SIZE(pnames), \
> + .flags = f, \
> + .muxdiv_offset = mo, \
> + .mux_shift = ms, \
> + .mux_width = mw, \
> + .mux_flags = mf, \
> + .gate_offset = go, \
> + .gate_shift = gs, \
> + .gate_flags = gf, \
> + }
> +
> +#define COMPOSITE_NOGATE(_id, cname, pnames, f, mo, ms, mw, mf, \
> + ds, dw, df) \
> + { \
> + .id = _id, \
> + .branch_type = branch_composite, \
> + .name = cname, \
> + .parent_names = pnames, \
> + .num_parents = ARRAY_SIZE(pnames), \
> + .flags = f, \
> + .muxdiv_offset = mo, \
> + .mux_shift = ms, \
> + .mux_width = mw, \
> + .mux_flags = mf, \
> + .div_shift = ds, \
> + .div_width = dw, \
> + .div_flags = df, \
> + .gate_offset = -1, \
> + }
> +
> +#define COMPOSITE_FRAC(_id, cname, pname, f, mo, df, go, gs, gf)\
> + { \
> + .id = _id, \
> + .branch_type = branch_fraction_divider, \
> + .name = cname, \
> + .parent_names = (const char *[]){ pname }, \
> + .num_parents = 1, \
> + .flags = f, \
> + .muxdiv_offset = mo, \
> + .div_shift = 16, \
> + .div_width = 16, \
> + .div_flags = df, \
> + .gate_offset = go, \
> + .gate_shift = gs, \
> + .gate_flags = gf, \
> + }
> +
> +#define MUX(_id, cname, pnames, f, o, s, w, mf) \
> + { \
> + .id = _id, \
> + .branch_type = branch_mux, \
> + .name = cname, \
> + .parent_names = pnames, \
> + .num_parents = ARRAY_SIZE(pnames), \
> + .flags = f, \
> + .muxdiv_offset = o, \
> + .mux_shift = s, \
> + .mux_width = w, \
> + .mux_flags = mf, \
> + .gate_offset = -1, \
> + }
> +
> +#define DIV(_id, cname, pname, f, o, s, w, df) \
> + { \
> + .id = _id, \
> + .branch_type = branch_divider, \
> + .name = cname, \
> + .parent_names = (const char *[]){ pname }, \
> + .num_parents = 1, \
> + .flags = f, \
> + .muxdiv_offset = o, \
> + .div_shift = s, \
> + .div_width = w, \
> + .div_flags = df, \
> + .gate_offset = -1, \
> + }
> +
> +#define DIVTBL(_id, cname, pname, f, o, s, w, df, dt) \
> + { \
> + .id = _id, \
> + .branch_type = branch_divider, \
> + .name = cname, \
> + .parent_names = (const char *[]){ pname }, \
> + .num_parents = 1, \
> + .flags = f, \
> + .muxdiv_offset = o, \
> + .div_shift = s, \
> + .div_width = w, \
> + .div_flags = df, \
> + .div_table = dt, \
> + }
> +
> +#define GATE(_id, cname, pname, f, o, b, gf) \
> + { \
> + .id = _id, \
> + .branch_type = branch_gate, \
> + .name = cname, \
> + .parent_names = (const char *[]){ pname }, \
> + .num_parents = 1, \
> + .flags = f, \
> + .gate_offset = o, \
> + .gate_shift = b, \
> + .gate_flags = gf, \
> + }
> +
> +
> +void rockchip_clk_init(struct device_node *np, void __iomem *base,
> + unsigned long nr_clks);
> +void rockchip_clk_add_lookup(struct clk *clk, unsigned int id);
> +void rockchip_clk_register_branches(struct rockchip_clk_branch *clk_list,
> + unsigned int nr_clk);
> +
> +#endif
> --
> 1.9.0
>
>
next prev parent reply other threads:[~2014-07-01 18:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-22 20:41 [PATCH v4 00/13] Clock support for rk3066,rk3188 and rk3288 Heiko Stübner
2014-06-22 20:43 ` [PATCH v4 01/13] clk: composite: support determine_rate using rate_ops->round_rate + mux_ops->set_parent Heiko Stübner
2014-06-25 7:57 ` Gabriel Fernandez
2014-06-30 22:00 ` [PATCH v4.1 " Heiko Stübner
2014-07-01 9:30 ` [PATCH v4.2 " Heiko Stübner
2014-06-22 20:43 ` [PATCH v4 02/13] clk: composite: allow read-only clocks Heiko Stübner
2014-07-01 20:46 ` Mike Turquette
2014-06-22 20:44 ` [PATCH v4 03/13] clk: rockchip: add basic infrastructure for clock branches Heiko Stübner
2014-07-01 18:45 ` Mike Turquette [this message]
2014-06-22 20:44 ` [PATCH v4 04/13] clk: rockchip: add clock type for pll clocks and pll used on rk3066 Heiko Stübner
2014-06-22 20:45 ` [PATCH v4 05/13] clk: rockchip: add reset controller Heiko Stübner
2014-06-22 20:46 ` [PATCH v4 06/13] dt-bindings: add documentation for rk3188 clock and reset unit Heiko Stübner
2014-06-22 20:47 ` [PATCH v4 07/13] clk: rockchip: add clock driver for rk3188 and rk3066 clocks Heiko Stübner
2014-06-22 20:47 ` [PATCH v4 08/13] ARM: rockchip: Select ARCH_HAS_RESET_CONTROLLER Heiko Stübner
2014-06-22 20:48 ` [PATCH v4 09/13] ARM: dts: rockchip: add cru nodes and update device clocks to use it Heiko Stübner
2014-06-22 20:48 ` [PATCH v4 10/13] ARM: dts: rockchip: move oscillator input clock into main dtsi Heiko Stübner
2014-06-22 20:49 ` [PATCH v4 11/13] arm: dts: rockchip: remove obsolete clock gate definitions Heiko Stübner
2014-06-22 20:49 ` [PATCH v4 12/13] clk: rockchip: add clock controller for rk3288 Heiko Stübner
2014-06-22 20:50 ` [PATCH v4 13/13] dt-bindings: add documentation for rk3288 cru Heiko Stübner
2014-06-29 17:41 ` [PATCH v4 00/13] Clock support for rk3066,rk3188 and rk3288 Max Schwarz
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=20140701184515.32686.69435@quantum \
--to=mturquette@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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