mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
new device support in terms of LoC, but there has been some cleanup in the core as well as the usual minor clk additions to various drivers. Core: - parent tracking has been simplified - CLK_IS_ROOT is now a no-op flag, cleaning up drivers has started - of_clk_init() doesn't consider disabled DT nodes anymore - clk_unregister() had an error path bug squashed - of_clk_get_parent_count() has been fixed to only return unsigned ints - HAVE_MACH_CLKDEV is removed now that the last arch user (ARM) is gone New Drivers: - NXP LPC18xx creg - QCOM IPQ4019 GCC - TI dm814x ADPLL - i.MX6QP Updates: - Cyngus audio clks found on Broadcom iProc devices - Non-critical fixes for BCM2385 PLLs - Samsung exynos5433 updates for clk id errors, HDMI support, suspend/resume simplifications - USB, CAN, LVDS, and FCP clks on shmobile devices - sunxi got support for more clks on new SoCs and went through a minor refactoring/rewrite to use a simpler factor clk construct - rockchip added some more clk ids and added suport for fraction dividers - QCOM GDSCs in msm8996 - A new devm helper to make adding custom actions simpler (acked by Greg) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCAAGBQJW8fPZAAoJENidgRMleOc9sc0P/2b4k8FiFwjMXiiXI1rcEjiz ZjeVxzyAcwBiYoL8a2XONd+pihjLNcAbDbjk8SGUzmKDDz7elQbrhby/6o1dPlW/ fQEQFa8Xa8zhZgidO1AFc1DmIcPg/u/Z58wHbjIcqDjvzKA63213Ud34NJsRtF6y +EJrIUZiTtj5q1pJgDmqlOv6ImmQtgW/AN51vNXCNNCyS9OsSgQm0DK5/f485HNc 2y5NE5hpijso69HFet5chuT3DiDLz/0dxmgCm/w9CRRzkHxYl3lxV/v07B+rZBo5 cWplFfvJqX7PvQtcP0sPPzZUfGT/vOeTboWprQwI4R3RObS18xLqlq6DEvOTmnqW Jh+9uNBq4+kwSz5GcYjpwvj7+W0FPgIaBVRHrEW9qeXkgDpYloPtnEt8C8GmO6Bt O0bgIzETq9mnRTA+VesIfjmTa4IYRDDUoDwGTw5CnW3jaZmtYJh8GhgZulMfPfyK vfWQkY2OesXFwct0rU8tFiswTPeTRgXqL3AsPYjTPAHx1kfBpvfOQTCzzT7eSBr7 jykd9EXsXrYb/rpIxW7j6KjPpaWu+EouK06wc4TIBGrrWVTIV0ZvybzOBgf0FnpS UDx87OyQb8x9TDMrfKf6bmJyly8y1dXkutFYY4XKIGUydlXIf0kn7AnIXW6SR7mX fTEdLFMZ03ViCojtah5r =bZFY -----END PGP SIGNATURE----- Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux Pull clk updates from Stephen Boyd: "The clk changes for this release cycle are mostly dominated by new device support in terms of LoC, but there has been some cleanup in the core as well as the usual minor clk additions to various drivers. Core: - parent tracking has been simplified - CLK_IS_ROOT is now a no-op flag, cleaning up drivers has started - of_clk_init() doesn't consider disabled DT nodes anymore - clk_unregister() had an error path bug squashed - of_clk_get_parent_count() has been fixed to only return unsigned ints - HAVE_MACH_CLKDEV is removed now that the last arch user (ARM) is gone New Drivers: - NXP LPC18xx creg - QCOM IPQ4019 GCC - TI dm814x ADPLL - i.MX6QP Updates: - Cyngus audio clks found on Broadcom iProc devices - Non-critical fixes for BCM2385 PLLs - Samsung exynos5433 updates for clk id errors, HDMI support, suspend/resume simplifications - USB, CAN, LVDS, and FCP clks on shmobile devices - sunxi got support for more clks on new SoCs and went through a minor refactoring/rewrite to use a simpler factor clk construct - rockchip added some more clk ids and added suport for fraction dividers - QCOM GDSCs in msm8996 - A new devm helper to make adding custom actions simpler (acked by Greg)" * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (197 commits) clk: bcm2835: fix check of error code returned by devm_ioremap_resource() clk: renesas: div6: use RENESAS for #define clk: renesas: Rename header file renesas.h clk: max77{686,802}: Remove CLK_IS_ROOT clk: versatile: Remove CLK_IS_ROOT clk: sunxi: Remove use of variable length array clk: fixed-rate: Remove CLK_IS_ROOT clk: qcom: Remove CLK_IS_ROOT doc: dt: add documentation for lpc1850-creg-clk driver clk: add lpc18xx creg clk driver clk: lpc32xx: fix compilation warning clk: xgene: Add missing parenthesis when clearing divider value clk: mb86s7x: Remove CLK_IS_ROOT clk: x86: Remove clkdev.h and clk.h includes clk: x86: Remove CLK_IS_ROOT clk: mvebu: Remove CLK_IS_ROOT clk: renesas: move drivers to renesas directory clk: si5{14,351,70}: Remove CLK_IS_ROOT clk: scpi: Remove CLK_IS_ROOT clk: s2mps11: Remove CLK_IS_ROOT ...
249 lines
6 KiB
C
249 lines
6 KiB
C
/*
|
|
* Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.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.
|
|
*
|
|
*/
|
|
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/clkdev.h>
|
|
#include <linux/clk/at91_pmc.h>
|
|
#include <linux/of.h>
|
|
#include <linux/mfd/syscon.h>
|
|
#include <linux/regmap.h>
|
|
|
|
#include "pmc.h"
|
|
|
|
#define MASTER_SOURCE_MAX 4
|
|
|
|
#define MASTER_PRES_MASK 0x7
|
|
#define MASTER_PRES_MAX MASTER_PRES_MASK
|
|
#define MASTER_DIV_SHIFT 8
|
|
#define MASTER_DIV_MASK 0x3
|
|
|
|
struct clk_master_characteristics {
|
|
struct clk_range output;
|
|
u32 divisors[4];
|
|
u8 have_div3_pres;
|
|
};
|
|
|
|
struct clk_master_layout {
|
|
u32 mask;
|
|
u8 pres_shift;
|
|
};
|
|
|
|
#define to_clk_master(hw) container_of(hw, struct clk_master, hw)
|
|
|
|
struct clk_master {
|
|
struct clk_hw hw;
|
|
struct regmap *regmap;
|
|
const struct clk_master_layout *layout;
|
|
const struct clk_master_characteristics *characteristics;
|
|
};
|
|
|
|
static inline bool clk_master_ready(struct regmap *regmap)
|
|
{
|
|
unsigned int status;
|
|
|
|
regmap_read(regmap, AT91_PMC_SR, &status);
|
|
|
|
return status & AT91_PMC_MCKRDY ? 1 : 0;
|
|
}
|
|
|
|
static int clk_master_prepare(struct clk_hw *hw)
|
|
{
|
|
struct clk_master *master = to_clk_master(hw);
|
|
|
|
while (!clk_master_ready(master->regmap))
|
|
cpu_relax();
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int clk_master_is_prepared(struct clk_hw *hw)
|
|
{
|
|
struct clk_master *master = to_clk_master(hw);
|
|
|
|
return clk_master_ready(master->regmap);
|
|
}
|
|
|
|
static unsigned long clk_master_recalc_rate(struct clk_hw *hw,
|
|
unsigned long parent_rate)
|
|
{
|
|
u8 pres;
|
|
u8 div;
|
|
unsigned long rate = parent_rate;
|
|
struct clk_master *master = to_clk_master(hw);
|
|
const struct clk_master_layout *layout = master->layout;
|
|
const struct clk_master_characteristics *characteristics =
|
|
master->characteristics;
|
|
unsigned int mckr;
|
|
|
|
regmap_read(master->regmap, AT91_PMC_MCKR, &mckr);
|
|
mckr &= layout->mask;
|
|
|
|
pres = (mckr >> layout->pres_shift) & MASTER_PRES_MASK;
|
|
div = (mckr >> MASTER_DIV_SHIFT) & MASTER_DIV_MASK;
|
|
|
|
if (characteristics->have_div3_pres && pres == MASTER_PRES_MAX)
|
|
rate /= 3;
|
|
else
|
|
rate >>= pres;
|
|
|
|
rate /= characteristics->divisors[div];
|
|
|
|
if (rate < characteristics->output.min)
|
|
pr_warn("master clk is underclocked");
|
|
else if (rate > characteristics->output.max)
|
|
pr_warn("master clk is overclocked");
|
|
|
|
return rate;
|
|
}
|
|
|
|
static u8 clk_master_get_parent(struct clk_hw *hw)
|
|
{
|
|
struct clk_master *master = to_clk_master(hw);
|
|
unsigned int mckr;
|
|
|
|
regmap_read(master->regmap, AT91_PMC_MCKR, &mckr);
|
|
|
|
return mckr & AT91_PMC_CSS;
|
|
}
|
|
|
|
static const struct clk_ops master_ops = {
|
|
.prepare = clk_master_prepare,
|
|
.is_prepared = clk_master_is_prepared,
|
|
.recalc_rate = clk_master_recalc_rate,
|
|
.get_parent = clk_master_get_parent,
|
|
};
|
|
|
|
static struct clk * __init
|
|
at91_clk_register_master(struct regmap *regmap,
|
|
const char *name, int num_parents,
|
|
const char **parent_names,
|
|
const struct clk_master_layout *layout,
|
|
const struct clk_master_characteristics *characteristics)
|
|
{
|
|
struct clk_master *master;
|
|
struct clk *clk = NULL;
|
|
struct clk_init_data init;
|
|
|
|
if (!name || !num_parents || !parent_names)
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
master = kzalloc(sizeof(*master), GFP_KERNEL);
|
|
if (!master)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
init.name = name;
|
|
init.ops = &master_ops;
|
|
init.parent_names = parent_names;
|
|
init.num_parents = num_parents;
|
|
init.flags = 0;
|
|
|
|
master->hw.init = &init;
|
|
master->layout = layout;
|
|
master->characteristics = characteristics;
|
|
master->regmap = regmap;
|
|
|
|
clk = clk_register(NULL, &master->hw);
|
|
if (IS_ERR(clk)) {
|
|
kfree(master);
|
|
}
|
|
|
|
return clk;
|
|
}
|
|
|
|
|
|
static const struct clk_master_layout at91rm9200_master_layout = {
|
|
.mask = 0x31F,
|
|
.pres_shift = 2,
|
|
};
|
|
|
|
static const struct clk_master_layout at91sam9x5_master_layout = {
|
|
.mask = 0x373,
|
|
.pres_shift = 4,
|
|
};
|
|
|
|
|
|
static struct clk_master_characteristics * __init
|
|
of_at91_clk_master_get_characteristics(struct device_node *np)
|
|
{
|
|
struct clk_master_characteristics *characteristics;
|
|
|
|
characteristics = kzalloc(sizeof(*characteristics), GFP_KERNEL);
|
|
if (!characteristics)
|
|
return NULL;
|
|
|
|
if (of_at91_get_clk_range(np, "atmel,clk-output-range", &characteristics->output))
|
|
goto out_free_characteristics;
|
|
|
|
of_property_read_u32_array(np, "atmel,clk-divisors",
|
|
characteristics->divisors, 4);
|
|
|
|
characteristics->have_div3_pres =
|
|
of_property_read_bool(np, "atmel,master-clk-have-div3-pres");
|
|
|
|
return characteristics;
|
|
|
|
out_free_characteristics:
|
|
kfree(characteristics);
|
|
return NULL;
|
|
}
|
|
|
|
static void __init
|
|
of_at91_clk_master_setup(struct device_node *np,
|
|
const struct clk_master_layout *layout)
|
|
{
|
|
struct clk *clk;
|
|
unsigned int num_parents;
|
|
const char *parent_names[MASTER_SOURCE_MAX];
|
|
const char *name = np->name;
|
|
struct clk_master_characteristics *characteristics;
|
|
struct regmap *regmap;
|
|
|
|
num_parents = of_clk_get_parent_count(np);
|
|
if (num_parents == 0 || num_parents > MASTER_SOURCE_MAX)
|
|
return;
|
|
|
|
of_clk_parent_fill(np, parent_names, num_parents);
|
|
|
|
of_property_read_string(np, "clock-output-names", &name);
|
|
|
|
characteristics = of_at91_clk_master_get_characteristics(np);
|
|
if (!characteristics)
|
|
return;
|
|
|
|
regmap = syscon_node_to_regmap(of_get_parent(np));
|
|
if (IS_ERR(regmap))
|
|
return;
|
|
|
|
clk = at91_clk_register_master(regmap, name, num_parents,
|
|
parent_names, layout,
|
|
characteristics);
|
|
if (IS_ERR(clk))
|
|
goto out_free_characteristics;
|
|
|
|
of_clk_add_provider(np, of_clk_src_simple_get, clk);
|
|
return;
|
|
|
|
out_free_characteristics:
|
|
kfree(characteristics);
|
|
}
|
|
|
|
static void __init of_at91rm9200_clk_master_setup(struct device_node *np)
|
|
{
|
|
of_at91_clk_master_setup(np, &at91rm9200_master_layout);
|
|
}
|
|
CLK_OF_DECLARE(at91rm9200_clk_master, "atmel,at91rm9200-clk-master",
|
|
of_at91rm9200_clk_master_setup);
|
|
|
|
static void __init of_at91sam9x5_clk_master_setup(struct device_node *np)
|
|
{
|
|
of_at91_clk_master_setup(np, &at91sam9x5_master_layout);
|
|
}
|
|
CLK_OF_DECLARE(at91sam9x5_clk_master, "atmel,at91sam9x5-clk-master",
|
|
of_at91sam9x5_clk_master_setup);
|