diff mbox series

[v2,22/24] clk: mediatek: Add MT8195 wpesys clock support

Message ID 20210820111504.350-23-chun-jie.chen@mediatek.com
State Superseded
Headers show
Series Mediatek MT8195 clock support | expand

Commit Message

Chun-Jie Chen Aug. 20, 2021, 11:15 a.m. UTC 
Add MT8195 wpesys clock controllers which provide clock gate
control in Wrapping Engine.

Signed-off-by: Chun-Jie Chen <chun-jie.chen@mediatek.com>
---
 drivers/clk/mediatek/Makefile         |   2 +-
 drivers/clk/mediatek/clk-mt8195-wpe.c | 143 ++++++++++++++++++++++++++
 2 files changed, 144 insertions(+), 1 deletion(-)
 create mode 100644 drivers/clk/mediatek/clk-mt8195-wpe.c

Comments

Chen-Yu Tsai Aug. 25, 2021, 11:34 a.m. UTC | #1 
On Fri, Aug 20, 2021 at 7:33 PM Chun-Jie Chen
<chun-jie.chen@mediatek.com> wrote:
>

> Add MT8195 wpesys clock controllers which provide clock gate

> control in Wrapping Engine.

>

> Signed-off-by: Chun-Jie Chen <chun-jie.chen@mediatek.com>

> ---

>  drivers/clk/mediatek/Makefile         |   2 +-

>  drivers/clk/mediatek/clk-mt8195-wpe.c | 143 ++++++++++++++++++++++++++

>  2 files changed, 144 insertions(+), 1 deletion(-)

>  create mode 100644 drivers/clk/mediatek/clk-mt8195-wpe.c

>

> diff --git a/drivers/clk/mediatek/Makefile b/drivers/clk/mediatek/Makefile

> index 402a809ff6ac..dfe7047c6795 100644

> --- a/drivers/clk/mediatek/Makefile

> +++ b/drivers/clk/mediatek/Makefile

> @@ -83,6 +83,6 @@ obj-$(CONFIG_COMMON_CLK_MT8192_VENCSYS) += clk-mt8192-venc.o

>  obj-$(CONFIG_COMMON_CLK_MT8195) += clk-mt8195-apmixedsys.o clk-mt8195-topckgen.o clk-mt8195-peri_ao.o clk-mt8195-infra_ao.o clk-mt8195-cam.o \

>                                         clk-mt8195-ccu.o clk-mt8195-img.o clk-mt8195-ipe.o clk-mt8195-mfg.o clk-mt8195-scp_adsp.o \

>                                         clk-mt8195-vdec.o clk-mt8195-vdo0.o clk-mt8195-vdo1.o clk-mt8195-venc.o clk-mt8195-vpp0.o \

> -                                       clk-mt8195-vpp1.o

> +                                       clk-mt8195-vpp1.o clk-mt8195-wpe.o

>  obj-$(CONFIG_COMMON_CLK_MT8516) += clk-mt8516.o

>  obj-$(CONFIG_COMMON_CLK_MT8516_AUDSYS) += clk-mt8516-aud.o

> diff --git a/drivers/clk/mediatek/clk-mt8195-wpe.c b/drivers/clk/mediatek/clk-mt8195-wpe.c

> new file mode 100644

> index 000000000000..7e92a3cab497

> --- /dev/null

> +++ b/drivers/clk/mediatek/clk-mt8195-wpe.c

> @@ -0,0 +1,143 @@

> +// SPDX-License-Identifier: (GPL-2.0 OR MIT)

> +//

> +// Copyright (c) 2021 MediaTek Inc.

> +// Author: Chun-Jie Chen <chun-jie.chen@mediatek.com>

> +

> +#include "clk-gate.h"

> +#include "clk-mtk.h"

> +

> +#include <dt-bindings/clock/mt8195-clk.h>

> +#include <linux/clk-provider.h>

> +#include <linux/platform_device.h>

> +

> +static const struct mtk_gate_regs wpe_cg_regs = {

> +       .set_ofs = 0x0,

> +       .clr_ofs = 0x0,

> +       .sta_ofs = 0x0,

> +};

> +

> +static const struct mtk_gate_regs wpe_vpp0_cg_regs = {

> +       .set_ofs = 0x58,

> +       .clr_ofs = 0x58,

> +       .sta_ofs = 0x58,

> +};

> +

> +static const struct mtk_gate_regs wpe_vpp1_cg_regs = {

> +       .set_ofs = 0x5c,

> +       .clr_ofs = 0x5c,

> +       .sta_ofs = 0x5c,

> +};

> +

> +#define GATE_WPE(_id, _name, _parent, _shift)                  \

> +       GATE_MTK(_id, _name, _parent, &wpe_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)

> +

> +#define GATE_WPE_VPP0(_id, _name, _parent, _shift)                     \

> +       GATE_MTK(_id, _name, _parent, &wpe_vpp0_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)

> +

> +#define GATE_WPE_VPP1(_id, _name, _parent, _shift)                     \

> +       GATE_MTK(_id, _name, _parent, &wpe_vpp1_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)

> +

