Skip to content

L
linux
Commit 10966457 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Stephen Boyd
Browse files
Options

clk: mediatek: mt8135: Convert to simple probe and enable module build 

Convert the MT8135 clock drivers to platform_driver using the common
simple probe mechanism; special note goes to the introduction of
dummy clocks with ID 0 (where 0 is the first entry of a clock array)
for each clock controller: this was necessary because of a mistake
in the bindings for all MT8135 clock controllers, where the first
clock has ID 1 (hence, array would start from element 1) instead of
zero.

Now that all of the MT8135 clock drivers (including apmixedsys) can
be compiled as modules, change the COMMON_CLK_MT8135 configuration
option to tristate to enable module build.

While at it, also remove the __initconst annotation from all of the
clock arrays as they are not only used during init anymore, but also
during runtime.
Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20230306140543.1813621-55-angelogioacchino.delregno@collabora.comSigned-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 139e6218
Show whitespace changes
Inline Side-by-side
Showing with 76 additions and 102 deletions
drivers/clk/mediatek/Kconfig
View file @ 10966457
...@@ -423,7 +423,7 @@ config COMMON_CLK_MT7986_ETHSYS ...@@ -423,7 +423,7 @@ config COMMON_CLK_MT7986_ETHSYS
required on MediaTek MT7986 SoC. required on MediaTek MT7986 SoC.
config COMMON_CLK_MT8135 config COMMON_CLK_MT8135
bool "Clock driver for MediaTek MT8135" tristate "Clock driver for MediaTek MT8135"
depends on (ARCH_MEDIATEK && ARM) || COMPILE_TEST depends on (ARCH_MEDIATEK && ARM) || COMPILE_TEST
select COMMON_CLK_MEDIATEK select COMMON_CLK_MEDIATEK
default ARCH_MEDIATEK && ARM default ARCH_MEDIATEK && ARM
......
drivers/clk/mediatek/clk-mt8135.c
View file @ 10966457
...@@ -5,8 +5,10 @@ ...@@ -5,8 +5,10 @@
*/ */
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/mfd/syscon.h> #include <linux/mfd/syscon.h>
#include <dt-bindings/clock/mt8135-clk.h> #include <dt-bindings/clock/mt8135-clk.h>
...@@ -17,7 +19,8 @@ ...@@ -17,7 +19,8 @@
static DEFINE_SPINLOCK(mt8135_clk_lock); static DEFINE_SPINLOCK(mt8135_clk_lock);
static const struct mtk_fixed_factor top_divs[] __initconst = { static const struct mtk_fixed_factor top_divs[] = {
FACTOR(CLK_DUMMY, "top_divs_dummy", "clk_null", 1, 1),
FACTOR(CLK_TOP_DSI0_LNTC_DSICLK, "dsi0_lntc_dsiclk", "clk_null", 1, 1), FACTOR(CLK_TOP_DSI0_LNTC_DSICLK, "dsi0_lntc_dsiclk", "clk_null", 1, 1),
FACTOR(CLK_TOP_HDMITX_CLKDIG_CTS, "hdmitx_clkdig_cts", "clk_null", 1, 1), FACTOR(CLK_TOP_HDMITX_CLKDIG_CTS, "hdmitx_clkdig_cts", "clk_null", 1, 1),
FACTOR(CLK_TOP_CLKPH_MCK, "clkph_mck", "clk_null", 1, 1), FACTOR(CLK_TOP_CLKPH_MCK, "clkph_mck", "clk_null", 1, 1),
...@@ -98,7 +101,7 @@ static const struct mtk_fixed_factor top_divs[] __initconst = { ...@@ -98,7 +101,7 @@ static const struct mtk_fixed_factor top_divs[] __initconst = {
FACTOR(CLK_TOP_MEMPLL_MCK_D4, "mempll_mck_d4", "clkph_mck", 1, 4), FACTOR(CLK_TOP_MEMPLL_MCK_D4, "mempll_mck_d4", "clkph_mck", 1, 4),
}; };
static const char * const axi_parents[] __initconst = { static const char * const axi_parents[] = {
"clk26m", "clk26m",
"syspll_d3", "syspll_d3",
"syspll_d4", "syspll_d4",
...@@ -108,7 +111,7 @@ static const char * const axi_parents[] __initconst = { ...@@ -108,7 +111,7 @@ static const char * const axi_parents[] __initconst = {
"syspll_d3p5" "syspll_d3p5"
}; };
static const char * const smi_parents[] __initconst = { static const char * const smi_parents[] = {
"clk26m", "clk26m",
"clkph_mck", "clkph_mck",
"syspll_d2p5", "syspll_d2p5",
...@@ -126,7 +129,7 @@ static const char * const smi_parents[] __initconst = { ...@@ -126,7 +129,7 @@ static const char * const smi_parents[] __initconst = {
"lvdspll" "lvdspll"
}; };
static const char * const mfg_parents[] __initconst = { static const char * const mfg_parents[] = {
"clk26m", "clk26m",
"univpll1_d4", "univpll1_d4",
"syspll_d2", "syspll_d2",
...@@ -142,13 +145,13 @@ static const char * const mfg_parents[] __initconst = { ...@@ -142,13 +145,13 @@ static const char * const mfg_parents[] __initconst = {
"mmpll_d7" "mmpll_d7"
}; };
static const char * const irda_parents[] __initconst = { static const char * const irda_parents[] = {
"clk26m", "clk26m",
"univpll2_d8", "univpll2_d8",
"univpll1_d6" "univpll1_d6"
}; };
static const char * const cam_parents[] __initconst = { static const char * const cam_parents[] = {
"clk26m", "clk26m",
"syspll_d3", "syspll_d3",
"syspll_d3p5", "syspll_d3p5",
...@@ -159,13 +162,13 @@ static const char * const cam_parents[] __initconst = { ...@@ -159,13 +162,13 @@ static const char * const cam_parents[] __initconst = {
"univpll1_d4" "univpll1_d4"
}; };
static const char * const aud_intbus_parents[] __initconst = { static const char * const aud_intbus_parents[] = {
"clk26m", "clk26m",
"syspll_d6", "syspll_d6",
"univpll_d10" "univpll_d10"
}; };
static const char * const jpg_parents[] __initconst = { static const char * const jpg_parents[] = {
"clk26m", "clk26m",
"syspll_d5", "syspll_d5",
"syspll_d4", "syspll_d4",
...@@ -175,7 +178,7 @@ static const char * const jpg_parents[] __initconst = { ...@@ -175,7 +178,7 @@ static const char * const jpg_parents[] __initconst = {
"univpll_d5" "univpll_d5"
}; };
static const char * const disp_parents[] __initconst = { static const char * const disp_parents[] = {
"clk26m", "clk26m",
"syspll_d3p5", "syspll_d3p5",
"syspll_d3", "syspll_d3",
...@@ -186,7 +189,7 @@ static const char * const disp_parents[] __initconst = { ...@@ -186,7 +189,7 @@ static const char * const disp_parents[] __initconst = {
"vdecpll" "vdecpll"
}; };
static const char * const msdc30_parents[] __initconst = { static const char * const msdc30_parents[] = {
"clk26m", "clk26m",
"syspll_d6", "syspll_d6",
"syspll_d5", "syspll_d5",
...@@ -195,13 +198,13 @@ static const char * const msdc30_parents[] __initconst = { ...@@ -195,13 +198,13 @@ static const char * const msdc30_parents[] __initconst = {
"msdcpll" "msdcpll"
}; };
static const char * const usb20_parents[] __initconst = { static const char * const usb20_parents[] = {
"clk26m", "clk26m",
"univpll2_d6", "univpll2_d6",
"univpll1_d10" "univpll1_d10"
}; };
static const char * const venc_parents[] __initconst = { static const char * const venc_parents[] = {
"clk26m", "clk26m",
"syspll_d3", "syspll_d3",
"syspll_d8", "syspll_d8",
...@@ -212,7 +215,7 @@ static const char * const venc_parents[] __initconst = { ...@@ -212,7 +215,7 @@ static const char * const venc_parents[] __initconst = {
"mmpll_d6" "mmpll_d6"
}; };
static const char * const spi_parents[] __initconst = { static const char * const spi_parents[] = {
"clk26m", "clk26m",
"syspll_d6", "syspll_d6",
"syspll_d8", "syspll_d8",
...@@ -221,17 +224,17 @@ static const char * const spi_parents[] __initconst = { ...@@ -221,17 +224,17 @@ static const char * const spi_parents[] __initconst = {
"univpll1_d8" "univpll1_d8"
}; };
static const char * const uart_parents[] __initconst = { static const char * const uart_parents[] = {
"clk26m", "clk26m",
"univpll2_d8" "univpll2_d8"
}; };
static const char * const mem_parents[] __initconst = { static const char * const mem_parents[] = {
"clk26m", "clk26m",
"clkph_mck" "clkph_mck"
}; };
static const char * const camtg_parents[] __initconst = { static const char * const camtg_parents[] = {
"clk26m", "clk26m",
"univpll_d26", "univpll_d26",
"univpll1_d6", "univpll1_d6",
...@@ -239,12 +242,12 @@ static const char * const camtg_parents[] __initconst = { ...@@ -239,12 +242,12 @@ static const char * const camtg_parents[] __initconst = {
"syspll_d8" "syspll_d8"
}; };
static const char * const audio_parents[] __initconst = { static const char * const audio_parents[] = {
"clk26m", "clk26m",
"syspll_d24" "syspll_d24"
}; };
static const char * const fix_parents[] __initconst = { static const char * const fix_parents[] = {
"rtc32k", "rtc32k",
"clk26m", "clk26m",
"univpll_d5", "univpll_d5",
...@@ -255,7 +258,7 @@ static const char * const fix_parents[] __initconst = { ...@@ -255,7 +258,7 @@ static const char * const fix_parents[] __initconst = {
"univpll1_d8" "univpll1_d8"
}; };
static const char * const vdec_parents[] __initconst = { static const char * const vdec_parents[] = {
"clk26m", "clk26m",
"vdecpll", "vdecpll",
"clkph_mck", "clkph_mck",
...@@ -274,13 +277,13 @@ static const char * const vdec_parents[] __initconst = { ...@@ -274,13 +277,13 @@ static const char * const vdec_parents[] __initconst = {
"lvdspll" "lvdspll"
}; };
static const char * const ddrphycfg_parents[] __initconst = { static const char * const ddrphycfg_parents[] = {
"clk26m", "clk26m",
"axi_sel", "axi_sel",
"syspll_d12" "syspll_d12"
}; };
static const char * const dpilvds_parents[] __initconst = { static const char * const dpilvds_parents[] = {
"clk26m", "clk26m",
"lvdspll", "lvdspll",
"lvdspll_d2", "lvdspll_d2",
...@@ -288,7 +291,7 @@ static const char * const dpilvds_parents[] __initconst = { ...@@ -288,7 +291,7 @@ static const char * const dpilvds_parents[] __initconst = {
"lvdspll_d8" "lvdspll_d8"
}; };
static const char * const pmicspi_parents[] __initconst = { static const char * const pmicspi_parents[] = {
"clk26m", "clk26m",
"univpll2_d6", "univpll2_d6",
"syspll_d8", "syspll_d8",
...@@ -299,14 +302,14 @@ static const char * const pmicspi_parents[] __initconst = { ...@@ -299,14 +302,14 @@ static const char * const pmicspi_parents[] __initconst = {
"syspll_d24" "syspll_d24"
}; };
static const char * const smi_mfg_as_parents[] __initconst = { static const char * const smi_mfg_as_parents[] = {
"clk26m", "clk26m",
"smi_sel", "smi_sel",
"mfg_sel", "mfg_sel",
"mem_sel" "mem_sel"
}; };
static const char * const gcpu_parents[] __initconst = { static const char * const gcpu_parents[] = {
"clk26m", "clk26m",
"syspll_d4", "syspll_d4",
"univpll_d7", "univpll_d7",
...@@ -314,14 +317,14 @@ static const char * const gcpu_parents[] __initconst = { ...@@ -314,14 +317,14 @@ static const char * const gcpu_parents[] __initconst = {
"syspll_d6" "syspll_d6"
}; };
static const char * const dpi1_parents[] __initconst = { static const char * const dpi1_parents[] = {
"clk26m", "clk26m",
"tvhdmi_h_ck", "tvhdmi_h_ck",
"tvhdmi_d2", "tvhdmi_d2",
"tvhdmi_d4" "tvhdmi_d4"
}; };
static const char * const cci_parents[] __initconst = { static const char * const cci_parents[] = {
"clk26m", "clk26m",
"mainpll_537p3m", "mainpll_537p3m",
"univpll_d3", "univpll_d3",
...@@ -330,7 +333,7 @@ static const char * const cci_parents[] __initconst = { ...@@ -330,7 +333,7 @@ static const char * const cci_parents[] __initconst = {
"syspll_d5" "syspll_d5"
}; };
static const char * const apll_parents[] __initconst = { static const char * const apll_parents[] = {
"clk26m", "clk26m",
"apll_ck", "apll_ck",
"apll_d4", "apll_d4",
...@@ -339,14 +342,14 @@ static const char * const apll_parents[] __initconst = { ...@@ -339,14 +342,14 @@ static const char * const apll_parents[] __initconst = {
"apll_d24" "apll_d24"
}; };
static const char * const hdmipll_parents[] __initconst = { static const char * const hdmipll_parents[] = {
"clk26m", "clk26m",
"hdmitx_clkdig_cts", "hdmitx_clkdig_cts",
"hdmitx_clkdig_d2", "hdmitx_clkdig_d2",
"hdmitx_clkdig_d3" "hdmitx_clkdig_d3"
}; };
static const struct mtk_composite top_muxes[] __initconst = { static const struct mtk_composite top_muxes[] = {
/* CLK_CFG_0 */ /* CLK_CFG_0 */
MUX_GATE(CLK_TOP_AXI_SEL, "axi_sel", axi_parents, MUX_GATE(CLK_TOP_AXI_SEL, "axi_sel", axi_parents,
0x0140, 0, 3, INVALID_MUX_GATE_BIT), 0x0140, 0, 3, INVALID_MUX_GATE_BIT),
...@@ -406,7 +409,8 @@ static const struct mtk_gate_regs infra_cg_regs = { ...@@ -406,7 +409,8 @@ static const struct mtk_gate_regs infra_cg_regs = {
GATE_MTK_FLAGS(_id, _name, _parent, &infra_cg_regs, _shift, \ GATE_MTK_FLAGS(_id, _name, _parent, &infra_cg_regs, _shift, \
&mtk_clk_gate_ops_setclr, CLK_IS_CRITICAL) &mtk_clk_gate_ops_setclr, CLK_IS_CRITICAL)
static const struct mtk_gate infra_clks[] __initconst = { static const struct mtk_gate infra_clks[] = {
GATE_DUMMY(CLK_DUMMY, "infra_dummy"),
GATE_ICG(CLK_INFRA_PMIC_WRAP, "pmic_wrap_ck", "axi_sel", 23), GATE_ICG(CLK_INFRA_PMIC_WRAP, "pmic_wrap_ck", "axi_sel", 23),
GATE_ICG(CLK_INFRA_PMICSPI, "pmicspi_ck", "pmicspi_sel", 22), GATE_ICG(CLK_INFRA_PMICSPI, "pmicspi_ck", "pmicspi_sel", 22),
GATE_ICG(CLK_INFRA_CCIF1_AP_CTRL, "ccif1_ap_ctrl", "axi_sel", 21), GATE_ICG(CLK_INFRA_CCIF1_AP_CTRL, "ccif1_ap_ctrl", "axi_sel", 21),
...@@ -440,7 +444,8 @@ static const struct mtk_gate_regs peri1_cg_regs = { ...@@ -440,7 +444,8 @@ static const struct mtk_gate_regs peri1_cg_regs = {
#define GATE_PERI1(_id, _name, _parent, _shift) \ #define GATE_PERI1(_id, _name, _parent, _shift) \
GATE_MTK(_id, _name, _parent, &peri1_cg_regs, _shift, &mtk_clk_gate_ops_setclr) GATE_MTK(_id, _name, _parent, &peri1_cg_regs, _shift, &mtk_clk_gate_ops_setclr)
static const struct mtk_gate peri_gates[] __initconst = { static const struct mtk_gate peri_gates[] = {
GATE_DUMMY(CLK_DUMMY, "peri_dummy"),
/* PERI0 */ /* PERI0 */
GATE_PERI0(CLK_PERI_I2C5, "i2c5_ck", "axi_sel", 31), GATE_PERI0(CLK_PERI_I2C5, "i2c5_ck", "axi_sel", 31),
GATE_PERI0(CLK_PERI_I2C4, "i2c4_ck", "axi_sel", 30), GATE_PERI0(CLK_PERI_I2C4, "i2c4_ck", "axi_sel", 30),
...@@ -486,12 +491,12 @@ static const struct mtk_gate peri_gates[] __initconst = { ...@@ -486,12 +491,12 @@ static const struct mtk_gate peri_gates[] __initconst = {
GATE_PERI1(CLK_PERI_I2C6, "i2c6_ck", "axi_sel", 0), GATE_PERI1(CLK_PERI_I2C6, "i2c6_ck", "axi_sel", 0),
}; };
static const char * const uart_ck_sel_parents[] __initconst = { static const char * const uart_ck_sel_parents[] = {
"clk26m", "clk26m",
"uart_sel", "uart_sel",
}; };
static const struct mtk_composite peri_clks[] __initconst = { static const struct mtk_composite peri_clks[] = {
MUX(CLK_PERI_UART0_SEL, "uart0_ck_sel", uart_ck_sel_parents, 0x40c, 0, 1), MUX(CLK_PERI_UART0_SEL, "uart0_ck_sel", uart_ck_sel_parents, 0x40c, 0, 1),
MUX(CLK_PERI_UART1_SEL, "uart1_ck_sel", uart_ck_sel_parents, 0x40c, 1, 1), MUX(CLK_PERI_UART1_SEL, "uart1_ck_sel", uart_ck_sel_parents, 0x40c, 1, 1),
MUX(CLK_PERI_UART2_SEL, "uart2_ck_sel", uart_ck_sel_parents, 0x40c, 2, 1), MUX(CLK_PERI_UART2_SEL, "uart2_ck_sel", uart_ck_sel_parents, 0x40c, 2, 1),
...@@ -516,77 +521,46 @@ static const struct mtk_clk_rst_desc clk_rst_desc[] = { ...@@ -516,77 +521,46 @@ static const struct mtk_clk_rst_desc clk_rst_desc[] = {
} }
}; };
static void __init mtk_topckgen_init(struct device_node *node) static const struct mtk_clk_desc infra_desc = {
{ .clks = infra_clks,
struct clk_hw_onecell_data *clk_data; .num_clks = ARRAY_SIZE(infra_clks),
void __iomem *base; .rst_desc = &clk_rst_desc[0],
int r; };
base = of_iomap(node, 0);
if (!base) {
pr_err("%s(): ioremap failed\n", __func__);
return;
}
clk_data = mtk_alloc_clk_data(CLK_TOP_NR_CLK); static const struct mtk_clk_desc peri_desc = {
.clks = peri_gates,
mtk_clk_register_factors(top_divs, ARRAY_SIZE(top_divs), clk_data); .num_clks = ARRAY_SIZE(peri_gates),
mtk_clk_register_composites(NULL, top_muxes, .composite_clks = peri_clks,
ARRAY_SIZE(top_muxes), base, .num_composite_clks = ARRAY_SIZE(peri_clks),
&mt8135_clk_lock, clk_data); .clk_lock = &mt8135_clk_lock,
.rst_desc = &clk_rst_desc[1],
r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data); };
if (r)
pr_err("%s(): could not register clock provider: %d\n",
__func__, r);
}
CLK_OF_DECLARE(mtk_topckgen, "mediatek,mt8135-topckgen", mtk_topckgen_init);
static void __init mtk_infrasys_init(struct device_node *node)
{
struct clk_hw_onecell_data *clk_data;
int r;
clk_data = mtk_alloc_clk_data(CLK_INFRA_NR_CLK);
mtk_clk_register_gates(NULL, node, infra_clks,
ARRAY_SIZE(infra_clks), clk_data);
r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
if (r)
pr_err("%s(): could not register clock provider: %d\n",
__func__, r);
mtk_register_reset_controller(node, &clk_rst_desc[0]);
}
CLK_OF_DECLARE(mtk_infrasys, "mediatek,mt8135-infracfg", mtk_infrasys_init);
static void __init mtk_pericfg_init(struct device_node *node)
{
struct clk_hw_onecell_data *clk_data;
int r;
void __iomem *base;
base = of_iomap(node, 0);
if (!base) {
pr_err("%s(): ioremap failed\n", __func__);
return;
}
clk_data = mtk_alloc_clk_data(CLK_PERI_NR_CLK); static const struct mtk_clk_desc topck_desc = {
.factor_clks = top_divs,
.num_factor_clks = ARRAY_SIZE(top_divs),
.composite_clks = top_muxes,
.num_composite_clks = ARRAY_SIZE(top_muxes),
.clk_lock = &mt8135_clk_lock,
};
mtk_clk_register_gates(NULL, node, peri_gates, static const struct of_device_id of_match_clk_mt8135[] = {
ARRAY_SIZE(peri_gates), clk_data); { .compatible = "mediatek,mt8135-infracfg", .data = &infra_desc },
mtk_clk_register_composites(NULL, peri_clks, { .compatible = "mediatek,mt8135-pericfg", .data = &peri_desc },
ARRAY_SIZE(peri_clks), base, { .compatible = "mediatek,mt8135-topckgen", .data = &topck_desc },
&mt8135_clk_lock, clk_data); { /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, of_match_clk_mt8135);
r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data); static struct platform_driver clk_mt8135_drv = {
if (r) .driver = {
pr_err("%s(): could not register clock provider: %d\n", .name = "clk-mt8135",
__func__, r); .of_match_table = of_match_clk_mt8135,
},
.probe = mtk_clk_simple_probe,
.remove = mtk_clk_simple_remove,
};
module_platform_driver(clk_mt8135_drv);
mtk_register_reset_controller(node, &clk_rst_desc[1]); MODULE_DESCRIPTION("MediaTek MT8135 clocks driver");
}
CLK_OF_DECLARE(mtk_pericfg, "mediatek,mt8135-pericfg", mtk_pericfg_init);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7