mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
![Chen-Yu Tsai](/assets/img/avatar_default.png)
As part of the effort to improve the MediaTek clk drivers, the next step is to switch from the old 'struct clk' clk prodivder APIs to the new 'struct clk_hw' ones. In a previous patch, 'struct clk_onecell_data' was replaced with 'struct clk_hw_onecell_data', with (struct clk_hw *)->clk and __clk_get_hw() bridging the new data structures and old code. Now switch from the old 'clk_(un)?register*()' APIs to the new 'clk_hw_(un)?register*()' ones. This is done with the coccinelle script below. Unfortunately this also leaves clk-mt8173.c with a compile error that would need a coccinelle script longer than the actual diff to fix. This last part is fixed up by hand. // Fix prototypes @@ identifier F =~ "^mtk_clk_register_"; @@ - struct clk * + struct clk_hw * F(...); // Fix calls to mtk_clk_register_<singular> @ reg @ identifier F =~ "^mtk_clk_register_"; identifier FS =~ "^mtk_clk_register_[a-z_]*s"; identifier I; expression clk_data; expression E; @@ FS(...) { ... - struct clk *I; + struct clk_hw *hw; ... for (...;...;...) { ... ( - I + hw = - clk_register_fixed_rate( + clk_hw_register_fixed_rate( ... ); | - I + hw = - clk_register_fixed_factor( + clk_hw_register_fixed_factor( ... ); | - I + hw = - clk_register_divider( + clk_hw_register_divider( ... ); | - I + hw = F(...); ) ... if ( - IS_ERR(I) + IS_ERR(hw) ) { pr_err(..., - I + hw ,...); ... } - clk_data->hws[E] = __clk_get_hw(I); + clk_data->hws[E] = hw; } ... } @ depends on reg @ identifier reg.I; @@ return PTR_ERR( - I + hw ); // Fix mtk_clk_register_composite to return clk_hw instead of clk @@ identifier I, R; expression E; @@ - struct clk * + struct clk_hw * mtk_clk_register_composite(...) { ... - struct clk *I; + struct clk_hw *hw; ... - I = clk_register_composite( + hw = clk_hw_register_composite( ...); if (IS_ERR( - I + hw )) { ... R = PTR_ERR( - I + hw ); ... } return - I + hw ; ... } // Fix other mtk_clk_register_<singular> to return clk_hw instead of clk @@ identifier F =~ "^mtk_clk_register_"; identifier I, D, C; expression E; @@ - struct clk * + struct clk_hw * F(...) { ... - struct clk *I; + int ret; ... - I = clk_register(D, E); + ret = clk_hw_register(D, E); ... ( - if (IS_ERR(I)) + if (ret) { kfree(C); + return ERR_PTR(ret); + } | - if (IS_ERR(I)) + if (ret) { kfree(C); - return I; + return ERR_PTR(ret); } ) - return I; + return E; } // Fix mtk_clk_unregister_<singular> to take clk_hw instead of clk @@ identifier F =~ "^mtk_clk_unregister_"; identifier I, I2; @@ static void F( - struct clk *I + struct clk_hw *I2 ) { ... - struct clk_hw *I2; ... - I2 = __clk_get_hw(I); ... ( - clk_unregister(I); + clk_hw_unregister(I2); | - clk_unregister_composite(I); + clk_hw_unregister_composite(I2); ) ... } // Fix calls to mtk_clk_unregister_*() @@ identifier F =~ "^mtk_clk_unregister_"; expression I; expression E; @@ - F(I->hws[E]->clk); + F(I->hws[E]); Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> Reviewed-by: Miles Chen <miles.chen@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Tested-by: Miles Chen <miles.chen@mediatek.com> Link: https://lore.kernel.org/r/20220519071610.423372-5-wenst@chromium.org Signed-off-by: Stephen Boyd <sboyd@kernel.org>
469 lines
9.9 KiB
C
469 lines
9.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (c) 2014 MediaTek Inc.
|
|
* Author: James Liao <jamesjj.liao@mediatek.com>
|
|
*/
|
|
|
|
#include <linux/bitops.h>
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/err.h>
|
|
#include <linux/io.h>
|
|
#include <linux/mfd/syscon.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include "clk-mtk.h"
|
|
#include "clk-gate.h"
|
|
|
|
struct clk_hw_onecell_data *mtk_alloc_clk_data(unsigned int clk_num)
|
|
{
|
|
int i;
|
|
struct clk_hw_onecell_data *clk_data;
|
|
|
|
clk_data = kzalloc(struct_size(clk_data, hws, clk_num), GFP_KERNEL);
|
|
if (!clk_data)
|
|
return NULL;
|
|
|
|
clk_data->num = clk_num;
|
|
|
|
for (i = 0; i < clk_num; i++)
|
|
clk_data->hws[i] = ERR_PTR(-ENOENT);
|
|
|
|
return clk_data;
|
|
}
|
|
EXPORT_SYMBOL_GPL(mtk_alloc_clk_data);
|
|
|
|
void mtk_free_clk_data(struct clk_hw_onecell_data *clk_data)
|
|
{
|
|
kfree(clk_data);
|
|
}
|
|
EXPORT_SYMBOL_GPL(mtk_free_clk_data);
|
|
|
|
int mtk_clk_register_fixed_clks(const struct mtk_fixed_clk *clks, int num,
|
|
struct clk_hw_onecell_data *clk_data)
|
|
{
|
|
int i;
|
|
struct clk_hw *hw;
|
|
|
|
if (!clk_data)
|
|
return -ENOMEM;
|
|
|
|
for (i = 0; i < num; i++) {
|
|
const struct mtk_fixed_clk *rc = &clks[i];
|
|
|
|
if (!IS_ERR_OR_NULL(clk_data->hws[rc->id])) {
|
|
pr_warn("Trying to register duplicate clock ID: %d\n", rc->id);
|
|
continue;
|
|
}
|
|
|
|
hw = clk_hw_register_fixed_rate(NULL, rc->name, rc->parent, 0,
|
|
rc->rate);
|
|
|
|
if (IS_ERR(hw)) {
|
|
pr_err("Failed to register clk %s: %pe\n", rc->name,
|
|
hw);
|
|
goto err;
|
|
}
|
|
|
|
clk_data->hws[rc->id] = hw;
|
|
}
|
|
|
|
return 0;
|
|
|
|
err:
|
|
while (--i >= 0) {
|
|
const struct mtk_fixed_clk *rc = &clks[i];
|
|
|
|
if (IS_ERR_OR_NULL(clk_data->hws[rc->id]))
|
|
continue;
|
|
|
|
clk_unregister_fixed_rate(clk_data->hws[rc->id]->clk);
|
|
clk_data->hws[rc->id] = ERR_PTR(-ENOENT);
|
|
}
|
|
|
|
return PTR_ERR(hw);
|
|
}
|
|
EXPORT_SYMBOL_GPL(mtk_clk_register_fixed_clks);
|
|
|
|
void mtk_clk_unregister_fixed_clks(const struct mtk_fixed_clk *clks, int num,
|
|
struct clk_hw_onecell_data *clk_data)
|
|
{
|
|
int i;
|
|
|
|
if (!clk_data)
|
|
return;
|
|
|
|
for (i = num; i > 0; i--) {
|
|
const struct mtk_fixed_clk *rc = &clks[i - 1];
|
|
|
|
if (IS_ERR_OR_NULL(clk_data->hws[rc->id]))
|
|
continue;
|
|
|
|
clk_unregister_fixed_rate(clk_data->hws[rc->id]->clk);
|
|
clk_data->hws[rc->id] = ERR_PTR(-ENOENT);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(mtk_clk_unregister_fixed_clks);
|
|
|
|
int mtk_clk_register_factors(const struct mtk_fixed_factor *clks, int num,
|
|
struct clk_hw_onecell_data *clk_data)
|
|
{
|
|
int i;
|
|
struct clk_hw *hw;
|
|
|
|
if (!clk_data)
|
|
return -ENOMEM;
|
|
|
|
for (i = 0; i < num; i++) {
|
|
const struct mtk_fixed_factor *ff = &clks[i];
|
|
|
|
if (!IS_ERR_OR_NULL(clk_data->hws[ff->id])) {
|
|
pr_warn("Trying to register duplicate clock ID: %d\n", ff->id);
|
|
continue;
|
|
}
|
|
|
|
hw = clk_hw_register_fixed_factor(NULL, ff->name, ff->parent_name,
|
|
CLK_SET_RATE_PARENT, ff->mult, ff->div);
|
|
|
|
if (IS_ERR(hw)) {
|
|
pr_err("Failed to register clk %s: %pe\n", ff->name,
|
|
hw);
|
|
goto err;
|
|
}
|
|
|
|
clk_data->hws[ff->id] = hw;
|
|
}
|
|
|
|
return 0;
|
|
|
|
err:
|
|
while (--i >= 0) {
|
|
const struct mtk_fixed_factor *ff = &clks[i];
|
|
|
|
if (IS_ERR_OR_NULL(clk_data->hws[ff->id]))
|
|
continue;
|
|
|
|
clk_unregister_fixed_factor(clk_data->hws[ff->id]->clk);
|
|
clk_data->hws[ff->id] = ERR_PTR(-ENOENT);
|
|
}
|
|
|
|
return PTR_ERR(hw);
|
|
}
|
|
EXPORT_SYMBOL_GPL(mtk_clk_register_factors);
|
|
|
|
void mtk_clk_unregister_factors(const struct mtk_fixed_factor *clks, int num,
|
|
struct clk_hw_onecell_data *clk_data)
|
|
{
|
|
int i;
|
|
|
|
if (!clk_data)
|
|
return;
|
|
|
|
for (i = num; i > 0; i--) {
|
|
const struct mtk_fixed_factor *ff = &clks[i - 1];
|
|
|
|
if (IS_ERR_OR_NULL(clk_data->hws[ff->id]))
|
|
continue;
|
|
|
|
clk_unregister_fixed_factor(clk_data->hws[ff->id]->clk);
|
|
clk_data->hws[ff->id] = ERR_PTR(-ENOENT);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(mtk_clk_unregister_factors);
|
|
|
|
static struct clk_hw *mtk_clk_register_composite(const struct mtk_composite *mc,
|
|
void __iomem *base, spinlock_t *lock)
|
|
{
|
|
struct clk_hw *hw;
|
|
struct clk_mux *mux = NULL;
|
|
struct clk_gate *gate = NULL;
|
|
struct clk_divider *div = NULL;
|
|
struct clk_hw *mux_hw = NULL, *gate_hw = NULL, *div_hw = NULL;
|
|
const struct clk_ops *mux_ops = NULL, *gate_ops = NULL, *div_ops = NULL;
|
|
const char * const *parent_names;
|
|
const char *parent;
|
|
int num_parents;
|
|
int ret;
|
|
|
|
if (mc->mux_shift >= 0) {
|
|
mux = kzalloc(sizeof(*mux), GFP_KERNEL);
|
|
if (!mux)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
mux->reg = base + mc->mux_reg;
|
|
mux->mask = BIT(mc->mux_width) - 1;
|
|
mux->shift = mc->mux_shift;
|
|
mux->lock = lock;
|
|
mux->flags = mc->mux_flags;
|
|
mux_hw = &mux->hw;
|
|
mux_ops = &clk_mux_ops;
|
|
|
|
parent_names = mc->parent_names;
|
|
num_parents = mc->num_parents;
|
|
} else {
|
|
parent = mc->parent;
|
|
parent_names = &parent;
|
|
num_parents = 1;
|
|
}
|
|
|
|
if (mc->gate_shift >= 0) {
|
|
gate = kzalloc(sizeof(*gate), GFP_KERNEL);
|
|
if (!gate) {
|
|
ret = -ENOMEM;
|
|
goto err_out;
|
|
}
|
|
|
|
gate->reg = base + mc->gate_reg;
|
|
gate->bit_idx = mc->gate_shift;
|
|
gate->flags = CLK_GATE_SET_TO_DISABLE;
|
|
gate->lock = lock;
|
|
|
|
gate_hw = &gate->hw;
|
|
gate_ops = &clk_gate_ops;
|
|
}
|
|
|
|
if (mc->divider_shift >= 0) {
|
|
div = kzalloc(sizeof(*div), GFP_KERNEL);
|
|
if (!div) {
|
|
ret = -ENOMEM;
|
|
goto err_out;
|
|
}
|
|
|
|
div->reg = base + mc->divider_reg;
|
|
div->shift = mc->divider_shift;
|
|
div->width = mc->divider_width;
|
|
div->lock = lock;
|
|
|
|
div_hw = &div->hw;
|
|
div_ops = &clk_divider_ops;
|
|
}
|
|
|
|
hw = clk_hw_register_composite(NULL, mc->name, parent_names, num_parents,
|
|
mux_hw, mux_ops,
|
|
div_hw, div_ops,
|
|
gate_hw, gate_ops,
|
|
mc->flags);
|
|
|
|
if (IS_ERR(hw)) {
|
|
ret = PTR_ERR(hw);
|
|
goto err_out;
|
|
}
|
|
|
|
return hw;
|
|
err_out:
|
|
kfree(div);
|
|
kfree(gate);
|
|
kfree(mux);
|
|
|
|
return ERR_PTR(ret);
|
|
}
|
|
|
|
static void mtk_clk_unregister_composite(struct clk_hw *hw)
|
|
{
|
|
struct clk_composite *composite;
|
|
struct clk_mux *mux = NULL;
|
|
struct clk_gate *gate = NULL;
|
|
struct clk_divider *div = NULL;
|
|
|
|
if (!hw)
|
|
return;
|
|
|
|
composite = to_clk_composite(hw);
|
|
if (composite->mux_hw)
|
|
mux = to_clk_mux(composite->mux_hw);
|
|
if (composite->gate_hw)
|
|
gate = to_clk_gate(composite->gate_hw);
|
|
if (composite->rate_hw)
|
|
div = to_clk_divider(composite->rate_hw);
|
|
|
|
clk_hw_unregister_composite(hw);
|
|
kfree(div);
|
|
kfree(gate);
|
|
kfree(mux);
|
|
}
|
|
|
|
int mtk_clk_register_composites(const struct mtk_composite *mcs, int num,
|
|
void __iomem *base, spinlock_t *lock,
|
|
struct clk_hw_onecell_data *clk_data)
|
|
{
|
|
struct clk_hw *hw;
|
|
int i;
|
|
|
|
if (!clk_data)
|
|
return -ENOMEM;
|
|
|
|
for (i = 0; i < num; i++) {
|
|
const struct mtk_composite *mc = &mcs[i];
|
|
|
|
if (!IS_ERR_OR_NULL(clk_data->hws[mc->id])) {
|
|
pr_warn("Trying to register duplicate clock ID: %d\n",
|
|
mc->id);
|
|
continue;
|
|
}
|
|
|
|
hw = mtk_clk_register_composite(mc, base, lock);
|
|
|
|
if (IS_ERR(hw)) {
|
|
pr_err("Failed to register clk %s: %pe\n", mc->name,
|
|
hw);
|
|
goto err;
|
|
}
|
|
|
|
clk_data->hws[mc->id] = hw;
|
|
}
|
|
|
|
return 0;
|
|
|
|
err:
|
|
while (--i >= 0) {
|
|
const struct mtk_composite *mc = &mcs[i];
|
|
|
|
if (IS_ERR_OR_NULL(clk_data->hws[mcs->id]))
|
|
continue;
|
|
|
|
mtk_clk_unregister_composite(clk_data->hws[mc->id]);
|
|
clk_data->hws[mc->id] = ERR_PTR(-ENOENT);
|
|
}
|
|
|
|
return PTR_ERR(hw);
|
|
}
|
|
EXPORT_SYMBOL_GPL(mtk_clk_register_composites);
|
|
|
|
void mtk_clk_unregister_composites(const struct mtk_composite *mcs, int num,
|
|
struct clk_hw_onecell_data *clk_data)
|
|
{
|
|
int i;
|
|
|
|
if (!clk_data)
|
|
return;
|
|
|
|
for (i = num; i > 0; i--) {
|
|
const struct mtk_composite *mc = &mcs[i - 1];
|
|
|
|
if (IS_ERR_OR_NULL(clk_data->hws[mc->id]))
|
|
continue;
|
|
|
|
mtk_clk_unregister_composite(clk_data->hws[mc->id]);
|
|
clk_data->hws[mc->id] = ERR_PTR(-ENOENT);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(mtk_clk_unregister_composites);
|
|
|
|
int mtk_clk_register_dividers(const struct mtk_clk_divider *mcds, int num,
|
|
void __iomem *base, spinlock_t *lock,
|
|
struct clk_hw_onecell_data *clk_data)
|
|
{
|
|
struct clk_hw *hw;
|
|
int i;
|
|
|
|
if (!clk_data)
|
|
return -ENOMEM;
|
|
|
|
for (i = 0; i < num; i++) {
|
|
const struct mtk_clk_divider *mcd = &mcds[i];
|
|
|
|
if (!IS_ERR_OR_NULL(clk_data->hws[mcd->id])) {
|
|
pr_warn("Trying to register duplicate clock ID: %d\n",
|
|
mcd->id);
|
|
continue;
|
|
}
|
|
|
|
hw = clk_hw_register_divider(NULL, mcd->name, mcd->parent_name,
|
|
mcd->flags, base + mcd->div_reg, mcd->div_shift,
|
|
mcd->div_width, mcd->clk_divider_flags, lock);
|
|
|
|
if (IS_ERR(hw)) {
|
|
pr_err("Failed to register clk %s: %pe\n", mcd->name,
|
|
hw);
|
|
goto err;
|
|
}
|
|
|
|
clk_data->hws[mcd->id] = hw;
|
|
}
|
|
|
|
return 0;
|
|
|
|
err:
|
|
while (--i >= 0) {
|
|
const struct mtk_clk_divider *mcd = &mcds[i];
|
|
|
|
if (IS_ERR_OR_NULL(clk_data->hws[mcd->id]))
|
|
continue;
|
|
|
|
mtk_clk_unregister_composite(clk_data->hws[mcd->id]);
|
|
clk_data->hws[mcd->id] = ERR_PTR(-ENOENT);
|
|
}
|
|
|
|
return PTR_ERR(hw);
|
|
}
|
|
|
|
void mtk_clk_unregister_dividers(const struct mtk_clk_divider *mcds, int num,
|
|
struct clk_hw_onecell_data *clk_data)
|
|
{
|
|
int i;
|
|
|
|
if (!clk_data)
|
|
return;
|
|
|
|
for (i = num; i > 0; i--) {
|
|
const struct mtk_clk_divider *mcd = &mcds[i - 1];
|
|
|
|
if (IS_ERR_OR_NULL(clk_data->hws[mcd->id]))
|
|
continue;
|
|
|
|
clk_unregister_divider(clk_data->hws[mcd->id]->clk);
|
|
clk_data->hws[mcd->id] = ERR_PTR(-ENOENT);
|
|
}
|
|
}
|
|
|
|
int mtk_clk_simple_probe(struct platform_device *pdev)
|
|
{
|
|
const struct mtk_clk_desc *mcd;
|
|
struct clk_hw_onecell_data *clk_data;
|
|
struct device_node *node = pdev->dev.of_node;
|
|
int r;
|
|
|
|
mcd = of_device_get_match_data(&pdev->dev);
|
|
if (!mcd)
|
|
return -EINVAL;
|
|
|
|
clk_data = mtk_alloc_clk_data(mcd->num_clks);
|
|
if (!clk_data)
|
|
return -ENOMEM;
|
|
|
|
r = mtk_clk_register_gates(node, mcd->clks, mcd->num_clks, clk_data);
|
|
if (r)
|
|
goto free_data;
|
|
|
|
r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
|
|
if (r)
|
|
goto unregister_clks;
|
|
|
|
platform_set_drvdata(pdev, clk_data);
|
|
|
|
return r;
|
|
|
|
unregister_clks:
|
|
mtk_clk_unregister_gates(mcd->clks, mcd->num_clks, clk_data);
|
|
free_data:
|
|
mtk_free_clk_data(clk_data);
|
|
return r;
|
|
}
|
|
|
|
int mtk_clk_simple_remove(struct platform_device *pdev)
|
|
{
|
|
const struct mtk_clk_desc *mcd = of_device_get_match_data(&pdev->dev);
|
|
struct clk_hw_onecell_data *clk_data = platform_get_drvdata(pdev);
|
|
struct device_node *node = pdev->dev.of_node;
|
|
|
|
of_clk_del_provider(node);
|
|
mtk_clk_unregister_gates(mcd->clks, mcd->num_clks, clk_data);
|
|
mtk_free_clk_data(clk_data);
|
|
|
|
return 0;
|
|
}
|
|
|
|
MODULE_LICENSE("GPL");
|