> +static const struct mtk_gate wpe_clks[] = {

> +       GATE_WPE(CLK_WPE_VPP0, "wpe_vpp0", "top_wpe_vpp", 16),

> +       GATE_WPE(CLK_WPE_VPP1, "wpe_vpp1", "top_wpe_vpp", 17),

> +       GATE_WPE(CLK_WPE_SMI_LARB7, "wpe_smi_larb7", "top_wpe_vpp", 18),

> +       GATE_WPE(CLK_WPE_SMI_LARB8, "wpe_smi_larb8", "top_wpe_vpp", 19),

> +       GATE_WPE(CLK_WPE_EVENT_TX, "wpe_event_tx", "top_wpe_vpp", 20),

> +       GATE_WPE(CLK_WPE_SMI_LARB7_P, "wpe_smi_larb7_p", "top_wpe_vpp", 24),

> +       GATE_WPE(CLK_WPE_SMI_LARB8_P, "wpe_smi_larb8_p", "top_wpe_vpp", 25),

> +};

> +

> +static const struct mtk_gate wpe_vpp0_clks[] = {

> +       /* WPE_VPP0 */

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_VGEN, "wpe_vpp0_vgen", "top_img", 0),

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_EXT, "wpe_vpp0_ext", "top_img", 1),

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_VFC, "wpe_vpp0_vfc", "top_img", 2),

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_CACH0_TOP, "wpe_vpp0_cach0_top", "top_img", 3),

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_CACH0_DMA, "wpe_vpp0_cach0_dma", "top_img", 4),

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_CACH1_TOP, "wpe_vpp0_cach1_top", "top_img", 5),

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_CACH1_DMA, "wpe_vpp0_cach1_dma", "top_img", 6),

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_CACH2_TOP, "wpe_vpp0_cach2_top", "top_img", 7),

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_CACH2_DMA, "wpe_vpp0_cach2_dma", "top_img", 8),

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_CACH3_TOP, "wpe_vpp0_cach3_top", "top_img", 9),

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_CACH3_DMA, "wpe_vpp0_cach3_dma", "top_img", 10),

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_PSP, "wpe_vpp0_psp", "top_img", 11),

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_PSP2, "wpe_vpp0_psp2", "top_img", 12),

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_SYNC, "wpe_vpp0_sync", "top_img", 13),

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_C24, "wpe_vpp0_c24", "top_img", 14),

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_MDP_CROP, "wpe_vpp0_mdp_crop", "top_img", 15),

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_ISP_CROP, "wpe_vpp0_isp_crop", "top_img", 16),

> +       GATE_WPE_VPP0(CLK_WPE_VPP0_TOP, "wpe_vpp0_top", "top_img", 17),

> +       /* WPE_VPP1 */

> +       GATE_WPE_VPP1(CLK_WPE_VPP0_VECI, "wpe_vpp0_veci", "top_img", 0),

> +       GATE_WPE_VPP1(CLK_WPE_VPP0_VEC2I, "wpe_vpp0_vec2i", "top_img", 1),

> +       GATE_WPE_VPP1(CLK_WPE_VPP0_VEC3I, "wpe_vpp0_vec3i", "top_img", 2),

> +       GATE_WPE_VPP1(CLK_WPE_VPP0_WPEO, "wpe_vpp0_wpeo", "top_img", 3),

> +       GATE_WPE_VPP1(CLK_WPE_VPP0_MSKO, "wpe_vpp0_msko", "top_img", 4),

> +};

> +

> +static const struct mtk_gate wpe_vpp1_clks[] = {

> +       /* WPE_VPP0 */

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_VGEN, "wpe_vpp1_vgen", "top_img", 0),

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_EXT, "wpe_vpp1_ext", "top_img", 1),

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_VFC, "wpe_vpp1_vfc", "top_img", 2),

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_CACH0_TOP, "wpe_vpp1_cach0_top", "top_img", 3),

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_CACH0_DMA, "wpe_vpp1_cach0_dma", "top_img", 4),

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_CACH1_TOP, "wpe_vpp1_cach1_top", "top_img", 5),

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_CACH1_DMA, "wpe_vpp1_cach1_dma", "top_img", 6),

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_CACH2_TOP, "wpe_vpp1_cach2_top", "top_img", 7),

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_CACH2_DMA, "wpe_vpp1_cach2_dma", "top_img", 8),

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_CACH3_TOP, "wpe_vpp1_cach3_top", "top_img", 9),

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_CACH3_DMA, "wpe_vpp1_cach3_dma", "top_img", 10),

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_PSP, "wpe_vpp1_psp", "top_img", 11),

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_PSP2, "wpe_vpp1_psp2", "top_img", 12),

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_SYNC, "wpe_vpp1_sync", "top_img", 13),

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_C24, "wpe_vpp1_c24", "top_img", 14),

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_MDP_CROP, "wpe_vpp1_mdp_crop", "top_img", 15),

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_ISP_CROP, "wpe_vpp1_isp_crop", "top_img", 16),

> +       GATE_WPE_VPP0(CLK_WPE_VPP1_TOP, "wpe_vpp1_top", "top_img", 17),

> +       /* WPE_VPP1 */

> +       GATE_WPE_VPP1(CLK_WPE_VPP1_VECI, "wpe_vpp1_veci", "top_img", 0),

> +       GATE_WPE_VPP1(CLK_WPE_VPP1_VEC2I, "wpe_vpp1_vec2i", "top_img", 1),

> +       GATE_WPE_VPP1(CLK_WPE_VPP1_VEC3I, "wpe_vpp1_vec3i", "top_img", 2),

> +       GATE_WPE_VPP1(CLK_WPE_VPP1_WPEO, "wpe_vpp1_wpeo", "top_img", 3),

> +       GATE_WPE_VPP1(CLK_WPE_VPP1_MSKO, "wpe_vpp1_msko", "top_img", 4),


(Reply to correct patch revision...)

Same comment as vencsys patch: wpesys_vpp0 and wpesys_vpp1 look the same.
Are they identical hardware blocks? Are different compatible strings
really needed?

I suggest adding clock-output-names to the device tree, and patching
mtk_clk_register_gates_with_dev() to try to get a clock name from the
device tree, and falling back to the predefined name in the list.
Something like:

<---------------
diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
index 74890759e98c..71e856c22960 100644
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
@@ -125,11 +125,15 @@ int mtk_clk_register_gates_with_dev(struct
device_node *node,

        for (i = 0; i < num; i++) {
                const struct mtk_gate *gate = &clks[i];
+               const char *name = gate->name;

                if (!IS_ERR_OR_NULL(clk_data->clks[gate->id]))
                        continue;

-               clk = mtk_clk_register_gate(gate->name, gate->parent_name,
+               of_property_read_string(node, "clock-output-names", gate->id,
+                                       &name);
+
+               clk = mtk_clk_register_gate(name, gate->parent_name,
                                regmap,
                                gate->regs->set_ofs,
                                gate->regs->clr_ofs,
<---------------
(tabs replaced with spaces, do not apply directly)


ChenYu


> +};

> +

> +static const struct mtk_clk_desc wpe_desc = {

> +       .clks = wpe_clks,

> +       .num_clks = ARRAY_SIZE(wpe_clks),

> +};

> +

> +static const struct mtk_clk_desc wpe_vpp0_desc = {

> +       .clks = wpe_vpp0_clks,

> +       .num_clks = ARRAY_SIZE(wpe_vpp0_clks),

> +};

> +

> +static const struct mtk_clk_desc wpe_vpp1_desc = {

> +       .clks = wpe_vpp1_clks,

> +       .num_clks = ARRAY_SIZE(wpe_vpp1_clks),

> +};

> +

> +static const struct of_device_id of_match_clk_mt8195_wpe[] = {

> +       {

> +               .compatible = "mediatek,mt8195-wpesys",

> +               .data = &wpe_desc,

> +       }, {

> +               .compatible = "mediatek,mt8195-wpesys_vpp0",

> +               .data = &wpe_vpp0_desc,

> +       }, {

> +               .compatible = "mediatek,mt8195-wpesys_vpp1",

> +               .data = &wpe_vpp1_desc,

> +       }, {

> +               /* sentinel */

> +       }

> +};

> +

> +static struct platform_driver clk_mt8195_wpe_drv = {

> +       .probe = mtk_clk_simple_probe,

> +       .driver = {

> +               .name = "clk-mt8195-wpe",

> +               .of_match_table = of_match_clk_mt8195_wpe,

> +       },

> +};

> +builtin_platform_driver(clk_mt8195_wpe_drv);

> --

> 2.18.0

> _______________________________________________

> Linux-mediatek mailing list

> Linux-mediatek@lists.infradead.org

> http://lists.infradead.org/mailman/listinfo/linux-mediatek
Chun-Jie Chen Sept. 10, 2021, 11:04 a.m. UTC | #2 
On Wed, 2021-08-25 at 19:34 +0800, Chen-Yu Tsai wrote:
> On Fri, Aug 20, 2021 at 7:33 PM Chun-Jie Chen

> <chun-jie.chen@mediatek.com> wrote:

> > 

> > Add MT8195 wpesys clock controllers which provide clock gate

> > control in Wrapping Engine.

> > 

> > Signed-off-by: Chun-Jie Chen <chun-jie.chen@mediatek.com>

> > ---

> >  drivers/clk/mediatek/Makefile         |   2 +-

> >  drivers/clk/mediatek/clk-mt8195-wpe.c | 143

> > ++++++++++++++++++++++++++

> >  2 files changed, 144 insertions(+), 1 deletion(-)

> >  create mode 100644 drivers/clk/mediatek/clk-mt8195-wpe.c

> > 

> > diff --git a/drivers/clk/mediatek/Makefile

> > b/drivers/clk/mediatek/Makefile

> > index 402a809ff6ac..dfe7047c6795 100644

> > --- a/drivers/clk/mediatek/Makefile

> > +++ b/drivers/clk/mediatek/Makefile

> > @@ -83,6 +83,6 @@ obj-$(CONFIG_COMMON_CLK_MT8192_VENCSYS) += clk-

> > mt8192-venc.o

> >  obj-$(CONFIG_COMMON_CLK_MT8195) += clk-mt8195-apmixedsys.o clk-

> > mt8195-topckgen.o clk-mt8195-peri_ao.o clk-mt8195-infra_ao.o clk-

> > mt8195-cam.o \

> >                                         clk-mt8195-ccu.o clk-

> > mt8195-img.o clk-mt8195-ipe.o clk-mt8195-mfg.o clk-mt8195-

> > scp_adsp.o \

> >                                         clk-mt8195-vdec.o clk-

> > mt8195-vdo0.o clk-mt8195-vdo1.o clk-mt8195-venc.o clk-mt8195-vpp0.o 

> > \

> > -                                       clk-mt8195-vpp1.o

> > +                                       clk-mt8195-vpp1.o clk-

> > mt8195-wpe.o

> >  obj-$(CONFIG_COMMON_CLK_MT8516) += clk-mt8516.o

> >  obj-$(CONFIG_COMMON_CLK_MT8516_AUDSYS) += clk-mt8516-aud.o

> > diff --git a/drivers/clk/mediatek/clk-mt8195-wpe.c

> > b/drivers/clk/mediatek/clk-mt8195-wpe.c

> > new file mode 100644

> > index 000000000000..7e92a3cab497

> > --- /dev/null

> > +++ b/drivers/clk/mediatek/clk-mt8195-wpe.c

> > @@ -0,0 +1,143 @@

> > +// SPDX-License-Identifier: (GPL-2.0 OR MIT)

> > +//

> > +// Copyright (c) 2021 MediaTek Inc.

> > +// Author: Chun-Jie Chen <chun-jie.chen@mediatek.com>

> > +

> > +#include "clk-gate.h"

> > +#include "clk-mtk.h"

> > +

> > +#include <dt-bindings/clock/mt8195-clk.h>

> > +#include <linux/clk-provider.h>

> > +#include <linux/platform_device.h>

> > +

> > +static const struct mtk_gate_regs wpe_cg_regs = {

> > +       .set_ofs = 0x0,

> > +       .clr_ofs = 0x0,

> > +       .sta_ofs = 0x0,

> > +};

> > +

> > +static const struct mtk_gate_regs wpe_vpp0_cg_regs = {

> > +       .set_ofs = 0x58,

> > +       .clr_ofs = 0x58,

> > +       .sta_ofs = 0x58,

> > +};

> > +

> > +static const struct mtk_gate_regs wpe_vpp1_cg_regs = {

> > +       .set_ofs = 0x5c,

> > +       .clr_ofs = 0x5c,

> > +       .sta_ofs = 0x5c,

> > +};

> > +

> > +#define GATE_WPE(_id, _name, _parent, _shift)                  \

> > +       GATE_MTK(_id, _name, _parent, &wpe_cg_regs, _shift,

> > &mtk_clk_gate_ops_no_setclr_inv)

> > +

> > +#define GATE_WPE_VPP0(_id, _name, _parent,

> > _shift)                     \

> > +       GATE_MTK(_id, _name, _parent, &wpe_vpp0_cg_regs, _shift,

> > &mtk_clk_gate_ops_no_setclr_inv)

> > +

> > +#define GATE_WPE_VPP1(_id, _name, _parent,

> > _shift)                     \

> > +       GATE_MTK(_id, _name, _parent, &wpe_vpp1_cg_regs, _shift,

> > &mtk_clk_gate_ops_no_setclr_inv)

> > +

> > +static const struct mtk_gate wpe_clks[] = {

> > +       GATE_WPE(CLK_WPE_VPP0, "wpe_vpp0", "top_wpe_vpp", 16),

> > +       GATE_WPE(CLK_WPE_VPP1, "wpe_vpp1", "top_wpe_vpp", 17),

> > +       GATE_WPE(CLK_WPE_SMI_LARB7, "wpe_smi_larb7", "top_wpe_vpp",

> > 18),

> > +       GATE_WPE(CLK_WPE_SMI_LARB8, "wpe_smi_larb8", "top_wpe_vpp",

> > 19),

> > +       GATE_WPE(CLK_WPE_EVENT_TX, "wpe_event_tx", "top_wpe_vpp",

> > 20),

> > +       GATE_WPE(CLK_WPE_SMI_LARB7_P, "wpe_smi_larb7_p",

> > "top_wpe_vpp", 24),

> > +       GATE_WPE(CLK_WPE_SMI_LARB8_P, "wpe_smi_larb8_p",

> > "top_wpe_vpp", 25),

> > +};

> > +

> > +static const struct mtk_gate wpe_vpp0_clks[] = {

> > +       /* WPE_VPP0 */

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_VGEN, "wpe_vpp0_vgen",

> > "top_img", 0),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_EXT, "wpe_vpp0_ext", "top_img",

> > 1),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_VFC, "wpe_vpp0_vfc", "top_img",

> > 2),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_CACH0_TOP, "wpe_vpp0_cach0_top",

> > "top_img", 3),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_CACH0_DMA, "wpe_vpp0_cach0_dma",

> > "top_img", 4),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_CACH1_TOP, "wpe_vpp0_cach1_top",

> > "top_img", 5),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_CACH1_DMA, "wpe_vpp0_cach1_dma",

> > "top_img", 6),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_CACH2_TOP, "wpe_vpp0_cach2_top",

> > "top_img", 7),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_CACH2_DMA, "wpe_vpp0_cach2_dma",

> > "top_img", 8),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_CACH3_TOP, "wpe_vpp0_cach3_top",

> > "top_img", 9),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_CACH3_DMA, "wpe_vpp0_cach3_dma",

> > "top_img", 10),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_PSP, "wpe_vpp0_psp", "top_img",

> > 11),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_PSP2, "wpe_vpp0_psp2",

> > "top_img", 12),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_SYNC, "wpe_vpp0_sync",

> > "top_img", 13),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_C24, "wpe_vpp0_c24", "top_img",

> > 14),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_MDP_CROP, "wpe_vpp0_mdp_crop",

> > "top_img", 15),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_ISP_CROP, "wpe_vpp0_isp_crop",

> > "top_img", 16),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP0_TOP, "wpe_vpp0_top", "top_img",

> > 17),

> > +       /* WPE_VPP1 */

> > +       GATE_WPE_VPP1(CLK_WPE_VPP0_VECI, "wpe_vpp0_veci",

> > "top_img", 0),

> > +       GATE_WPE_VPP1(CLK_WPE_VPP0_VEC2I, "wpe_vpp0_vec2i",

> > "top_img", 1),

> > +       GATE_WPE_VPP1(CLK_WPE_VPP0_VEC3I, "wpe_vpp0_vec3i",

> > "top_img", 2),

> > +       GATE_WPE_VPP1(CLK_WPE_VPP0_WPEO, "wpe_vpp0_wpeo",

> > "top_img", 3),

> > +       GATE_WPE_VPP1(CLK_WPE_VPP0_MSKO, "wpe_vpp0_msko",

> > "top_img", 4),

> > +};

> > +

> > +static const struct mtk_gate wpe_vpp1_clks[] = {

> > +       /* WPE_VPP0 */

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_VGEN, "wpe_vpp1_vgen",

> > "top_img", 0),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_EXT, "wpe_vpp1_ext", "top_img",

> > 1),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_VFC, "wpe_vpp1_vfc", "top_img",

> > 2),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_CACH0_TOP, "wpe_vpp1_cach0_top",

> > "top_img", 3),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_CACH0_DMA, "wpe_vpp1_cach0_dma",

> > "top_img", 4),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_CACH1_TOP, "wpe_vpp1_cach1_top",

> > "top_img", 5),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_CACH1_DMA, "wpe_vpp1_cach1_dma",

> > "top_img", 6),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_CACH2_TOP, "wpe_vpp1_cach2_top",

> > "top_img", 7),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_CACH2_DMA, "wpe_vpp1_cach2_dma",

> > "top_img", 8),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_CACH3_TOP, "wpe_vpp1_cach3_top",

> > "top_img", 9),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_CACH3_DMA, "wpe_vpp1_cach3_dma",

> > "top_img", 10),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_PSP, "wpe_vpp1_psp", "top_img",

> > 11),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_PSP2, "wpe_vpp1_psp2",

> > "top_img", 12),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_SYNC, "wpe_vpp1_sync",

> > "top_img", 13),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_C24, "wpe_vpp1_c24", "top_img",

> > 14),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_MDP_CROP, "wpe_vpp1_mdp_crop",

> > "top_img", 15),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_ISP_CROP, "wpe_vpp1_isp_crop",

> > "top_img", 16),

> > +       GATE_WPE_VPP0(CLK_WPE_VPP1_TOP, "wpe_vpp1_top", "top_img",

> > 17),

> > +       /* WPE_VPP1 */

> > +       GATE_WPE_VPP1(CLK_WPE_VPP1_VECI, "wpe_vpp1_veci",

> > "top_img", 0),

> > +       GATE_WPE_VPP1(CLK_WPE_VPP1_VEC2I, "wpe_vpp1_vec2i",

> > "top_img", 1),

> > +       GATE_WPE_VPP1(CLK_WPE_VPP1_VEC3I, "wpe_vpp1_vec3i",

> > "top_img", 2),

> > +       GATE_WPE_VPP1(CLK_WPE_VPP1_WPEO, "wpe_vpp1_wpeo",

> > "top_img", 3),

> > +       GATE_WPE_VPP1(CLK_WPE_VPP1_MSKO, "wpe_vpp1_msko",

> > "top_img", 4),

> 

> (Reply to correct patch revision...)

> 

> Same comment as vencsys patch: wpesys_vpp0 and wpesys_vpp1 look the

> same.

> Are they identical hardware blocks? Are different compatible strings

> really needed?

> 


wpesys_vpp0 and wpesys_vpp1 are two HW blocks with similar usage,
usually one for vpp0, one for vpp1. But they are still different HW
blocks so use two device nodes to present.

> I suggest adding clock-output-names to the device tree, and patching

> mtk_clk_register_gates_with_dev() to try to get a clock name from the

> device tree, and falling back to the predefined name in the list.

> Something like:

> 

> <---------------

> diff --git a/drivers/clk/mediatek/clk-mtk.c

> b/drivers/clk/mediatek/clk-mtk.c

> index 74890759e98c..71e856c22960 100644

> --- a/drivers/clk/mediatek/clk-mtk.c

> +++ b/drivers/clk/mediatek/clk-mtk.c

> @@ -125,11 +125,15 @@ int mtk_clk_register_gates_with_dev(struct

> device_node *node,

> 

>         for (i = 0; i < num; i++) {

>                 const struct mtk_gate *gate = &clks[i];

> +               const char *name = gate->name;

> 

>                 if (!IS_ERR_OR_NULL(clk_data->clks[gate->id]))

>                         continue;

> 

> -               clk = mtk_clk_register_gate(gate->name, gate-

> >parent_name,

> +               of_property_read_string(node, "clock-output-names",

> gate->id,

> +                                       &name);

> +

> +               clk = mtk_clk_register_gate(name, gate->parent_name,

>                                 regmap,

>                                 gate->regs->set_ofs,

>                                 gate->regs->clr_ofs,

> <---------------

> (tabs replaced with spaces, do not apply directly)

> 

> 

> ChenYu

> 

> 


Do you means describe the clock gate data in device tree like below

GATE_WPE_VPP0(CLK_WPE_VPP1_VGEN, "wpe_vpp1_vgen", "top_img", 0),
GATE_WPE_VPP0(CLK_WPE_VPP1_EXT, "wpe_vpp1_ext", "top_img", 1),

=>
clocks = <&topckgen CLK_TOP_IMG>,
	 <&topckgen CLK_TOP_IMG>,
	 ...

clock-output-names = "wpe_vpp1_vgen",
		     "wpe_vpp1_ext",
		     ...

Because many clock gate provided by different HW blocks,
I think is more easier to see the relation if we represent the clock
gate data in one line.

Thanks!
Best Regards,
Chun-Jie

> > +};

> > +

> > +static const struct mtk_clk_desc wpe_desc = {

> > +       .clks = wpe_clks,

> > +       .num_clks = ARRAY_SIZE(wpe_clks),

> > +};

> > +

> > +static const struct mtk_clk_desc wpe_vpp0_desc = {

> > +       .clks = wpe_vpp0_clks,

> > +       .num_clks = ARRAY_SIZE(wpe_vpp0_clks),

> > +};

> > +

> > +static const struct mtk_clk_desc wpe_vpp1_desc = {

> > +       .clks = wpe_vpp1_clks,

> > +       .num_clks = ARRAY_SIZE(wpe_vpp1_clks),

> > +};

> > +

> > +static const struct of_device_id of_match_clk_mt8195_wpe[] = {

> > +       {

> > +               .compatible = "mediatek,mt8195-wpesys",

> > +               .data = &wpe_desc,

> > +       }, {

> > +               .compatible = "mediatek,mt8195-wpesys_vpp0",

> > +               .data = &wpe_vpp0_desc,

> > +       }, {

> > +               .compatible = "mediatek,mt8195-wpesys_vpp1",

> > +               .data = &wpe_vpp1_desc,

> > +       }, {

> > +               /* sentinel */

> > +       }

> > +};

> > +

> > +static struct platform_driver clk_mt8195_wpe_drv = {

> > +       .probe = mtk_clk_simple_probe,

> > +       .driver = {

> > +               .name = "clk-mt8195-wpe",

> > +               .of_match_table = of_match_clk_mt8195_wpe,

> > +       },

> > +};

> > +builtin_platform_driver(clk_mt8195_wpe_drv);

> > --

> > 2.18.0

> > _______________________________________________

> > Linux-mediatek mailing list

> > Linux-mediatek@lists.infradead.org

> > 

https://urldefense.com/v3/__http://lists.infradead.org/mailman/listinfo/linux-mediatek__;!!CTRNKA9wMg0ARbw!wQWbu0qIBnImpekkOJjCg1-XpD5xgpo5oNQv2k4wp-_Ti03N38ksQtWbfJi_IQ_y7CwH$
> >
diff mbox series

Patch

diff --git a/drivers/clk/mediatek/Makefile b/drivers/clk/mediatek/Makefile
index 402a809ff6ac..dfe7047c6795 100644
--- a/drivers/clk/mediatek/Makefile
+++ b/drivers/clk/mediatek/Makefile
@@ -83,6 +83,6 @@  obj-$(CONFIG_COMMON_CLK_MT8192_VENCSYS) += clk-mt8192-venc.o
 obj-$(CONFIG_COMMON_CLK_MT8195) += clk-mt8195-apmixedsys.o clk-mt8195-topckgen.o clk-mt8195-peri_ao.o clk-mt8195-infra_ao.o clk-mt8195-cam.o \
 					clk-mt8195-ccu.o clk-mt8195-img.o clk-mt8195-ipe.o clk-mt8195-mfg.o clk-mt8195-scp_adsp.o \
 					clk-mt8195-vdec.o clk-mt8195-vdo0.o clk-mt8195-vdo1.o clk-mt8195-venc.o clk-mt8195-vpp0.o \
-					clk-mt8195-vpp1.o
+					clk-mt8195-vpp1.o clk-mt8195-wpe.o
 obj-$(CONFIG_COMMON_CLK_MT8516) += clk-mt8516.o
 obj-$(CONFIG_COMMON_CLK_MT8516_AUDSYS) += clk-mt8516-aud.o
diff --git a/drivers/clk/mediatek/clk-mt8195-wpe.c b/drivers/clk/mediatek/clk-mt8195-wpe.c
new file mode 100644
index 000000000000..7e92a3cab497
--- /dev/null
+++ b/drivers/clk/mediatek/clk-mt8195-wpe.c
@@ -0,0 +1,143 @@ 
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+//
+// Copyright (c) 2021 MediaTek Inc.
+// Author: Chun-Jie Chen <chun-jie.chen@mediatek.com>
+
+#include "clk-gate.h"
+#include "clk-mtk.h"
+
+#include <dt-bindings/clock/mt8195-clk.h>
+#include <linux/clk-provider.h>
+#include <linux/platform_device.h>
+
+static const struct mtk_gate_regs wpe_cg_regs = {
+	.set_ofs = 0x0,
+	.clr_ofs = 0x0,
+	.sta_ofs = 0x0,
+};
+
+static const struct mtk_gate_regs wpe_vpp0_cg_regs = {
+	.set_ofs = 0x58,
+	.clr_ofs = 0x58,
+	.sta_ofs = 0x58,
+};
+
+static const struct mtk_gate_regs wpe_vpp1_cg_regs = {
+	.set_ofs = 0x5c,
+	.clr_ofs = 0x5c,
+	.sta_ofs = 0x5c,
+};
+
+#define GATE_WPE(_id, _name, _parent, _shift)			\
+	GATE_MTK(_id, _name, _parent, &wpe_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)
+
+#define GATE_WPE_VPP0(_id, _name, _parent, _shift)			\
+	GATE_MTK(_id, _name, _parent, &wpe_vpp0_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)
+
+#define GATE_WPE_VPP1(_id, _name, _parent, _shift)			\
+	GATE_MTK(_id, _name, _parent, &wpe_vpp1_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)
+
+static const struct mtk_gate wpe_clks[] = {
+	GATE_WPE(CLK_WPE_VPP0, "wpe_vpp0", "top_wpe_vpp", 16),
+	GATE_WPE(CLK_WPE_VPP1, "wpe_vpp1", "top_wpe_vpp", 17),
+	GATE_WPE(CLK_WPE_SMI_LARB7, "wpe_smi_larb7", "top_wpe_vpp", 18),
+	GATE_WPE(CLK_WPE_SMI_LARB8, "wpe_smi_larb8", "top_wpe_vpp", 19),
+	GATE_WPE(CLK_WPE_EVENT_TX, "wpe_event_tx", "top_wpe_vpp", 20),
+	GATE_WPE(CLK_WPE_SMI_LARB7_P, "wpe_smi_larb7_p", "top_wpe_vpp", 24),
+	GATE_WPE(CLK_WPE_SMI_LARB8_P, "wpe_smi_larb8_p", "top_wpe_vpp", 25),
+};
+
+static const struct mtk_gate wpe_vpp0_clks[] = {
+	/* WPE_VPP0 */
+	GATE_WPE_VPP0(CLK_WPE_VPP0_VGEN, "wpe_vpp0_vgen", "top_img", 0),
+	GATE_WPE_VPP0(CLK_WPE_VPP0_EXT, "wpe_vpp0_ext", "top_img", 1),
+	GATE_WPE_VPP0(CLK_WPE_VPP0_VFC, "wpe_vpp0_vfc", "top_img", 2),
+	GATE_WPE_VPP0(CLK_WPE_VPP0_CACH0_TOP, "wpe_vpp0_cach0_top", "top_img", 3),
+	GATE_WPE_VPP0(CLK_WPE_VPP0_CACH0_DMA, "wpe_vpp0_cach0_dma", "top_img", 4),
+	GATE_WPE_VPP0(CLK_WPE_VPP0_CACH1_TOP, "wpe_vpp0_cach1_top", "top_img", 5),
+	GATE_WPE_VPP0(CLK_WPE_VPP0_CACH1_DMA, "wpe_vpp0_cach1_dma", "top_img", 6),
+	GATE_WPE_VPP0(CLK_WPE_VPP0_CACH2_TOP, "wpe_vpp0_cach2_top", "top_img", 7),
+	GATE_WPE_VPP0(CLK_WPE_VPP0_CACH2_DMA, "wpe_vpp0_cach2_dma", "top_img", 8),
+	GATE_WPE_VPP0(CLK_WPE_VPP0_CACH3_TOP, "wpe_vpp0_cach3_top", "top_img", 9),
+	GATE_WPE_VPP0(CLK_WPE_VPP0_CACH3_DMA, "wpe_vpp0_cach3_dma", "top_img", 10),
+	GATE_WPE_VPP0(CLK_WPE_VPP0_PSP, "wpe_vpp0_psp", "top_img", 11),
+	GATE_WPE_VPP0(CLK_WPE_VPP0_PSP2, "wpe_vpp0_psp2", "top_img", 12),
+	GATE_WPE_VPP0(CLK_WPE_VPP0_SYNC, "wpe_vpp0_sync", "top_img", 13),
+	GATE_WPE_VPP0(CLK_WPE_VPP0_C24, "wpe_vpp0_c24", "top_img", 14),
+	GATE_WPE_VPP0(CLK_WPE_VPP0_MDP_CROP, "wpe_vpp0_mdp_crop", "top_img", 15),
+	GATE_WPE_VPP0(CLK_WPE_VPP0_ISP_CROP, "wpe_vpp0_isp_crop", "top_img", 16),
+	GATE_WPE_VPP0(CLK_WPE_VPP0_TOP, "wpe_vpp0_top", "top_img", 17),
+	/* WPE_VPP1 */
+	GATE_WPE_VPP1(CLK_WPE_VPP0_VECI, "wpe_vpp0_veci", "top_img", 0),
+	GATE_WPE_VPP1(CLK_WPE_VPP0_VEC2I, "wpe_vpp0_vec2i", "top_img", 1),
+	GATE_WPE_VPP1(CLK_WPE_VPP0_VEC3I, "wpe_vpp0_vec3i", "top_img", 2),
+	GATE_WPE_VPP1(CLK_WPE_VPP0_WPEO, "wpe_vpp0_wpeo", "top_img", 3),
+	GATE_WPE_VPP1(CLK_WPE_VPP0_MSKO, "wpe_vpp0_msko", "top_img", 4),
+};
+
+static const struct mtk_gate wpe_vpp1_clks[] = {
+	/* WPE_VPP0 */
+	GATE_WPE_VPP0(CLK_WPE_VPP1_VGEN, "wpe_vpp1_vgen", "top_img", 0),
+	GATE_WPE_VPP0(CLK_WPE_VPP1_EXT, "wpe_vpp1_ext", "top_img", 1),
+	GATE_WPE_VPP0(CLK_WPE_VPP1_VFC, "wpe_vpp1_vfc", "top_img", 2),
+	GATE_WPE_VPP0(CLK_WPE_VPP1_CACH0_TOP, "wpe_vpp1_cach0_top", "top_img", 3),
+	GATE_WPE_VPP0(CLK_WPE_VPP1_CACH0_DMA, "wpe_vpp1_cach0_dma", "top_img", 4),
+	GATE_WPE_VPP0(CLK_WPE_VPP1_CACH1_TOP, "wpe_vpp1_cach1_top", "top_img", 5),
+	GATE_WPE_VPP0(CLK_WPE_VPP1_CACH1_DMA, "wpe_vpp1_cach1_dma", "top_img", 6),
+	GATE_WPE_VPP0(CLK_WPE_VPP1_CACH2_TOP, "wpe_vpp1_cach2_top", "top_img", 7),
+	GATE_WPE_VPP0(CLK_WPE_VPP1_CACH2_DMA, "wpe_vpp1_cach2_dma", "top_img", 8),
+	GATE_WPE_VPP0(CLK_WPE_VPP1_CACH3_TOP, "wpe_vpp1_cach3_top", "top_img", 9),
+	GATE_WPE_VPP0(CLK_WPE_VPP1_CACH3_DMA, "wpe_vpp1_cach3_dma", "top_img", 10),
+	GATE_WPE_VPP0(CLK_WPE_VPP1_PSP, "wpe_vpp1_psp", "top_img", 11),
+	GATE_WPE_VPP0(CLK_WPE_VPP1_PSP2, "wpe_vpp1_psp2", "top_img", 12),
+	GATE_WPE_VPP0(CLK_WPE_VPP1_SYNC, "wpe_vpp1_sync", "top_img", 13),
+	GATE_WPE_VPP0(CLK_WPE_VPP1_C24, "wpe_vpp1_c24", "top_img", 14),
+	GATE_WPE_VPP0(CLK_WPE_VPP1_MDP_CROP, "wpe_vpp1_mdp_crop", "top_img", 15),
+	GATE_WPE_VPP0(CLK_WPE_VPP1_ISP_CROP, "wpe_vpp1_isp_crop", "top_img", 16),
+	GATE_WPE_VPP0(CLK_WPE_VPP1_TOP, "wpe_vpp1_top", "top_img", 17),
+	/* WPE_VPP1 */
+	GATE_WPE_VPP1(CLK_WPE_VPP1_VECI, "wpe_vpp1_veci", "top_img", 0),
+	GATE_WPE_VPP1(CLK_WPE_VPP1_VEC2I, "wpe_vpp1_vec2i", "top_img", 1),
+	GATE_WPE_VPP1(CLK_WPE_VPP1_VEC3I, "wpe_vpp1_vec3i", "top_img", 2),
+	GATE_WPE_VPP1(CLK_WPE_VPP1_WPEO, "wpe_vpp1_wpeo", "top_img", 3),
+	GATE_WPE_VPP1(CLK_WPE_VPP1_MSKO, "wpe_vpp1_msko", "top_img", 4),
+};
+
+static const struct mtk_clk_desc wpe_desc = {
+	.clks = wpe_clks,
+	.num_clks = ARRAY_SIZE(wpe_clks),
+};
+
+static const struct mtk_clk_desc wpe_vpp0_desc = {
+	.clks = wpe_vpp0_clks,
+	.num_clks = ARRAY_SIZE(wpe_vpp0_clks),
+};
+
+static const struct mtk_clk_desc wpe_vpp1_desc = {
+	.clks = wpe_vpp1_clks,
+	.num_clks = ARRAY_SIZE(wpe_vpp1_clks),
+};
+
+static const struct of_device_id of_match_clk_mt8195_wpe[] = {
+	{
+		.compatible = "mediatek,mt8195-wpesys",
+		.data = &wpe_desc,
+	}, {
+		.compatible = "mediatek,mt8195-wpesys_vpp0",
+		.data = &wpe_vpp0_desc,
+	}, {
+		.compatible = "mediatek,mt8195-wpesys_vpp1",
+		.data = &wpe_vpp1_desc,
+	}, {
+		/* sentinel */
+	}
+};
+
+static struct platform_driver clk_mt8195_wpe_drv = {
+	.probe = mtk_clk_simple_probe,
+	.driver = {
+		.name = "clk-mt8195-wpe",
+		.of_match_table = of_match_clk_mt8195_wpe,
+	},
+};
+builtin_platform_driver(clk_mt8195_wpe_drv);