Mediatek MT8183 clock and scpsys support
Subsystems (3)
v2 cover Mediatek MT8183 clock and scpsys support
This series is based on v4.20-rc1 and most of changes are extracted from series below
(clock/scpsys common changes for both MT8183 & MT6765)
https://patchwork.kernel.org/patch/10528495/
(clock support of MT8183)
https://patchwork.kernel.org/patch/10549891/
The whole series is composed of
clock common changes for both MT8183 & MT6765 (PATCH 1-3), scpsys common changes for both MT8183 & MT6765 (PATCH 4), clock support of MT8183 (PATCH 5-8), and
scpsys support of MT8183 (PATCH 9-11).
changes since v1:
- refine for better code quality.
- some minor bug fix of clock part, like incorrect control address and missing clocks.
v2 cover Mediatek MT8183 clock and scpsys support
This series is based on v4.20-rc1 and most of changes are extracted from series below
(clock/scpsys common changes for both MT8183 & MT6765)
https://patchwork.kernel.org/patch/10528495/
(clock support of MT8183)
https://patchwork.kernel.org/patch/10549891/
The whole series is composed of
clock common changes for both MT8183 & MT6765 (PATCH 1-3), scpsys common changes for both MT8183 & MT6765 (PATCH 4), clock support of MT8183 (PATCH 5-8), and
scpsys support of MT8183 (PATCH 9-11).
changes since v1:
- refine for better code quality.
- some minor bug fix of clock part, like incorrect control address and missing clocks.
Owen Chen (4):
clk: mediatek: add new clkmux register API
clk: mediatek: add new member to mtk_pll_data
clk: mediatek: Disable tuner_en before change PLL rate
soc: mediatek: add new flow for mtcmos power.
Weiyi Lu (7):
dt-bindings: ARM: Mediatek: Document bindings for MT8183
clk: mediatek: Add dt-bindings for MT8183 clocks
clk: mediatek: Add flags support for mtk_gate data
clk: mediatek: Add MT8183 clock support
dt-bindings: soc: fix typo of MT8173 power dt-bindings
dt-bindings: soc: Add MT8183 power dt-bindings
soc: mediatek: Add MT8183 scpsys support
.../arm/mediatek/mediatek,apmixedsys.txt | 1 + .../bindings/arm/mediatek/mediatek,audsys.txt | 1 + .../bindings/arm/mediatek/mediatek,camsys.txt | 22 + .../bindings/arm/mediatek/mediatek,imgsys.txt | 1 + .../arm/mediatek/mediatek,infracfg.txt | 1 + .../bindings/arm/mediatek/mediatek,ipu.txt | 43 + .../bindings/arm/mediatek/mediatek,mcucfg.txt | 1 + .../bindings/arm/mediatek/mediatek,mfgcfg.txt | 1 + .../bindings/arm/mediatek/mediatek,mmsys.txt | 1 + .../arm/mediatek/mediatek,topckgen.txt | 1 + .../arm/mediatek/mediatek,vdecsys.txt | 1 + .../arm/mediatek/mediatek,vencsys.txt | 1 + .../bindings/soc/mediatek/scpsys.txt | 14 + drivers/clk/mediatek/Kconfig | 75 + drivers/clk/mediatek/Makefile | 14 +- drivers/clk/mediatek/clk-gate.c | 5 +- drivers/clk/mediatek/clk-gate.h | 17 +- drivers/clk/mediatek/clk-mt8183-audio.c | 102 ++ drivers/clk/mediatek/clk-mt8183-cam.c | 70 + drivers/clk/mediatek/clk-mt8183-img.c | 70 + drivers/clk/mediatek/clk-mt8183-ipu0.c | 63 + drivers/clk/mediatek/clk-mt8183-ipu1.c | 63 + drivers/clk/mediatek/clk-mt8183-ipu_adl.c | 61 + drivers/clk/mediatek/clk-mt8183-ipu_conn.c | 130 ++ drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 61 + drivers/clk/mediatek/clk-mt8183-mm.c | 118 ++ drivers/clk/mediatek/clk-mt8183-vdec.c | 74 + drivers/clk/mediatek/clk-mt8183-venc.c | 66 + drivers/clk/mediatek/clk-mt8183.c | 1305 +++++++++++++++++ drivers/clk/mediatek/clk-mtk.c | 3 +- drivers/clk/mediatek/clk-mtk.h | 3 + drivers/clk/mediatek/clk-mux.c | 240 +++ drivers/clk/mediatek/clk-mux.h | 101 ++ drivers/clk/mediatek/clk-pll.c | 45 +- drivers/soc/mediatek/Makefile | 2 +- drivers/soc/mediatek/mtk-scpsys-ext.c | 99 ++ drivers/soc/mediatek/mtk-scpsys.c | 604 +++++++- include/dt-bindings/clock/mt8183-clk.h | 422 ++++++ include/dt-bindings/power/mt8173-power.h | 6 +- include/dt-bindings/power/mt8183-power.h | 26 + include/linux/soc/mediatek/scpsys-ext.h | 39 + 41 files changed, 3889 insertions(+), 84 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,camsys.txt create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,ipu.txt create mode 100644 drivers/clk/mediatek/clk-mt8183-audio.c create mode 100644 drivers/clk/mediatek/clk-mt8183-cam.c create mode 100644 drivers/clk/mediatek/clk-mt8183-img.c create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu0.c create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu1.c create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu_adl.c create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu_conn.c create mode 100644 drivers/clk/mediatek/clk-mt8183-mfgcfg.c create mode 100644 drivers/clk/mediatek/clk-mt8183-mm.c create mode 100644 drivers/clk/mediatek/clk-mt8183-vdec.c create mode 100644 drivers/clk/mediatek/clk-mt8183-venc.c create mode 100644 drivers/clk/mediatek/clk-mt8183.c create mode 100644 drivers/clk/mediatek/clk-mux.c create mode 100644 drivers/clk/mediatek/clk-mux.h create mode 100644 drivers/soc/mediatek/mtk-scpsys-ext.c create mode 100644 include/dt-bindings/clock/mt8183-clk.h create mode 100644 include/dt-bindings/power/mt8183-power.h create mode 100644 include/linux/soc/mediatek/scpsys-ext.h
Signature · 1 line
2.18.0
PATCH v2 1/11 clk: mediatek: add new clkmux register API
In reply to Weiyi LuFrom: Owen Chen <[email protected]>
On both MT8183 & MT6765, there add "set/clr" register for each clkmux setting, and one update register to trigger value change. It is designed to prevent read-modify-write racing issue. The sw design need to add a new API to handle this hw change with a new mtk_clk_mux/mtk_mux struct in new file "clk-mux.c", "clk-mux.h".
--- drivers/clk/mediatek/Makefile | 2 +- drivers/clk/mediatek/clk-mux.c | 240 +++++++++++++++++++++++++++++++++ drivers/clk/mediatek/clk-mux.h | 101 ++++++++++++++ 3 files changed, 342 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/mediatek/clk-mux.c create mode 100644 drivers/clk/mediatek/clk-mux.h
drivers/clk/mediatek/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_COMMON_CLK_MEDIATEK) += clk-mtk.o clk-pll.o clk-gate.o clk-apmixed.o clk-cpumux.o reset.o +obj-$(CONFIG_COMMON_CLK_MEDIATEK) += clk-mtk.o clk-pll.o clk-gate.o clk-apmixed.o clk-cpumux.o reset.o clk-mux.o obj-$(CONFIG_COMMON_CLK_MT6797) += clk-mt6797.o obj-$(CONFIG_COMMON_CLK_MT6797_IMGSYS) += clk-mt6797-img.o obj-$(CONFIG_COMMON_CLK_MT6797_MMSYS) += clk-mt6797-mm.o
drivers/clk/mediatek/clk-mux.c new file +240 -0
240 lines not on this page · raw message
drivers/clk/mediatek/clk-mux.h new file +101 -0
101 lines not on this page · raw message
Signature · 1 line
2.18.0
Re: [PATCH v2 01/11] clk: mediatek: add new clkmux register API
Quoted 42 lines · Weiyi Lu
From: Owen Chen <[email protected]>
On both MT8183 & MT6765, there add "set/clr" register for each clkmux setting, and one update register to trigger value change. It is designed to prevent read-modify-write racing issue. The sw design need to add a new API to handle this hw change with a new mtk_clk_mux/mtk_mux struct in new file "
clk-mux.c", "clk-mux.h".Signed-off-by Owen Chen <[email protected]>Signed-off-by Weiyi Lu <[email protected]>--- drivers/clk/mediatek/Makefile | 2 +- drivers/clk/mediatek/clk-mux.c | 240 +++++++++++++++++++++++++++++++++ drivers/clk/mediatek/clk-mux.h | 101 ++++++++++++++ 3 files changed, 342 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/mediatek/clk-mux.c create mode 100644 drivers/clk/mediatek/clk-mux.hdrivers/clk/mediatek/Makefile +1
-1@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_COMMON_CLK_MEDIATEK) += clk-mtk.o clk-pll.o clk-gate.o clk-apmixed.o clk-cpumux.o reset.o +obj-$(CONFIG_COMMON_CLK_MEDIATEK) += clk-mtk.o clk-pll.o clk-gate.o clk-apmixed.o clk-cpumux.o reset.o clk-mux.o obj-$(CONFIG_COMMON_CLK_MT6797) += clk-mt6797.o obj-$(CONFIG_COMMON_CLK_MT6797_IMGSYS) += clk-mt6797-img.o obj-$(CONFIG_COMMON_CLK_MT6797_MMSYS) += clk-mt6797-mm.odrivers/clk/mediatek/clk-mux.c new file +6
-0@@ -0,0 +1,240 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Owen Chen <[email protected]> +*/ +
drivers/clk/mediatek/clk-mux.c line 16
Quoted 10 lines
drivers/clk/mediatek/clk-mux.c new file +10
-0+#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/slab.h> +#include <linux/mfd/syscon.h> + +#include "clk-mtk.h" +#include "clk-mux.h" + +static inline struct mtk_clk_mux + *to_mtk_clk_mux (struct clk_hw *hw)
nit: this fits in one line
Quoted 17 lines
drivers/clk/mediatek/clk-mux.c new file +17
-0+{ + return container_of(hw, struct mtk_clk_mux, hw); +} + +static int mtk_clk_mux_enable (struct clk_hw *hw) +{ +struct mtk_clk_mux *mux =to_mtk_clk_mux (hw); +u32 mask =BIT (mux->gate_shift); + +return regmap_update_bits (mux->regmap, mux->mux_ofs, mask,0 ); +} + +static void mtk_clk_mux_disable (struct clk_hw *hw) +{ +struct mtk_clk_mux *mux =to_mtk_clk_mux (hw); +u32 mask =BIT (mux->gate_shift); +
drivers/clk/mediatek/clk-mux.c line 43
Quoted 10 lines
drivers/clk/mediatek/clk-mux.c new file +10
-0+regmap_update_bits (mux->regmap, mux->mux_ofs, mask, mask); +} + +static int mtk_clk_mux_enable_setclr (struct clk_hw *hw) +{ +struct mtk_clk_mux *mux =to_mtk_clk_mux (hw); +u32 val; + + val =BIT (mux->gate_shift); +
nit: No blank line here. Or at least be consistent with what mtk_clk_mux_disable_setclr does below.
Also, put everything on one line:
u32 val = BIT(mux->gate_shift);
(or, again, at least be self-consistent)
Quoted 307 lines
drivers/clk/mediatek/clk-mux.c new file +197
-0+return regmap_write (mux->regmap, mux->mux_clr_ofs, val); +} + +static void mtk_clk_mux_disable_setclr (struct clk_hw *hw) +{ +struct mtk_clk_mux *mux =to_mtk_clk_mux (hw); +u32 val; + + val =BIT (mux->gate_shift); +regmap_write (mux->regmap, mux->mux_set_ofs, val); +} + +static int mtk_clk_mux_is_enabled (struct clk_hw *hw) +{ +struct mtk_clk_mux *mux =to_mtk_clk_mux (hw); +u32 val; + +regmap_read (mux->regmap, mux->mux_ofs, &val); + +return (val &BIT (mux->gate_shift)) ==0 ; +} + +static u8 mtk_clk_mux_get_parent (struct clk_hw *hw) +{ +struct mtk_clk_mux *mux =to_mtk_clk_mux (hw); +u32 mask =GENMASK (mux->mux_width -1 ,0 ); +u32 val; + +regmap_read (mux->regmap, mux->mux_ofs, &val); + val = (val >> mux->mux_shift) & mask; + +return val; +} + +static int mtk_clk_mux_set_parent_lock (struct clk_hw *hw,u8 index) +{ +struct mtk_clk_mux *mux =to_mtk_clk_mux (hw); +u32 mask =GENMASK (mux->mux_width -1 ,0 ); +u32 val; +unsigned long flags =0 ; + +if (mux->lock) +spin_lock_irqsave (mux->lock, flags); +else +__acquire (mux->lock); + +regmap_read (mux->regmap, mux->mux_ofs, &val); + val = (val & mask) >> mux->mux_shift; + +if (val != index) { + val = index << mux->mux_shift; +regmap_update_bits (mux->regmap, mux->mux_ofs, mask, val); + } + +if (mux->lock) +spin_unlock_irqrestore (mux->lock, flags); +else +__release (mux->lock); + +return 0 ; +} + +static int mtk_clk_mux_set_parent_setclr_lock (struct clk_hw *hw,u8 index) +{ +struct mtk_clk_mux *mux =to_mtk_clk_mux (hw); +u32 mask =GENMASK (mux->mux_width -1 ,0 ); +u32 val, orig; +unsigned long flags =0 ; + +if (mux->lock) +spin_lock_irqsave (mux->lock, flags); +else +__acquire (mux->lock); + +regmap_read (mux->regmap, mux->mux_ofs, &orig); + val = (orig & ~(mask << mux->mux_shift)) | (index << mux->mux_shift); + +if (val != orig) { +regmap_write (mux->regmap, mux->mux_clr_ofs, + mask << mux->mux_shift); +regmap_write (mux->regmap, mux->mux_set_ofs, + index << mux->mux_shift); + +if (mux->upd_shift >=0 ) +regmap_write (mux->regmap, mux->upd_ofs, +BIT (mux->upd_shift)); + } + +if (mux->lock) +spin_unlock_irqrestore (mux->lock, flags); +else +__release (mux->lock); + +return 0 ; +} + +const struct clk_ops mtk_mux_ops = { + .get_parent = mtk_clk_mux_get_parent, + .set_parent = mtk_clk_mux_set_parent_lock, +}; + +const struct clk_ops mtk_mux_clr_set_upd_ops = { + .get_parent = mtk_clk_mux_get_parent, + .set_parent = mtk_clk_mux_set_parent_setclr_lock, +}; + +const struct clk_ops mtk_mux_gate_ops = { + .enable = mtk_clk_mux_enable, + .disable = mtk_clk_mux_disable, + .is_enabled = mtk_clk_mux_is_enabled, + .get_parent = mtk_clk_mux_get_parent, + .set_parent = mtk_clk_mux_set_parent_lock, +}; + +const struct clk_ops mtk_mux_gate_clr_set_upd_ops = { + .enable = mtk_clk_mux_enable_setclr, + .disable = mtk_clk_mux_disable_setclr, + .is_enabled = mtk_clk_mux_is_enabled, + .get_parent = mtk_clk_mux_get_parent, + .set_parent = mtk_clk_mux_set_parent_setclr_lock, +}; + +struct clk *mtk_clk_register_mux (const struct mtk_mux *mux, +struct regmap *regmap, +spinlock_t *lock) +{ +struct mtk_clk_mux *mtk_mux; +struct clk_init_data init; +struct clk *clk; + + mtk_mux =kzalloc (sizeof (*mtk_mux),GFP_KERNEL ); +if (!mtk_mux) +return ERR_PTR (-ENOMEM ); + + init.name = mux->name; + init.flags = mux->flags |CLK_SET_RATE_PARENT ; + init.parent_names = mux->parent_names; + init.num_parents = mux->num_parents; + init.ops = mux->ops; + + mtk_mux->regmap = regmap; + mtk_mux->name = mux->name; + mtk_mux->mux_ofs = mux->mux_ofs; + mtk_mux->mux_set_ofs = mux->set_ofs; + mtk_mux->mux_clr_ofs = mux->clr_ofs; + mtk_mux->upd_ofs = mux->upd_ofs; + mtk_mux->mux_shift = mux->mux_shift; + mtk_mux->mux_width = mux->mux_width; + mtk_mux->gate_shift = mux->gate_shift; + mtk_mux->upd_shift = mux->upd_shift; + + mtk_mux->lock = lock; + mtk_mux->hw.init = &init; + + clk =clk_register (NULL , &mtk_mux->hw); +if (IS_ERR (clk)) { +kfree (mtk_mux); +return clk; + } + +return clk; +} + +int mtk_clk_register_muxes (const struct mtk_mux *muxes, +int num,struct device_node *node, +spinlock_t *lock, +struct clk_onecell_data *clk_data) +{ +struct regmap *regmap; +struct clk *clk; +int i; + + regmap =syscon_node_to_regmap (node); +if (IS_ERR (regmap)) { +pr_err ("Cannot find regmap for %pOF: %ld\n" , node, +PTR_ERR (regmap)); +return PTR_ERR (regmap); + } + +for (i =0 ; i < num; i++) { +const struct mtk_mux *mux = &muxes[i]; + +if (IS_ERR_OR_NULL (clk_data->clks[mux->id])) { + clk =mtk_clk_register_mux (mux, regmap, lock); + +if (IS_ERR (clk)) { +pr_err ("Failed to register clk %s: %ld\n" , + mux->name,PTR_ERR (clk)); +continue ; + } + + clk_data->clks[mux->id] = clk; + } + } + +return 0 ; +}drivers/clk/mediatek/clk-mux.h new file +101
-1@@ -0,0 +1,101 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Owen Chen <[email protected]> +*/ + +#ifndef __DRV_CLK_MUX_H +#define __DRV_CLK_MUX_H + +#include <linux/clk-provider.h> + +struct mtk_clk_mux { +struct clk_hw hw; +struct regmap *regmap; + +const char *name; + +u32 mux_set_ofs; +u32 mux_clr_ofs; +u32 mux_ofs; +u32 upd_ofs; + +u8 mux_shift; +u8 mux_width; +u8 gate_shift; +u8 upd_shift; + +spinlock_t *lock; +}; + +struct mtk_mux { +int id; +const char *name; +const char *const *parent_names; +unsigned int flags; + +u32 mux_ofs; +u32 set_ofs; +u32 clr_ofs; +u32 upd_ofs; + +u8 mux_shift; +u8 mux_width; +u8 gate_shift; +u8 upd_shift; + +const struct clk_ops *ops; + +signed char num_parents; +}; + +extern const struct clk_ops mtk_mux_ops; +extern const struct clk_ops mtk_mux_clr_set_upd_ops; +extern const struct clk_ops mtk_mux_gate_ops; +extern const struct clk_ops mtk_mux_gate_clr_set_upd_ops; + +#define GATE_CLR_SET_UPD_FLAGS (_id, _name, _parents, _mux_ofs, \ + _mux_set_ofs, _mux_clr_ofs, _shift, _width, \ + _gate, _upd_ofs, _upd, _flags, _ops) { \ + .id = _id, \ + .name = _name, \ + .mux_ofs = _mux_ofs, \ + .set_ofs = _mux_set_ofs, \ + .clr_ofs = _mux_clr_ofs, \ + .upd_ofs = _upd_ofs, \ + .mux_shift = _shift, \ + .mux_width = _width, \ + .gate_shift = _gate, \ + .upd_shift = _upd, \ + .parent_names = _parents, \ + .num_parents = ARRAY_SIZE(_parents), \ + .flags = _flags, \ + .ops = &_ops, \ + } + +#define MUX_GATE_CLR_SET_UPD_FLAGS (_id, _name, _parents, _mux_ofs, \ + _mux_set_ofs, _mux_clr_ofs, _shift, _width, \ + _gate, _upd_ofs, _upd, _flags) \ + GATE_CLR_SET_UPD_FLAGS(_id, _name, _parents, _mux_ofs, \ + _mux_set_ofs, _mux_clr_ofs, _shift, _width, \ + _gate, _upd_ofs, _upd, _flags, \ + mtk_mux_gate_clr_set_upd_ops) + +#define MUX_GATE_CLR_SET_UPD (_id, _name, _parents, _mux_ofs, \ + _mux_set_ofs, _mux_clr_ofs, _shift, _width, \ + _gate, _upd_ofs, _upd) \ + MUX_GATE_CLR_SET_UPD_FLAGS(_id, _name, _parents, \ + _mux_ofs, _mux_set_ofs, _mux_clr_ofs, _shift, \ + _width, _gate, _upd_ofs, _upd, \ + CLK_SET_RATE_PARENT) + +struct clk *mtk_clk_register_mux (const struct mtk_mux *mux, +struct regmap *regmap, +spinlock_t *lock); + +int mtk_clk_register_muxes (const struct mtk_mux *muxes, +int num,struct device_node *node, +spinlock_t *lock, +struct clk_onecell_data *clk_data); + +#endif /* __DRV_CLK_MUX_H */ --2.18.0
Re: [PATCH v2 01/11] clk: mediatek: add new clkmux register API
In reply to Weiyi LuQuoted 24 lines
From: Owen Chen <[email protected]>
On both MT8183 & MT6765, there add "set/clr" register for each clkmux setting, and one update register to trigger value change. It is designed to prevent read-modify-write racing issue. The sw design need to add a new API to handle this hw change with a new mtk_clk_mux/mtk_mux struct in new file "
clk-mux.c", "clk-mux.h".Signed-off-by Owen Chen <[email protected]>Signed-off-by Weiyi Lu <[email protected]>--- drivers/clk/mediatek/Makefile | 2 +- drivers/clk/mediatek/clk-mux.c | 240 +++++++++++++++++++++++++++++++++ drivers/clk/mediatek/clk-mux.h | 101 ++++++++++++++ 3 files changed, 342 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/mediatek/clk-mux.c create mode 100644 drivers/clk/mediatek/clk-mux.hdrivers/clk/mediatek/Makefile +0
-0
drivers/clk/mediatek/Makefile line 2
Quoted 3 lines
drivers/clk/mediatek/Makefile +1
-1@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_COMMON_CLK_MEDIATEK) += clk-mtk.o clk-pll.o clk-gate.o clk-apmixed.o clk-cpumux.o reset.o +obj-$(CONFIG_COMMON_CLK_MEDIATEK) += clk-mtk.o clk-pll.o clk-gate.o clk-apmixed.o clk-cpumux.o reset.o clk-mux.o
add a proper words wrap?
Quoted 25 lines
drivers/clk/mediatek/Makefile +0
-0obj-$(CONFIG_COMMON_CLK_MT6797) += clk-mt6797.o obj-$(CONFIG_COMMON_CLK_MT6797_IMGSYS) += clk-mt6797-img.o obj-$(CONFIG_COMMON_CLK_MT6797_MMSYS) += clk-mt6797-mm.odrivers/clk/mediatek/clk-mux.c new file +16
-0@@ -0,0 +1,240 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Owen Chen <[email protected]> +*/ + +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/slab.h> +#include <linux/mfd/syscon.h> + +#include "clk-mtk.h" +#include "clk-mux.h" + +static inline struct mtk_clk_mux + *to_mtk_clk_mux (struct clk_hw *hw)
drivers/clk/mediatek/clk-mux.c line 26
Quoted 10 lines
drivers/clk/mediatek/clk-mux.c new file +10
-0+{ + return container_of(hw, struct mtk_clk_mux, hw); +} + +static int mtk_clk_mux_enable (struct clk_hw *hw) +{ +struct mtk_clk_mux *mux =to_mtk_clk_mux (hw); +u32 mask =BIT (mux->gate_shift); + +return regmap_update_bits (mux->regmap, mux->mux_ofs, mask,0 );
prefer to
return regmap_update_bits(mux->regmap, mux->mux_ofs, mask, ~mask); just to align with mtk_clk_mux_disable
Quoted 8 lines
drivers/clk/mediatek/clk-mux.c new file +8
-0+} + +static void mtk_clk_mux_disable (struct clk_hw *hw) +{ +struct mtk_clk_mux *mux =to_mtk_clk_mux (hw); +u32 mask =BIT (mux->gate_shift); + +regmap_update_bits (mux->regmap, mux->mux_ofs, mask, mask);
drivers/clk/mediatek/clk-mux.c line 44
Quoted 10 lines
drivers/clk/mediatek/clk-mux.c new file +10
-0+} + +static int mtk_clk_mux_enable_setclr (struct clk_hw *hw) +{ +struct mtk_clk_mux *mux =to_mtk_clk_mux (hw); +u32 val; + + val =BIT (mux->gate_shift); + +return regmap_write (mux->regmap, mux->mux_clr_ofs, val);
prefer to
return regmap_write(mux->regmap, mux->mux_clr_ofs, BIT(mux->gate_shift)); and drop u32 val declaration
drivers/clk/mediatek/clk-mux.c line 53
Quoted 9 lines
drivers/clk/mediatek/clk-mux.c new file +9
-0+} + +static void mtk_clk_mux_disable_setclr (struct clk_hw *hw) +{ +struct mtk_clk_mux *mux =to_mtk_clk_mux (hw); +u32 val; + + val =BIT (mux->gate_shift); +regmap_write (mux->regmap, mux->mux_set_ofs, val);
perfer toregmap_write(mux->regmap, mux->mux_set_ofs, BIT(mux->gate_shift)); and drop u32 val
Quoted 12 lines
drivers/clk/mediatek/clk-mux.c new file +12
-0+} + +static int mtk_clk_mux_is_enabled (struct clk_hw *hw) +{ +struct mtk_clk_mux *mux =to_mtk_clk_mux (hw); +u32 val; + +regmap_read (mux->regmap, mux->mux_ofs, &val); + +return (val &BIT (mux->gate_shift)) ==0 ; +} +
drivers/clk/mediatek/clk-mux.c line 75
Quoted 10 lines
drivers/clk/mediatek/clk-mux.c new file +10
-0+static u8 mtk_clk_mux_get_parent (struct clk_hw *hw) +{ +struct mtk_clk_mux *mux =to_mtk_clk_mux (hw); +u32 mask =GENMASK (mux->mux_width -1 ,0 ); +u32 val; + +regmap_read (mux->regmap, mux->mux_ofs, &val); + val = (val >> mux->mux_shift) & mask; + +return val;
an u32 to u8 happens here
drivers/clk/mediatek/clk-mux.c line 83
Quoted 8 lines
drivers/clk/mediatek/clk-mux.c new file +8
-0+} + +static int mtk_clk_mux_set_parent_lock (struct clk_hw *hw,u8 index) +{ +struct mtk_clk_mux *mux =to_mtk_clk_mux (hw); +u32 mask =GENMASK (mux->mux_width -1 ,0 ); +u32 val; +unsigned long flags =0 ;
zero init is unnecessary
drivers/clk/mediatek/clk-mux.c line 96
Quoted 13 lines
drivers/clk/mediatek/clk-mux.c new file +13
-0+ +if (mux->lock) +spin_lock_irqsave (mux->lock, flags); +else +__acquire (mux->lock); + +regmap_read (mux->regmap, mux->mux_ofs, &val); + val = (val & mask) >> mux->mux_shift; + +if (val != index) { + val = index << mux->mux_shift; +regmap_update_bits (mux->regmap, mux->mux_ofs, mask, val); + }
regmap_update_bits(mux->regmap, mux->mux_ofs, mask, index << mux->mux_shift); appears to be sufficient. regmap_update_bits would check whether the register write is necessary.
Quoted 5 lines
drivers/clk/mediatek/clk-mux.c new file +5
-0+ +if (mux->lock) +spin_unlock_irqrestore (mux->lock, flags); +else +__release (mux->lock);
drivers/clk/mediatek/clk-mux.c line 111
Quoted 10 lines
drivers/clk/mediatek/clk-mux.c new file +10
-0+ +return 0 ; +} + +static int mtk_clk_mux_set_parent_setclr_lock (struct clk_hw *hw,u8 index) +{ +struct mtk_clk_mux *mux =to_mtk_clk_mux (hw); +u32 mask =GENMASK (mux->mux_width -1 ,0 ); +u32 val, orig; +unsigned long flags =0 ;
zero init is unnecessary
Quoted 6 lines
drivers/clk/mediatek/clk-mux.c new file +6
-0+ +if (mux->lock) +spin_lock_irqsave (mux->lock, flags); +else +__acquire (mux->lock); +
drivers/clk/mediatek/clk-mux.c line 127
Quoted 10 lines
drivers/clk/mediatek/clk-mux.c new file +10
-0+regmap_read (mux->regmap, mux->mux_ofs, &orig); + val = (orig & ~(mask << mux->mux_shift)) | (index << mux->mux_shift); + +if (val != orig) { +regmap_write (mux->regmap, mux->mux_clr_ofs, + mask << mux->mux_shift); +regmap_write (mux->regmap, mux->mux_set_ofs, + index << mux->mux_shift); + +if (mux->upd_shift >=0 )
upd_shift is an u8
Quoted 119 lines
drivers/clk/mediatek/clk-mux.c new file +113
-0+regmap_write (mux->regmap, mux->upd_ofs, +BIT (mux->upd_shift)); + } + +if (mux->lock) +spin_unlock_irqrestore (mux->lock, flags); +else +__release (mux->lock); + +return 0 ; +} + +const struct clk_ops mtk_mux_ops = { + .get_parent = mtk_clk_mux_get_parent, + .set_parent = mtk_clk_mux_set_parent_lock, +}; + +const struct clk_ops mtk_mux_clr_set_upd_ops = { + .get_parent = mtk_clk_mux_get_parent, + .set_parent = mtk_clk_mux_set_parent_setclr_lock, +}; + +const struct clk_ops mtk_mux_gate_ops = { + .enable = mtk_clk_mux_enable, + .disable = mtk_clk_mux_disable, + .is_enabled = mtk_clk_mux_is_enabled, + .get_parent = mtk_clk_mux_get_parent, + .set_parent = mtk_clk_mux_set_parent_lock, +}; + +const struct clk_ops mtk_mux_gate_clr_set_upd_ops = { + .enable = mtk_clk_mux_enable_setclr, + .disable = mtk_clk_mux_disable_setclr, + .is_enabled = mtk_clk_mux_is_enabled, + .get_parent = mtk_clk_mux_get_parent, + .set_parent = mtk_clk_mux_set_parent_setclr_lock, +}; + +struct clk *mtk_clk_register_mux (const struct mtk_mux *mux, +struct regmap *regmap, +spinlock_t *lock) +{ +struct mtk_clk_mux *mtk_mux; +struct clk_init_data init; +struct clk *clk; + + mtk_mux =kzalloc (sizeof (*mtk_mux),GFP_KERNEL ); +if (!mtk_mux) +return ERR_PTR (-ENOMEM ); + + init.name = mux->name; + init.flags = mux->flags |CLK_SET_RATE_PARENT ; + init.parent_names = mux->parent_names; + init.num_parents = mux->num_parents; + init.ops = mux->ops; + + mtk_mux->regmap = regmap; + mtk_mux->name = mux->name; + mtk_mux->mux_ofs = mux->mux_ofs; + mtk_mux->mux_set_ofs = mux->set_ofs; + mtk_mux->mux_clr_ofs = mux->clr_ofs; + mtk_mux->upd_ofs = mux->upd_ofs; + mtk_mux->mux_shift = mux->mux_shift; + mtk_mux->mux_width = mux->mux_width; + mtk_mux->gate_shift = mux->gate_shift; + mtk_mux->upd_shift = mux->upd_shift; + + mtk_mux->lock = lock; + mtk_mux->hw.init = &init; + + clk =clk_register (NULL , &mtk_mux->hw); +if (IS_ERR (clk)) { +kfree (mtk_mux); +return clk; + } + +return clk; +} + +int mtk_clk_register_muxes (const struct mtk_mux *muxes, +int num,struct device_node *node, +spinlock_t *lock, +struct clk_onecell_data *clk_data) +{ +struct regmap *regmap; +struct clk *clk; +int i; + + regmap =syscon_node_to_regmap (node); +if (IS_ERR (regmap)) { +pr_err ("Cannot find regmap for %pOF: %ld\n" , node, +PTR_ERR (regmap)); +return PTR_ERR (regmap); + } + +for (i =0 ; i < num; i++) { +const struct mtk_mux *mux = &muxes[i]; + +if (IS_ERR_OR_NULL (clk_data->clks[mux->id])) { + clk =mtk_clk_register_mux (mux, regmap, lock); + +if (IS_ERR (clk)) { +pr_err ("Failed to register clk %s: %ld\n" , + mux->name,PTR_ERR (clk)); +continue ; + } + + clk_data->clks[mux->id] = clk; + } + } + +return 0 ; +}drivers/clk/mediatek/clk-mux.h new file +0
-0
drivers/clk/mediatek/clk-mux.h line 8
Quoted 8 lines
drivers/clk/mediatek/clk-mux.h new file +8
-0@@ -0,0 +1,101 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Owen Chen <[email protected]> +*/ + +#ifndef __DRV_CLK_MUX_H +#define __DRV_CLK_MUX_H
how about adding a mtk specific prefix?
Quoted 101 lines
drivers/clk/mediatek/clk-mux.h new file +93
-1+ +#include <linux/clk-provider.h> + +struct mtk_clk_mux { +struct clk_hw hw; +struct regmap *regmap; + +const char *name; + +u32 mux_set_ofs; +u32 mux_clr_ofs; +u32 mux_ofs; +u32 upd_ofs; + +u8 mux_shift; +u8 mux_width; +u8 gate_shift; +u8 upd_shift; + +spinlock_t *lock; +}; + +struct mtk_mux { +int id; +const char *name; +const char *const *parent_names; +unsigned int flags; + +u32 mux_ofs; +u32 set_ofs; +u32 clr_ofs; +u32 upd_ofs; + +u8 mux_shift; +u8 mux_width; +u8 gate_shift; +u8 upd_shift; + +const struct clk_ops *ops; + +signed char num_parents; +}; + +extern const struct clk_ops mtk_mux_ops; +extern const struct clk_ops mtk_mux_clr_set_upd_ops; +extern const struct clk_ops mtk_mux_gate_ops; +extern const struct clk_ops mtk_mux_gate_clr_set_upd_ops; + +#define GATE_CLR_SET_UPD_FLAGS (_id, _name, _parents, _mux_ofs, \ + _mux_set_ofs, _mux_clr_ofs, _shift, _width, \ + _gate, _upd_ofs, _upd, _flags, _ops) { \ + .id = _id, \ + .name = _name, \ + .mux_ofs = _mux_ofs, \ + .set_ofs = _mux_set_ofs, \ + .clr_ofs = _mux_clr_ofs, \ + .upd_ofs = _upd_ofs, \ + .mux_shift = _shift, \ + .mux_width = _width, \ + .gate_shift = _gate, \ + .upd_shift = _upd, \ + .parent_names = _parents, \ + .num_parents = ARRAY_SIZE(_parents), \ + .flags = _flags, \ + .ops = &_ops, \ + } + +#define MUX_GATE_CLR_SET_UPD_FLAGS (_id, _name, _parents, _mux_ofs, \ + _mux_set_ofs, _mux_clr_ofs, _shift, _width, \ + _gate, _upd_ofs, _upd, _flags) \ + GATE_CLR_SET_UPD_FLAGS(_id, _name, _parents, _mux_ofs, \ + _mux_set_ofs, _mux_clr_ofs, _shift, _width, \ + _gate, _upd_ofs, _upd, _flags, \ + mtk_mux_gate_clr_set_upd_ops) + +#define MUX_GATE_CLR_SET_UPD (_id, _name, _parents, _mux_ofs, \ + _mux_set_ofs, _mux_clr_ofs, _shift, _width, \ + _gate, _upd_ofs, _upd) \ + MUX_GATE_CLR_SET_UPD_FLAGS(_id, _name, _parents, \ + _mux_ofs, _mux_set_ofs, _mux_clr_ofs, _shift, \ + _width, _gate, _upd_ofs, _upd, \ + CLK_SET_RATE_PARENT) + +struct clk *mtk_clk_register_mux (const struct mtk_mux *mux, +struct regmap *regmap, +spinlock_t *lock); + +int mtk_clk_register_muxes (const struct mtk_mux *muxes, +int num,struct device_node *node, +spinlock_t *lock, +struct clk_onecell_data *clk_data); + +#endif /* __DRV_CLK_MUX_H */ --2.18.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v2 2/11 clk: mediatek: add new member to mtk_pll_data
In reply to Weiyi LuFrom: Owen Chen <[email protected]>
1. pcwibits: The integer bits of pcw for plls is extend to 8 bits, add a variable to indicate this change and backward-compatible.
2. fmin: The pll freqency lower-bound is vary from 1GMhz to 1.5Ghz, add a variable to indicate platform-dependent.
--- drivers/clk/mediatek/clk-mtk.h | 2 ++ drivers/clk/mediatek/clk-pll.c | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)
drivers/clk/mediatek/clk-mtk.h +2 -0
@@ -214,8 +214,10 @@ struct mtk_pll_data {unsigned int flags;const struct clk_ops *ops;u32 rst_bar_mask; +unsigned long fmin;unsigned long fmax;int pcwbits; +int pcwibits;uint32_t pcw_reg;int pcw_shift;const struct mtk_pll_div_table *div_table;
drivers/clk/mediatek/clk-pll.c +9 -3
@@ -32,6 +32,8 @@#define AUDPLL_TUNER_EN BIT(31)#define POSTDIV_MASK 0x7 + +/* default 7 bits integer, can be overridden with pcwibits. */ #define INTEGER_BITS 7/*
@@ -69,11 +71,13 @@ static unsigned long __mtk_pll_recalc_rate(struct mtk_clk_pll *pll, u32 fin, {int pcwbits = pll->data->pcwbits;int pcwfbits; +int ibits;u64 vco;u8 c =0 ;/* The fractional part of the PLL divider. */ - pcwfbits = pcwbits >INTEGER_BITS ? pcwbits -INTEGER_BITS :0 ; + ibits = pll->data->pcwibits ? pll->data->pcwibits :INTEGER_BITS ; + pcwfbits = pcwbits > ibits ? pcwbits - ibits :0 ; vco = (u64 )fin * pcw;
@@ -138,9 +142,10 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,static void mtk_pll_calc_values (struct mtk_clk_pll *pll,u32 *pcw,u32 *postdiv,u32 freq,u32 fin) { -unsigned long fmin =1000 *MHZ ; +unsigned long fmin = pll->data->fmin ? pll->data->fmin : (1000 *MHZ );const struct mtk_pll_div_table *div_table = pll->data->div_table;u64 _pcw; +int ibits;u32 val;if (freq > pll->data->fmax)
@@ -164,7 +169,8 @@ static void mtk_pll_calc_values(struct mtk_clk_pll *pll, u32 *pcw, u32 *postdiv, }/* _pcw = freq * postdiv / fin * 2^pcwfbits */ - _pcw = ((u64 )freq << val) << (pll->data->pcwbits -INTEGER_BITS ); + ibits = pll->data->pcwibits ? pll->data->pcwibits :INTEGER_BITS ; + _pcw = ((u64 )freq << val) << (pll->data->pcwbits - ibits);do_div (_pcw, fin); *pcw = (u32 )_pcw;
Signature · 1 line
2.18.0
Re: [PATCH v2 02/11] clk: mediatek: add new member to mtk_pll_data
Quoted 8 lines
From: Owen Chen <[email protected]>
1. pcwibits: The integer bits of pcw for plls is extend to 8 bits, add a variable to indicate this change and backward-compatible.
2. fmin: The pll freqency lower-bound is vary from 1GMhz to 1.5Ghz, add a variable to indicate platform-dependent.
The patch title seems much general. It should be more specific to reflect the content,
such as add configurable parameters pcwibits and fmin to mtk_pll.
Apart from that: Acked-by: Sean Wang <[email protected]>
Quoted 81 lines
Signed-off-by Owen Chen <[email protected]>Signed-off-by Weiyi Lu <[email protected]>--- drivers/clk/mediatek/clk-mtk.h | 2 ++ drivers/clk/mediatek/clk-pll.c | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)drivers/clk/mediatek/clk-mtk.h +2
-0@@ -214,8 +214,10 @@ struct mtk_pll_data {unsigned int flags;const struct clk_ops *ops;u32 rst_bar_mask; +unsigned long fmin;unsigned long fmax;int pcwbits; +int pcwibits;uint32_t pcw_reg;int pcw_shift;const struct mtk_pll_div_table *div_table;drivers/clk/mediatek/clk-pll.c +9
-4@@ -32,6 +32,8 @@#define AUDPLL_TUNER_EN BIT(31)#define POSTDIV_MASK 0x7 + +/* default 7 bits integer, can be overridden with pcwibits. */ #define INTEGER_BITS 7/* @@ -69,11 +71,13 @@ static unsigned long __mtk_pll_recalc_rate(struct mtk_clk_pll *pll, u32 fin, {int pcwbits = pll->data->pcwbits;int pcwfbits; +int ibits;u64 vco;u8 c =0 ;/* The fractional part of the PLL divider. */ - pcwfbits = pcwbits >INTEGER_BITS ? pcwbits -INTEGER_BITS :0 ; + ibits = pll->data->pcwibits ? pll->data->pcwibits :INTEGER_BITS ; + pcwfbits = pcwbits > ibits ? pcwbits - ibits :0 ; vco = (u64 )fin * pcw;@@ -138,9 +142,10 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,static void mtk_pll_calc_values (struct mtk_clk_pll *pll,u32 *pcw,u32 *postdiv,u32 freq,u32 fin) { -unsigned long fmin =1000 *MHZ ; +unsigned long fmin = pll->data->fmin ? pll->data->fmin : (1000 *MHZ );const struct mtk_pll_div_table *div_table = pll->data->div_table;u64 _pcw; +int ibits;u32 val;if (freq > pll->data->fmax)@@ -164,7 +169,8 @@ static void mtk_pll_calc_values(struct mtk_clk_pll *pll, u32 *pcw, u32 *postdiv, }/* _pcw = freq * postdiv / fin * 2^pcwfbits */ - _pcw = ((u64 )freq << val) << (pll->data->pcwbits -INTEGER_BITS ); + ibits = pll->data->pcwibits ? pll->data->pcwibits :INTEGER_BITS ; + _pcw = ((u64 )freq << val) << (pll->data->pcwbits - ibits);do_div (_pcw, fin); *pcw = (u32 )_pcw; --2.18.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v2 3/11 clk: mediatek: Disable tuner_en before change PLL rate
In reply to Weiyi LuFrom: Owen Chen <[email protected]>
PLLs with tuner_en bit, such as APLL1, need to disable tuner_en before apply new frequency settings, or the new frequency settings (pcw) will not be applied.
The tuner_en bit will be disabled during changing PLL rate and be restored after new settings applied.
--- drivers/clk/mediatek/clk-pll.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)
drivers/clk/mediatek/clk-pll.c +31 -2
@@ -27,7 +27,7 @@#define CON0_BASE_EN BIT(0)#define CON0_PWR_ON BIT(0)#define CON0_ISO_EN BIT(1) -#define CON0_PCW_CHG BIT(31) +#define CON1_PCW_CHG BIT(31)#define AUDPLL_TUNER_EN BIT(31)
@@ -97,9 +97,31 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, {u32 con1, val;int pll_en; +u32 tuner_en =0 ; +u32 tuner_en_mask; +void __iomem *tuner_en_addr =NULL ; pll_en =readl (pll->base_addr +REG_CON0 ) &CON0_BASE_EN ; +/* disable tuner */ +if (pll->tuner_en_addr) { + tuner_en_addr = pll->tuner_en_addr; + tuner_en_mask =BIT (pll->data->tuner_en_bit); + }else if (pll->tuner_addr) { + tuner_en_addr = pll->tuner_addr; + tuner_en_mask =AUDPLL_TUNER_EN ; + } + +if (tuner_en_addr) { + val =readl (tuner_en_addr); + tuner_en = val & tuner_en_mask; + +if (tuner_en) { + val &= ~tuner_en_mask; +writel (val, tuner_en_addr); + } + } +/* set postdiv */ val =readl (pll->pd_addr); val &= ~(POSTDIV_MASK << pll->data->pd_shift);
@@ -120,12 +142,19 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, con1 =readl (pll->base_addr +REG_CON1 );if (pll_en) - con1 |=CON0_PCW_CHG ; + con1 |=CON1_PCW_CHG ;writel (con1, pll->base_addr +REG_CON1 );if (pll->tuner_addr)writel (con1 +1 , pll->tuner_addr); +/* restore tuner_en */ +if (tuner_en_addr && tuner_en) { + val =readl (tuner_en_addr); + val |= tuner_en_mask; +writel (val, tuner_en_addr); + } +if (pll_en)udelay (20 ); }
Signature · 1 line
2.18.0
Re: [PATCH v2 03/11] clk: mediatek: Disable tuner_en before change PLL rate
Weiyi Lu <[email protected]> ? 2018?11?26? ?? ??7:45???
Quoted 8 lines
From: Owen Chen <[email protected]>
PLLs with
tuner_enbit, such as APLL1, need to disabletuner_enbefore apply new frequency settings, or the new frequency settings (pcw) will not be applied.
Thetuner_enbit will be disabled during changing PLL rate and be restored after new settings applied.
It looks like a bug fix. If so, you should add a fixes tag and even cc stable tree
Quoted 11 lines
Signed-off-by Owen Chen <[email protected]>--- drivers/clk/mediatek/clk-pll.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)drivers/clk/mediatek/clk-pll.c +0
-0
drivers/clk/mediatek/clk-pll.c line 30
Quoted 5 lines
drivers/clk/mediatek/clk-pll.c +1
-1@@ -27,7 +27,7 @@#define CON0_BASE_EN BIT(0)#define CON0_PWR_ON BIT(0)#define CON0_ISO_EN BIT(1) -#define CON0_PCW_CHG BIT(31) +#define CON1_PCW_CHG BIT(31)
it seems like an unnecessary change
Quoted 4 lines
drivers/clk/mediatek/clk-pll.c +0
-0#define AUDPLL_TUNER_EN BIT(31)
drivers/clk/mediatek/clk-pll.c static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, · line 106
Quoted 10 lines
drivers/clk/mediatek/clk-pll.c +4
-0@@ -97,9 +97,31 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, {u32 con1, val;int pll_en; +u32 tuner_en =0 ; +u32 tuner_en_mask; +void __iomem *tuner_en_addr =NULL ; pll_en =readl (pll->base_addr +REG_CON0 ) &CON0_BASE_EN ; +/* disable tuner */
similar code pieces are ready on mtk_pll_[un]prepare. maybe we can add common tuner operations for them to reuse.
Quoted 24 lines
drivers/clk/mediatek/clk-pll.c +18
-0+if (pll->tuner_en_addr) { + tuner_en_addr = pll->tuner_en_addr; + tuner_en_mask =BIT (pll->data->tuner_en_bit); + }else if (pll->tuner_addr) { + tuner_en_addr = pll->tuner_addr; + tuner_en_mask =AUDPLL_TUNER_EN ; + } + +if (tuner_en_addr) { + val =readl (tuner_en_addr); + tuner_en = val & tuner_en_mask; + +if (tuner_en) { + val &= ~tuner_en_mask; +writel (val, tuner_en_addr); + } + } +/* set postdiv */ val =readl (pll->pd_addr); val &= ~(POSTDIV_MASK << pll->data->pd_shift);@@ -120,12 +142,19 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, con1 =readl (pll->base_addr +REG_CON1 );
drivers/clk/mediatek/clk-pll.c static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, · line 152
Quoted 10 lines
drivers/clk/mediatek/clk-pll.c +3
-1if (pll_en) - con1 |=CON0_PCW_CHG ; + con1 |=CON1_PCW_CHG ;writel (con1, pll->base_addr +REG_CON1 );if (pll->tuner_addr)writel (con1 +1 , pll->tuner_addr); +/* restore tuner_en */ +if (tuner_en_addr && tuner_en) {
if (tuner_en) is sufficient
Quoted 16 lines
drivers/clk/mediatek/clk-pll.c +5
-1+ val =readl (tuner_en_addr); + val |= tuner_en_mask; +writel (val, tuner_en_addr); + } +if (pll_en)udelay (20 ); } --2.18.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [PATCH v2 03/11] clk: mediatek: Disable tuner_en before change PLL rate
Quoted 20 lines · Sean Wang
Weiyi Lu <[email protected]> ? 2018?11?26? ?? ??7:45???
Quoted 8 lines
From: Owen Chen <[email protected]>
PLLs with
tuner_enbit, such as APLL1, need to disabletuner_enbefore apply new frequency settings, or the new frequency settings (pcw) will not be applied.
Thetuner_enbit will be disabled during changing PLL rate and be restored after new settings applied.It looks like a bug fix. If so, you should add a fixes tag and even cc stable tree
Quoted 6 lines
Signed-off-by Owen Chen <[email protected]>--- drivers/clk/mediatek/clk-pll.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)
Quoted 12 lines
drivers/clk/mediatek/clk-pll.c line 30
Quoted 10 lines
drivers/clk/mediatek/clk-pll.c +1
-1@@ -27,7 +27,7 @@#define CON0_BASE_EN BIT(0)#define CON0_PWR_ON BIT(0)#define CON0_ISO_EN BIT(1) -#define CON0_PCW_CHG BIT(31) +#define CON1_PCW_CHG BIT(31)it seems like an unnecessary change
Below, you have:
con1 |= CON1_PCW_CHG;
Presumably PCW_CHG is on BIT(31) of CON1(?), so I think this is a good change. Maybe this needs to be a separate patch, though?
Quoted 71 lines
Quoted 4 lines
drivers/clk/mediatek/clk-pll.c +0
-0#define AUDPLL_TUNER_EN BIT(31)drivers/clk/mediatek/clk-pll.c static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, · line 106
Quoted 10 lines
drivers/clk/mediatek/clk-pll.c +4
-0@@ -97,9 +97,31 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, {u32 con1, val;int pll_en; +u32 tuner_en =0 ; +u32 tuner_en_mask; +void __iomem *tuner_en_addr =NULL ; pll_en =readl (pll->base_addr +REG_CON0 ) &CON0_BASE_EN ; +/* disable tuner */ similar code pieces are ready on mtk_pll_[un]prepare. maybe we can add common tuner operations for them to reuse.
Quoted 24 lines
drivers/clk/mediatek/clk-pll.c +18
-0+if (pll->tuner_en_addr) { + tuner_en_addr = pll->tuner_en_addr; + tuner_en_mask =BIT (pll->data->tuner_en_bit); + }else if (pll->tuner_addr) { + tuner_en_addr = pll->tuner_addr; + tuner_en_mask =AUDPLL_TUNER_EN ; + } + +if (tuner_en_addr) { + val =readl (tuner_en_addr); + tuner_en = val & tuner_en_mask; + +if (tuner_en) { + val &= ~tuner_en_mask; +writel (val, tuner_en_addr); + } + } +/* set postdiv */ val =readl (pll->pd_addr); val &= ~(POSTDIV_MASK << pll->data->pd_shift);@@ -120,12 +142,19 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, con1 =readl (pll->base_addr +REG_CON1 );drivers/clk/mediatek/clk-pll.c static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, · line 152
Quoted 10 lines
drivers/clk/mediatek/clk-pll.c +3
-1if (pll_en) - con1 |=CON0_PCW_CHG ; + con1 |=CON1_PCW_CHG ;writel (con1, pll->base_addr +REG_CON1 );if (pll->tuner_addr)writel (con1 +1 , pll->tuner_addr); +/* restore tuner_en */ +if (tuner_en_addr && tuner_en) {if (
tuner_en) is sufficientQuoted 16 lines
drivers/clk/mediatek/clk-pll.c +5
-1+ val =readl (tuner_en_addr); + val |= tuner_en_mask; +writel (val, tuner_en_addr); + } +if (pll_en)udelay (20 ); } --2.18.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [PATCH v2 03/11] clk: mediatek: Disable tuner_en before change PLL rate
Quoted 35 lines · Sean Wang
Quoted 20 lines
Weiyi Lu <[email protected]> ? 2018?11?26? ?? ??7:45???
Quoted 8 lines
From: Owen Chen <[email protected]>
PLLs with
tuner_enbit, such as APLL1, need to disabletuner_enbefore apply new frequency settings, or the new frequency settings (pcw) will not be applied.
Thetuner_enbit will be disabled during changing PLL rate and be restored after new settings applied.It looks like a bug fix. If so, you should add a fixes tag and even cc stable tree
Quoted 6 lines
Signed-off-by Owen Chen <[email protected]>--- drivers/clk/mediatek/clk-pll.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)Quoted 12 lines
drivers/clk/mediatek/clk-pll.c line 30
Quoted 10 lines
drivers/clk/mediatek/clk-pll.c +1
-1@@ -27,7 +27,7 @@#define CON0_BASE_EN BIT(0)#define CON0_PWR_ON BIT(0)#define CON0_ISO_EN BIT(1) -#define CON0_PCW_CHG BIT(31) +#define CON1_PCW_CHG BIT(31)it seems like an unnecessary change
Quoted 6 lines
Below, you have:
con1 |=CON1_PCW_CHG;Presumably
PCW_CHGis on BIT(31) of CON1(?), so I think this is a good change. Maybe this needs to be a separate patch, though?
Sure, for me it's not easily understood why the change is necessary from the description. If it's really another fixup, it should be moved to a separate patch or add more explanations about that in the same patch.
Quoted 71 lines
Quoted 71 lines
Quoted 4 lines
drivers/clk/mediatek/clk-pll.c +0
-0#define AUDPLL_TUNER_EN BIT(31)drivers/clk/mediatek/clk-pll.c static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, · line 106
Quoted 10 lines
drivers/clk/mediatek/clk-pll.c +4
-0@@ -97,9 +97,31 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, {u32 con1, val;int pll_en; +u32 tuner_en =0 ; +u32 tuner_en_mask; +void __iomem *tuner_en_addr =NULL ; pll_en =readl (pll->base_addr +REG_CON0 ) &CON0_BASE_EN ; +/* disable tuner */ similar code pieces are ready on mtk_pll_[un]prepare. maybe we can add common tuner operations for them to reuse.
Quoted 24 lines
drivers/clk/mediatek/clk-pll.c +18
-0+if (pll->tuner_en_addr) { + tuner_en_addr = pll->tuner_en_addr; + tuner_en_mask =BIT (pll->data->tuner_en_bit); + }else if (pll->tuner_addr) { + tuner_en_addr = pll->tuner_addr; + tuner_en_mask =AUDPLL_TUNER_EN ; + } + +if (tuner_en_addr) { + val =readl (tuner_en_addr); + tuner_en = val & tuner_en_mask; + +if (tuner_en) { + val &= ~tuner_en_mask; +writel (val, tuner_en_addr); + } + } +/* set postdiv */ val =readl (pll->pd_addr); val &= ~(POSTDIV_MASK << pll->data->pd_shift);@@ -120,12 +142,19 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, con1 =readl (pll->base_addr +REG_CON1 );drivers/clk/mediatek/clk-pll.c static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, · line 152
Quoted 10 lines
drivers/clk/mediatek/clk-pll.c +3
-1if (pll_en) - con1 |=CON0_PCW_CHG ; + con1 |=CON1_PCW_CHG ;writel (con1, pll->base_addr +REG_CON1 );if (pll->tuner_addr)writel (con1 +1 , pll->tuner_addr); +/* restore tuner_en */ +if (tuner_en_addr && tuner_en) {if (
tuner_en) is sufficientQuoted 16 lines
drivers/clk/mediatek/clk-pll.c +5
-1+ val =readl (tuner_en_addr); + val |= tuner_en_mask; +writel (val, tuner_en_addr); + } +if (pll_en)udelay (20 ); } --2.18.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v2 4/11 soc: mediatek: add new flow for mtcmos power.
In reply to Weiyi LuFrom: Owen Chen <[email protected]>
Both MT8183 & MT6765 add more bus protect node than previous project, therefore we add two more register for setup bus protect, which reside at INFRA_CFG & SMI_COMMON.
With the following change
1. bus protect need not only infracfg but smi_common registers involved to setup. Therefore we add a set/clr APIs with more customize arguments.
The second change is that we also add subsys CG control flow before/after the bus protect/sram control, due to bus protect need SMI bus relative CGs enable to feed-back its ack, and some master's sram control need CG enable to on/off its resource sequentially.
With the following change
1. turn on subsys CG before sram pwron and release bus protect.
2. turn off subsys CG after the process of set bus protect/receive ack/disable sram.
The last change is for some power domains like vpu_core on MT8183 whose sram need to do clock and internal isolation while power on/off sram. We add a flag "sram_iso_ctrl" in scp_domain_data to judge if we need to do the extra sram isolation control or not.
--- drivers/soc/mediatek/Makefile | 2 +- drivers/soc/mediatek/mtk-scpsys-ext.c | 99 +++++++ drivers/soc/mediatek/mtk-scpsys.c | 379 +++++++++++++++++++----- include/linux/soc/mediatek/scpsys-ext.h | 39 +++ 4 files changed, 448 insertions(+), 71 deletions(-) create mode 100644 drivers/soc/mediatek/mtk-scpsys-ext.c create mode 100644 include/linux/soc/mediatek/scpsys-ext.h
drivers/soc/mediatek/Makefile +1 -1
@@ -1,3 +1,3 @@ -obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o +obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o mtk-scpsys-ext.o obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.o
drivers/soc/mediatek/mtk-scpsys-ext.c new file +99 -0
99 lines not on this page · raw message
drivers/soc/mediatek/mtk-scpsys.c +309 -70
505 lines not on this page · raw message
include/linux/soc/mediatek/scpsys-ext.h new file +39 -0
@@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __SOC_MEDIATEK_SCPSYS_EXT_H +#define __SOC_MEDIATEK_SCPSYS_EXT_H + +#define MAX_STEPS 4 + +#define BUS_PROT (_type, _set_ofs, _clr_ofs, \ + _en_ofs, _sta_ofs, _mask, _clr_ack_mask) { \ + .type = _type, \ + .set_ofs = _set_ofs, \ + .clr_ofs = _clr_ofs, \ + .en_ofs = _en_ofs, \ + .sta_ofs = _sta_ofs, \ + .mask = _mask, \ + .clr_ack_mask = _clr_ack_mask, \ + } + +enum regmap_type { +IFR_TYPE , +SMI_TYPE , +MAX_REGMAP_TYPE , +}; + +struct bus_prot { +enum regmap_type type; +u32 set_ofs; +u32 clr_ofs; +u32 en_ofs; +u32 sta_ofs; +u32 mask; +u32 clr_ack_mask; +}; + +int mtk_scpsys_ext_set_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common); +int mtk_scpsys_ext_clear_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common); + +#endif /* __SOC_MEDIATEK_SCPSYS_EXT_H */
Signature · 1 line
2.18.0
Re: [PATCH v2 04/11] soc: mediatek: add new flow for mtcmos power.
Quoted 157 lines · Weiyi Lu
From: Owen Chen <[email protected]>
Both MT8183 & MT6765 add more bus protect node than previous project, therefore we add two more register for setup bus protect, which reside at
INFRA_CFG&SMI_COMMON.With the following change
1. bus protect need not only infracfg butsmi_commonregisters involved to setup. Therefore we add a set/clr APIs with more customize arguments.The second change is that we also add subsys CG control flow before/after the bus protect/sram control, due to bus protect need SMI bus relative CGs enable to feed-back its ack, and some master's sram control need CG enable to on/off its resource sequentially.
With the following change
1. turn on subsys CG before sram pwron and release bus protect.
2. turn off subsys CG after the process of set bus protect/receive ack/disable sram.The last change is for some power domains like
vpu_coreon MT8183 whose sram need to do clock and internal isolation while power on/off sram. We add a flag "sram_iso_ctrl" inscp_domain_datato judge if we need to do the extra sram isolation control or not.Signed-off-by Owen Chen <[email protected]>Signed-off-by Mars Cheng <[email protected]>Signed-off-by Weiyi Lu <[email protected]>--- drivers/soc/mediatek/Makefile | 2 +- drivers/soc/mediatek/mtk-scpsys-ext.c | 99 +++++++ drivers/soc/mediatek/mtk-scpsys.c | 379 +++++++++++++++++++----- include/linux/soc/mediatek/scpsys-ext.h | 39 +++ 4 files changed, 448 insertions(+), 71 deletions(-) create mode 100644 drivers/soc/mediatek/mtk-scpsys-ext.c create mode 100644 include/linux/soc/mediatek/scpsys-ext.hdrivers/soc/mediatek/Makefile +1
-1@@ -1,3 +1,3 @@ -obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o +obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o mtk-scpsys-ext.o obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.odrivers/soc/mediatek/mtk-scpsys-ext.c new file +99
-0@@ -0,0 +1,99 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Owen Chen <[email protected]> +*/ +#include <linux/ktime.h> +#include <linux/mfd/syscon.h> +#include <linux/of_device.h> +#include <linux/regmap.h> +#include <linux/soc/mediatek/scpsys-ext.h> + +#define MTK_POLL_DELAY_US 10 +#define MTK_POLL_TIMEOUT (jiffies_to_usecs(HZ)) + +static int set_bus_protection (struct regmap *map,u32 mask,u32 ack_mask, +u32 reg_set,u32 reg_sta,u32 reg_en) +{ +u32 val; + +if (reg_set) +regmap_write (map, reg_set, mask); +else +regmap_update_bits (map, reg_en, mask, mask); + +return regmap_read_poll_timeout (map, reg_sta, + val, (val & ack_mask) == ack_mask, +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); +} + +static int clear_bus_protection (struct regmap *map,u32 mask,u32 ack_mask, +u32 reg_clr,u32 reg_sta,u32 reg_en) +{ +u32 val; + +if (reg_clr) +regmap_write (map, reg_clr, mask); +else +regmap_update_bits (map, reg_en, mask,0 ); + +return regmap_read_poll_timeout (map, reg_sta, + val, !(val & ack_mask), +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); +} + +int mtk_scpsys_ext_set_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common) +{ +int i; + +for (i =0 ; i <MAX_STEPS && bp_table[i].mask; i++) { +struct regmap *map; +int ret; + +if (bp_table[i].type ==IFR_TYPE ) + map = infracfg; +else if (bp_table[i].type ==SMI_TYPE ) + map = smi_common; +else +return -EINVAL ; + + ret =set_bus_protection (map, + bp_table[i].mask, bp_table[i].mask, + bp_table[i].set_ofs, bp_table[i].sta_ofs, + bp_table[i].en_ofs); + +if (ret) +return ret; + } + +return 0 ; +} + +int mtk_scpsys_ext_clear_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common) +{ +int i; + +for (i =MAX_STEPS -1 ; i >=0 ; i--) { +struct regmap *map; +int ret; + +if (bp_table[i].type ==IFR_TYPE ) + map = infracfg; +else if (bp_table[i].type ==SMI_TYPE ) + map = smi_common; +else +return -EINVAL ; + + ret =clear_bus_protection (map, + bp_table[i].mask, bp_table[i].clr_ack_mask, + bp_table[i].clr_ofs, bp_table[i].sta_ofs, + bp_table[i].en_ofs); + +if (ret) +return ret; + } + +return 0 ; +}drivers/soc/mediatek/mtk-scpsys.c +0
-0
drivers/soc/mediatek/mtk-scpsys.c line 1
Quoted 1 line
drivers/soc/mediatek/mtk-scpsys.c +1
-0@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0
If you add the SPDX header, should you remove the licence boilerplate below?
Quoted 29 lines
drivers/soc/mediatek/mtk-scpsys.c +7
-1/* * Copyright (c) 2015 Pengutronix, Sascha Hauer <[email protected]> * @@ -20,6 +21,7 @@#include <linux/pm_domain.h> #include <linux/regulator/consumer.h> #include <linux/soc/mediatek/infracfg.h> +#include <linux/soc/mediatek/scpsys-ext.h> #include <dt-bindings/power/mt2701-power.h> #include <dt-bindings/power/mt2712-power.h> @@ -64,6 +66,8 @@#define PWR_ON_BIT BIT(2)#define PWR_ON_2ND_BIT BIT(3)#define PWR_CLK_DIS_BIT BIT(4) +#define PWR_SRAM_CLKISO_BIT BIT(5) +#define PWR_SRAM_ISOINT_B_BIT BIT(6)#define PWR_STATUS_CONN BIT(1)#define PWR_STATUS_DISP BIT(3)@@ -115,16 +119,38 @@ static const char * const clk_names[] = { };#define MAX_CLKS 3 - +#define MAX_SUBSYS_CLKS 10 + +/** +* struct scp_domain_data - scp domain data for power on/off flow
drivers/soc/mediatek/mtk-scpsys.c static const char * const clk_names[] = { · line 135
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +10
-0+* @name: The domain name. +* @sta_mask: The mask for power on/off status bit. +* @ctl_offs: The offset for main power control register. +* @sram_pdn_bits: The mask for sram power control bits. +* @sram_pdn_ack_bits: The mask for sram power control acked bits. +* @bus_prot_mask: The mask for single step bus protection. +* @clk_id: The basic clock needs to be enabled before enabling certain +* power domains. +* @basic_clk_name: provide the same purpose with field "clk_id" +* by declaring basic clock prefix name rathan than clk_id.
*rather
Quoted 38 lines
drivers/soc/mediatek/mtk-scpsys.c +11
-0+* @subsys_clk_prefix: The prefix name of the clocks need to be enabled +* before releasing bus protection. +* @caps: The flag for active wake-up action. +* @bp_table: The mask table for multiple step bus protection. +*/ struct scp_domain_data {const char *name;u32 sta_mask;int ctl_offs; +bool sram_iso_ctrl;u32 sram_pdn_bits;u32 sram_pdn_ack_bits;u32 bus_prot_mask;enum clk_id clk_id[MAX_CLKS ]; +const char *basic_clk_name[MAX_CLKS ]; +const char *subsys_clk_prefix;u8 caps; +struct bus_prot bp_table[MAX_STEPS ]; };struct scp ;@@ -133,6 +159,7 @@ struct scp_domain {struct generic_pm_domain genpd;struct scp *scp;struct clk *clk[MAX_CLKS ]; +struct clk *subsys_clk[MAX_SUBSYS_CLKS ];const struct scp_domain_data *data;struct regulator *supply; };@@ -148,6 +175,7 @@ struct scp {struct device *dev;void __iomem *base;struct regmap *infracfg; +struct regmap *smi_common;struct scp_ctrl_reg ctrl_reg;bool bus_prot_reg_update; };
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_domain_is_on(struct scp_domain *scpd) · line 219
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys.c +1
-1@@ -188,20 +216,26 @@ static int scpsys_domain_is_on(struct scp_domain *scpd)return -EINVAL ; } -static int scpsys_power_on (struct generic_pm_domain *genpd) +static int scpsys_regulator_onoff (struct scp_domain *scpd,bool on)
This function is so simple that I'm not sure why it was added. Wouldn't be generally simpler to just call regulator_enable/disable(scpd->supply) in the code below? (as was done before this refactoring)
Quoted 6 lines
drivers/soc/mediatek/mtk-scpsys.c +0
-5{ - struct scp_domain *scpd = container_of(genpd, struct scp_domain, genpd); -struct scp *scp = scpd->scp; -void __iomem *ctl_addr = scp->base + scpd->data->ctl_offs; -u32 pdn_ack = scpd->data->sram_pdn_ack_bits; -u32 val;
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_domain_is_on(struct scp_domain *scpd) · line 229
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +9
-1-int ret, tmp; +struct regulator *s = scpd->supply; + +if (!s) +return 0 ; + +return on ?regulator_enable (s) :regulator_disable (s); +} + +static int scpsys_basic_clk_onoff (struct scp_domain *scpd,bool on)
I don't find this pattern particularly nice:
int func_onoff(bool on) {
if (on) enable();
else disable();
}
Especially give that you always call func_onoff with either hard-coded true or false parameter.
I think 2 sets of functions (func_enable and func_disable) is probably better in this case.
Quoted 20 lines
drivers/soc/mediatek/mtk-scpsys.c +7
-4+{ +int ret =0 ;int i; -if (scpd->supply) { - ret =regulator_enable (scpd->supply); -if (ret) -return ret; +if (!on) { +for (i =0 ; i <MAX_CLKS && scpd->clk[i]; i++) +clk_disable_unprepare (scpd->clk[i]); + +return ret; }for (i =0 ; i <MAX_CLKS && scpd->clk[i]; i++) {@@ -210,10 +244,147 @@ static int scpsys_power_on(struct generic_pm_domain *genpd)for (--i; i >=0 ; i--)clk_disable_unprepare (scpd->clk[i]);
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_on(struct generic_pm_domain *genpd) · line 255
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +6
-1- goto err_clk; +break ; } } +return ret; +} + +static int scpsys_sram_onoff (struct scp_domain *scpd,void __iomem *ctl_addr, +bool on)
This one is a little more borderline, but IMHO enable/disable would still be more readable.
Quoted 42 lines
drivers/soc/mediatek/mtk-scpsys.c +42
-0+{ +u32 val, ack; +int tmp; +int ret =0 ; +u32 pdn_ack = scpd->data->sram_pdn_ack_bits; + +if (!on && scpd->data->sram_iso_ctrl) { + val =readl (ctl_addr); + val |=PWR_SRAM_CLKISO_BIT ; +writel (val, ctl_addr); + val &= ~PWR_SRAM_ISOINT_B_BIT ; +writel (val, ctl_addr); +udelay (1 ); + } + + val =readl (ctl_addr); +if (on) { + val &= ~scpd->data->sram_pdn_bits; + ack =0 ; + }else { + val |= scpd->data->sram_pdn_bits; + ack = pdn_ack; + } +writel (val, ctl_addr); + +/* Either wait until SRAM_PDN_ACK all 0 or have a force wait */ +if (on &&MTK_SCPD_CAPS (scpd,MTK_SCPD_FWAIT_SRAM )) { +/* +* Currently, MTK_SCPD_FWAIT_SRAM is necessary only for +* MT7622_POWER_DOMAIN_WB and thus just a trivial setup +* is applied here. +*/ +usleep_range (12000 ,12100 ); + }else +/* Either wait until SRAM_PDN_ACK all 1 or 0 */ + ret =readl_poll_timeout (ctl_addr, tmp, + (tmp & pdn_ack) == ack, +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); + +if (on && scpd->data->sram_iso_ctrl) { + val =readl (ctl_addr); + val |=PWR_SRAM_ISOINT_B_BIT ;
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_on(struct generic_pm_domain *genpd) · line 307
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +10
-0+writel (val, ctl_addr); +udelay (1 ); + val &= ~PWR_SRAM_CLKISO_BIT ; +writel (val, ctl_addr); + } + +return ret; +} + +static int scpsys_subsys_clk_onoff (struct scp_domain *scpd,bool on)
enable/disable for this one.
Quoted 24 lines
drivers/soc/mediatek/mtk-scpsys.c +24
-0+{ +int ret =0 ; +int i; + +if (!on) { +for (i =MAX_SUBSYS_CLKS -1 ; i >=0 ; i--) { +struct clk *clk = scpd->subsys_clk[i]; + +if (clk) +clk_disable_unprepare (clk); + } + +return ret; + } + +for (i =0 ; i <MAX_SUBSYS_CLKS && scpd->subsys_clk[i]; i++) { +struct clk *clk = scpd->subsys_clk[i]; + + ret =clk_prepare_enable (clk); +if (ret) { +for (--i; i >=0 ; i--) { +struct clk *clk = scpd->subsys_clk[i]; + +clk_disable_unprepare (clk);
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_on(struct generic_pm_domain *genpd) · line 341
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +10
-0+ } + +break ; + } + } + +return ret; +} + +static int scpsys_bus_protect_onoff (struct scp_domain *scpd,bool on)
I'd also do an enable/disable pair of function, that could look very simple:
...
{
...
if (scpd->data->bus_prot_mask)
return mtk_infracfg_set_bus_protection(scp->infracfg,
scpd->data->bus_prot_mask,
scp->bus_prot_reg_update);
else
return mtk_scpsys_ext_set_bus_protection(
scpd->data->bp_table,
scp->infracfg,
scp->smi_common); return 0;
}
Quoted 50 lines
drivers/soc/mediatek/mtk-scpsys.c +46
-0+{ +struct scp *scp = scpd->scp; +int ret =0 ; + +if (scpd->data->bus_prot_mask) { +if (on) + ret =mtk_infracfg_set_bus_protection (scp->infracfg, + scpd->data->bus_prot_mask, + scp->bus_prot_reg_update); +else + ret =mtk_infracfg_clear_bus_protection (scp->infracfg, + scpd->data->bus_prot_mask, + scp->bus_prot_reg_update); + }else if (scpd->data->bp_table[0 ].mask) { +if (on) + ret =mtk_scpsys_ext_set_bus_protection ( + scpd->data->bp_table, + scp->infracfg, + scp->smi_common); +else + ret =mtk_scpsys_ext_clear_bus_protection ( + scpd->data->bp_table, + scp->infracfg, + scp->smi_common); + } + +return ret; +} + +static int scpsys_power_on (struct generic_pm_domain *genpd) +{ + struct scp_domain *scpd = container_of(genpd, struct scp_domain, genpd); +struct scp *scp = scpd->scp; +void __iomem *ctl_addr = scp->base + scpd->data->ctl_offs; +u32 val; +int ret, tmp; + + ret =scpsys_regulator_onoff (scpd, true); +if (ret <0 ) +return ret; + + ret =scpsys_basic_clk_onoff (scpd, true); +if (ret) + goto err_clk; + +/* subsys power on */ val =readl (ctl_addr); val |=PWR_ON_BIT ;writel (val, ctl_addr);
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_on(struct generic_pm_domain *genpd) · line 400
Quoted 4 lines
drivers/soc/mediatek/mtk-scpsys.c +1
-0@@ -226,6 +397,7 @@ static int scpsys_power_on(struct generic_pm_domain *genpd)if (ret <0 ) goto err_pwr_ack; +
This extra blank line still needs to be removed.
Quoted 113 lines
drivers/soc/mediatek/mtk-scpsys.c +23
-50val &= ~PWR_CLK_DIS_BIT ;writel (val, ctl_addr);@@ -235,43 +407,26 @@ static int scpsys_power_on(struct generic_pm_domain *genpd) val |=PWR_RST_B_BIT ;writel (val, ctl_addr); - val &= ~scpd->data->sram_pdn_bits; -writel (val, ctl_addr); - -/* Either wait until SRAM_PDN_ACK all 0 or have a force wait */ -if (MTK_SCPD_CAPS (scpd,MTK_SCPD_FWAIT_SRAM )) { -/* -* Currently, MTK_SCPD_FWAIT_SRAM is necessary only for -* MT7622_POWER_DOMAIN_WB and thus just a trivial setup is -* applied here. -*/ -usleep_range (12000 ,12100 ); + ret =scpsys_subsys_clk_onoff (scpd, true); +if (ret <0 ) + goto err_pwr_ack; - }else { - ret =readl_poll_timeout (ctl_addr, tmp, (tmp & pdn_ack) ==0 , -MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); -if (ret <0 ) - goto err_pwr_ack; - } + ret =scpsys_sram_onoff (scpd, ctl_addr, true); +if (ret <0 ) + goto err_sram; -if (scpd->data->bus_prot_mask) { - ret =mtk_infracfg_clear_bus_protection (scp->infracfg, - scpd->data->bus_prot_mask, - scp->bus_prot_reg_update); -if (ret) - goto err_pwr_ack; - } + ret =scpsys_bus_protect_onoff (scpd, false); +if (ret <0 ) + goto err_sram;return 0 ; +err_sram: +scpsys_subsys_clk_onoff (scpd, false); err_pwr_ack: -for (i =MAX_CLKS -1 ; i >=0 ; i--) { -if (scpd->clk[i]) -clk_disable_unprepare (scpd->clk[i]); - } +scpsys_basic_clk_onoff (scpd, false); err_clk: -if (scpd->supply) -regulator_disable (scpd->supply); +scpsys_regulator_onoff (scpd, false);dev_err (scp->dev,"Failed to power on domain %s\n" , genpd->name);@@ -283,29 +438,21 @@ static int scpsys_power_off(struct generic_pm_domain *genpd) struct scp_domain *scpd = container_of(genpd, struct scp_domain, genpd);struct scp *scp = scpd->scp;void __iomem *ctl_addr = scp->base + scpd->data->ctl_offs; -u32 pdn_ack = scpd->data->sram_pdn_ack_bits;u32 val;int ret, tmp; -int i; -if (scpd->data->bus_prot_mask) { - ret =mtk_infracfg_set_bus_protection (scp->infracfg, - scpd->data->bus_prot_mask, - scp->bus_prot_reg_update); -if (ret) - goto out; - } - - val =readl (ctl_addr); - val |= scpd->data->sram_pdn_bits; -writel (val, ctl_addr); + ret =scpsys_bus_protect_onoff (scpd, true); +if (ret <0 ) + goto out; -/* wait until SRAM_PDN_ACK all 1 */ - ret =readl_poll_timeout (ctl_addr, tmp, (tmp & pdn_ack) == pdn_ack, -MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); + ret =scpsys_sram_onoff (scpd, ctl_addr, false);if (ret <0 ) goto out; + ret =scpsys_subsys_clk_onoff (scpd, false); + +/* subsys power off */ + val =readl (ctl_addr); val |=PWR_ISO_BIT ;writel (val, ctl_addr);@@ -327,11 +474,9 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)if (ret <0 ) goto out; -for (i =0 ; i <MAX_CLKS && scpd->clk[i]; i++) -clk_disable_unprepare (scpd->clk[i]); +scpsys_basic_clk_onoff (scpd, false); -if (scpd->supply) -regulator_disable (scpd->supply); +scpsys_regulator_onoff (scpd, false);return 0 ;
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_off(struct generic_pm_domain *genpd) · line 495
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +7
-0@@ -341,6 +486,69 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)return ret; } +static int init_subsys_clks (struct platform_device *pdev, +const char *prefix,struct clk **clk) +{ +struct device_node *node = pdev->dev.of_node; +u32 sub_clk_cnt =0 ; +u32 prefix_len =0 ; +int str_sz =0 ;
These last 2 don't need to be initialized to 0.
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_off(struct generic_pm_domain *genpd) · line 497
Quoted 2 lines
drivers/soc/mediatek/mtk-scpsys.c +2
-0+int clk_idx; +int ret =0 ;
No need to initialize to 0.
Quoted 20 lines
drivers/soc/mediatek/mtk-scpsys.c +20
-0+ +if (!node) { +dev_err (&pdev->dev,"Cannot find scpsys node: %ld\n" , +PTR_ERR (node)); +return PTR_ERR (node); + } + + str_sz =of_property_count_strings (node,"clock-names" ); +if (str_sz <0 ) { +dev_err (&pdev->dev,"Cannot get any subsys strings: %d\n" , + str_sz); +return str_sz; + } + + prefix_len =strlen (prefix); + +for (clk_idx =0 ; clk_idx < str_sz; clk_idx++) { +const char *clk_name; + + ret = of_property_read_string_index(node, "clock-names",
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_off(struct generic_pm_domain *genpd) · line 527
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +10
-0+ clk_idx, &clk_name); +if (ret <0 ) { +dev_err (&pdev->dev, +"Cannot read subsys string[%d]: %d\n" , + clk_idx, ret); +return ret; + } + + if (!strncmp(clk_name, prefix, prefix_len) + && (strchr(clk_name + prefix_len, '-')
Shouldn't this just be clk_name[prefix_len] == '-' ? At least that's how it seems to work right now ("mm" matches "mm-0", "mm-1", etc.)
Also, I'm wondering if this prefix matching approach is best, but I'll let other people comment.
Quoted 46 lines
drivers/soc/mediatek/mtk-scpsys.c +35
-0+ != NULL)) { +if (sub_clk_cnt >=MAX_SUBSYS_CLKS ) { +dev_err (&pdev->dev, +"subsys clk out of range %d\n" , + sub_clk_cnt); +return -ENOMEM ; + } + + clk[sub_clk_cnt] =devm_clk_get ( + &pdev->dev, clk_name); + +if (IS_ERR (clk)) { +dev_err (&pdev->dev, +"Subsys clk read fail %ld\n" , +PTR_ERR (clk)); +return PTR_ERR (clk); + } + sub_clk_cnt++; + } + } + +return sub_clk_cnt; +} +static void init_clks (struct platform_device *pdev,struct clk **clk) {int i;@@ -396,6 +604,17 @@ static struct scp *init_scp(struct platform_device *pdev,return ERR_CAST (scp->infracfg); } + scp->smi_common =syscon_regmap_lookup_by_phandle (pdev->dev.of_node, +"smi_comm" ); + +if (scp->smi_common ==ERR_PTR (-ENODEV )) { + scp->smi_common =NULL ; + }else if (IS_ERR (scp->smi_common)) { +dev_err (&pdev->dev,"Cannot find smi_common controller: %ld\n" , +PTR_ERR (scp->smi_common)); +return ERR_CAST (scp->smi_common); + } +for (i =0 ; i < num; i++) {struct scp_domain *scpd = &scp->domains[i];const struct scp_domain_data *data = &scp_domain_data[i];
drivers/soc/mediatek/mtk-scpsys.c static struct scp *init_scp(struct platform_device *pdev, · line 639
Quoted 4 lines
drivers/soc/mediatek/mtk-scpsys.c +1
-0@@ -417,22 +636,42 @@ static struct scp *init_scp(struct platform_device *pdev,struct scp_domain *scpd = &scp->domains[i];struct generic_pm_domain *genpd = &scpd->genpd;const struct scp_domain_data *data = &scp_domain_data[i]; +int clk_cnt =0 ;
No need to init to 0.
Quoted 14 lines
drivers/soc/mediatek/mtk-scpsys.c +6
-2pd_data->domains[i] = genpd; scpd->scp = scp; scpd->data = data; -for (j =0 ; j <MAX_CLKS && data->clk_id[j]; j++) { -struct clk *c = clk[data->clk_id[j]]; +if (data->clk_id[0 ]) +for (j =0 ; j <MAX_CLKS && data->clk_id[j]; j++) { +struct clk *c = clk[data->clk_id[j]]; + +if (IS_ERR (c)) { + dev_err(&pdev->dev,
drivers/soc/mediatek/mtk-scpsys.c static struct scp *init_scp(struct platform_device *pdev, · line 659
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +7
-2+"%s: clk unavailable\n" , + data->name); +return ERR_CAST (c); + } -if (IS_ERR (c)) { - dev_err(&pdev->dev, "%s: clk unavailable\n", + scpd->clk[j] = c; + } +else if (data->basic_clk_name[0 ])
Please use brackets {} here, makes the code clearer (even though technically there is only one statement below).
Quoted 69 lines
drivers/soc/mediatek/mtk-scpsys.c +13
-3+for (j =0 ; j <MAX_CLKS + && data->basic_clk_name[j]; j++) + scpd->clk[j] =devm_clk_get (&pdev->dev, + data->basic_clk_name[j]); + +if (data->subsys_clk_prefix) { + clk_cnt =init_subsys_clks (pdev, + data->subsys_clk_prefix, + scpd->subsys_clk); +if (clk_cnt <0 ) { +dev_err (&pdev->dev, +"%s: subsys clk unavailable\n" , data->name); -return ERR_CAST (c); +return ERR_PTR (clk_cnt); } - - scpd->clk[j] = c; } genpd->name = data->name;include/linux/soc/mediatek/scpsys-ext.h new file +39
-1@@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __SOC_MEDIATEK_SCPSYS_EXT_H +#define __SOC_MEDIATEK_SCPSYS_EXT_H + +#define MAX_STEPS 4 + +#define BUS_PROT (_type, _set_ofs, _clr_ofs, \ + _en_ofs, _sta_ofs, _mask, _clr_ack_mask) { \ + .type = _type, \ + .set_ofs = _set_ofs, \ + .clr_ofs = _clr_ofs, \ + .en_ofs = _en_ofs, \ + .sta_ofs = _sta_ofs, \ + .mask = _mask, \ + .clr_ack_mask = _clr_ack_mask, \ + } + +enum regmap_type { +IFR_TYPE , +SMI_TYPE , +MAX_REGMAP_TYPE , +}; + +struct bus_prot { +enum regmap_type type; +u32 set_ofs; +u32 clr_ofs; +u32 en_ofs; +u32 sta_ofs; +u32 mask; +u32 clr_ack_mask; +}; + +int mtk_scpsys_ext_set_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common); +int mtk_scpsys_ext_clear_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common); + +#endif /* __SOC_MEDIATEK_SCPSYS_EXT_H */ --2.18.0
PATCH v2 5/11 dt-bindings: ARM: Mediatek: Document bindings for MT8183
In reply to Weiyi LuThis patch adds the binding documentation for apmixedsys, audiosys, camsys, imgsys, infracfg, mcucfg, mfgcfg, mmsys, topckgen, vdecsys, vencsys and ipu for Mediatek MT8183.
--- .../arm/mediatek/mediatek,apmixedsys.txt | 1 + .../bindings/arm/mediatek/mediatek,audsys.txt | 1 + .../bindings/arm/mediatek/mediatek,camsys.txt | 22 ++++++++++ .../bindings/arm/mediatek/mediatek,imgsys.txt | 1 + .../arm/mediatek/mediatek,infracfg.txt | 1 + .../bindings/arm/mediatek/mediatek,ipu.txt | 43 +++++++++++++++++++ .../bindings/arm/mediatek/mediatek,mcucfg.txt | 1 + .../bindings/arm/mediatek/mediatek,mfgcfg.txt | 1 + .../bindings/arm/mediatek/mediatek,mmsys.txt | 1 + .../arm/mediatek/mediatek,topckgen.txt | 1 + .../arm/mediatek/mediatek,vdecsys.txt | 1 + .../arm/mediatek/mediatek,vencsys.txt | 1 + 12 files changed, 75 insertions(+) create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,camsys.txt create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,ipu.txt
Documentation/devicetree/bindings/arm/mediatek/mediatek,apmixedsys.txt +1 -0
@@ -13,6 +13,7 @@ Required Properties: - "mediatek,mt7623-apmixedsys", "mediatek,mt2701-apmixedsys" - "mediatek,mt8135-apmixedsys" - "mediatek,mt8173-apmixedsys" + - "mediatek,mt8183-apmixedsys", "syscon" - #clock-cells: Must be 1 The apmixedsys controller uses the common clk binding from
Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +1 -0
@@ -9,6 +9,7 @@ Required Properties: - "mediatek,mt2701-audsys", "syscon" - "mediatek,mt7622-audsys", "syscon" - "mediatek,mt7623-audsys", "mediatek,mt2701-audsys", "syscon" + - "mediatek,mt8183-audiosys", "syscon" - #clock-cells: Must be 1 The AUDSYS controller uses the common clk binding from
Documentation/devicetree/bindings/arm/mediatek/mediatek,camsys.txt new file +22 -0
@@ -0,0 +1,22 @@ +MediaTek CAMSYS controller +============================ + +The MediaTek camsys controller provides various clocks to the system. + +Required Properties: + +- compatible: Should be one of: + - "mediatek,mt8183-camsys", "syscon" +- #clock-cells: Must be 1 + +The camsys controller uses the common clk binding from +Documentation/devicetree/bindings/clock/clock-bindings.txt +The available clocks are defined in dt-bindings/clock/mt*-clk.h. + +Example: + +camsys: camsys at 1a000000 { + compatible = "mediatek,mt8183-camsys", "syscon"; + reg = <0 0x1a000000 0 0x1000>; + #clock-cells = <1>; +};
Documentation/devicetree/bindings/arm/mediatek/mediatek,imgsys.txt +1 -0
@@ -11,6 +11,7 @@ Required Properties: - "mediatek,mt6797-imgsys", "syscon" - "mediatek,mt7623-imgsys", "mediatek,mt2701-imgsys", "syscon" - "mediatek,mt8173-imgsys", "syscon" + - "mediatek,mt8183-imgsys", "syscon" - #clock-cells: Must be 1 The imgsys controller uses the common clk binding from
Documentation/devicetree/bindings/arm/mediatek/mediatek,infracfg.txt +1 -0
@@ -14,6 +14,7 @@ Required Properties: - "mediatek,mt7623-infracfg", "mediatek,mt2701-infracfg", "syscon" - "mediatek,mt8135-infracfg", "syscon" - "mediatek,mt8173-infracfg", "syscon" + - "mediatek,mt8183-infracfg", "syscon" - #clock-cells: Must be 1 - #reset-cells: Must be 1
Documentation/devicetree/bindings/arm/mediatek/mediatek,ipu.txt new file +43 -0
43 lines not on this page · raw message
Documentation/devicetree/bindings/arm/mediatek/mediatek,mcucfg.txt +1 -0
@@ -7,6 +7,7 @@ Required Properties: - compatible: Should be one of: - "mediatek,mt2712-mcucfg", "syscon" + - "mediatek,mt8183-mcucfg", "syscon" - #clock-cells: Must be 1 The mcucfg controller uses the common clk binding from
Documentation/devicetree/bindings/arm/mediatek/mediatek,mfgcfg.txt +1 -0
@@ -7,6 +7,7 @@ Required Properties: - compatible: Should be one of: - "mediatek,mt2712-mfgcfg", "syscon" + - "mediatek,mt8183-mfgcfg", "syscon" - #clock-cells: Must be 1 The mfgcfg controller uses the common clk binding from
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt +1 -0
@@ -11,6 +11,7 @@ Required Properties: - "mediatek,mt6797-mmsys", "syscon" - "mediatek,mt7623-mmsys", "mediatek,mt2701-mmsys", "syscon" - "mediatek,mt8173-mmsys", "syscon" + - "mediatek,mt8183-mmsys", "syscon" - #clock-cells: Must be 1 The mmsys controller uses the common clk binding from
Documentation/devicetree/bindings/arm/mediatek/mediatek,topckgen.txt +1 -0
@@ -13,6 +13,7 @@ Required Properties: - "mediatek,mt7623-topckgen", "mediatek,mt2701-topckgen" - "mediatek,mt8135-topckgen" - "mediatek,mt8173-topckgen" + - "mediatek,mt8183-topckgen", "syscon" - #clock-cells: Must be 1 The topckgen controller uses the common clk binding from
Documentation/devicetree/bindings/arm/mediatek/mediatek,vdecsys.txt +1 -0
@@ -11,6 +11,7 @@ Required Properties: - "mediatek,mt6797-vdecsys", "syscon" - "mediatek,mt7623-vdecsys", "mediatek,mt2701-vdecsys", "syscon" - "mediatek,mt8173-vdecsys", "syscon" + - "mediatek,mt8183-vdecsys", "syscon" - #clock-cells: Must be 1 The vdecsys controller uses the common clk binding from
Documentation/devicetree/bindings/arm/mediatek/mediatek,vencsys.txt +1 -0
@@ -9,6 +9,7 @@ Required Properties: - "mediatek,mt2712-vencsys", "syscon" - "mediatek,mt6797-vencsys", "syscon" - "mediatek,mt8173-vencsys", "syscon" + - "mediatek,mt8183-vencsys", "syscon" - #clock-cells: Must be 1 The vencsys controller uses the common clk binding from
Signature · 1 line
2.18.0
PATCH v2 6/11 clk: mediatek: Add dt-bindings for MT8183 clocks
In reply to Weiyi LuAdd MT8183 clock dt-bindings, include topckgen, apmixedsys, infracfg, mcucfg and subsystem clocks.
--- include/dt-bindings/clock/mt8183-clk.h | 422 +++++++++++++++++++++++++ 1 file changed, 422 insertions(+) create mode 100644 include/dt-bindings/clock/mt8183-clk.h
include/dt-bindings/clock/mt8183-clk.h new file +422 -0
@@ -0,0 +1,422 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Weiyi Lu <[email protected]> +*/ + +#ifndef _DT_BINDINGS_CLK_MT8183_H +#define _DT_BINDINGS_CLK_MT8183_H + +/* APMIXED */ +#define CLK_APMIXED_ARMPLL_LL 0 +#define CLK_APMIXED_ARMPLL_L 1 +#define CLK_APMIXED_CCIPLL 2 +#define CLK_APMIXED_MAINPLL 3 +#define CLK_APMIXED_UNIV2PLL 4 +#define CLK_APMIXED_MSDCPLL 5 +#define CLK_APMIXED_MMPLL 6 +#define CLK_APMIXED_MFGPLL 7 +#define CLK_APMIXED_TVDPLL 8 +#define CLK_APMIXED_APLL1 9 +#define CLK_APMIXED_APLL2 10 +#define CLK_APMIXED_SSUSB_26M 11 +#define CLK_APMIXED_APPLL_26M 12 +#define CLK_APMIXED_MIPIC0_26M 13 +#define CLK_APMIXED_MDPLLGP_26M 14 +#define CLK_APMIXED_MMSYS_26M 15 +#define CLK_APMIXED_UFS_26M 16 +#define CLK_APMIXED_MIPIC1_26M 17 +#define CLK_APMIXED_MEMPLL_26M 18 +#define CLK_APMIXED_CLKSQ_LVPLL_26M 19 +#define CLK_APMIXED_MIPID0_26M 20 +#define CLK_APMIXED_MIPID1_26M 21 +#define CLK_APMIXED_NR_CLK 22 + +/* TOPCKGEN */ +#define CLK_TOP_MUX_AXI 0 +#define CLK_TOP_MUX_MM 1 +#define CLK_TOP_MUX_CAM 2 +#define CLK_TOP_MUX_MFG 3 +#define CLK_TOP_MUX_CAMTG 4 +#define CLK_TOP_MUX_UART 5 +#define CLK_TOP_MUX_SPI 6 +#define CLK_TOP_MUX_MSDC50_0_HCLK 7 +#define CLK_TOP_MUX_MSDC50_0 8 +#define CLK_TOP_MUX_MSDC30_1 9 +#define CLK_TOP_MUX_MSDC30_2 10 +#define CLK_TOP_MUX_AUDIO 11 +#define CLK_TOP_MUX_AUD_INTBUS 12 +#define CLK_TOP_MUX_FPWRAP_ULPOSC 13 +#define CLK_TOP_MUX_SCP 14 +#define CLK_TOP_MUX_ATB 15 +#define CLK_TOP_MUX_SSPM 16 +#define CLK_TOP_MUX_DPI0 17 +#define CLK_TOP_MUX_SCAM 18 +#define CLK_TOP_MUX_AUD_1 19 +#define CLK_TOP_MUX_AUD_2 20 +#define CLK_TOP_MUX_DISP_PWM 21 +#define CLK_TOP_MUX_SSUSB_TOP_XHCI 22 +#define CLK_TOP_MUX_USB_TOP 23 +#define CLK_TOP_MUX_SPM 24 +#define CLK_TOP_MUX_I2C 25 +#define CLK_TOP_MUX_F52M_MFG 26 +#define CLK_TOP_MUX_SENINF 27 +#define CLK_TOP_MUX_DXCC 28 +#define CLK_TOP_MUX_CAMTG2 29 +#define CLK_TOP_MUX_AUD_ENG1 30 +#define CLK_TOP_MUX_AUD_ENG2 31 +#define CLK_TOP_MUX_FAES_UFSFDE 32 +#define CLK_TOP_MUX_FUFS 33 +#define CLK_TOP_MUX_IMG 34 +#define CLK_TOP_MUX_DSP 35 +#define CLK_TOP_MUX_DSP1 36 +#define CLK_TOP_MUX_DSP2 37 +#define CLK_TOP_MUX_IPU_IF 38 +#define CLK_TOP_MUX_CAMTG3 39 +#define CLK_TOP_MUX_CAMTG4 40 +#define CLK_TOP_MUX_PMICSPI 41 +#define CLK_TOP_SYSPLL_CK 42 +#define CLK_TOP_SYSPLL_D2 43 +#define CLK_TOP_SYSPLL_D3 44 +#define CLK_TOP_SYSPLL_D5 45 +#define CLK_TOP_SYSPLL_D7 46 +#define CLK_TOP_SYSPLL_D2_D2 47 +#define CLK_TOP_SYSPLL_D2_D4 48 +#define CLK_TOP_SYSPLL_D2_D8 49 +#define CLK_TOP_SYSPLL_D2_D16 50 +#define CLK_TOP_SYSPLL_D3_D2 51 +#define CLK_TOP_SYSPLL_D3_D4 52 +#define CLK_TOP_SYSPLL_D3_D8 53 +#define CLK_TOP_SYSPLL_D5_D2 54 +#define CLK_TOP_SYSPLL_D5_D4 55 +#define CLK_TOP_SYSPLL_D7_D2 56 +#define CLK_TOP_SYSPLL_D7_D4 57 +#define CLK_TOP_UNIVPLL_CK 58 +#define CLK_TOP_UNIVPLL_D2 59 +#define CLK_TOP_UNIVPLL_D3 60 +#define CLK_TOP_UNIVPLL_D5 61 +#define CLK_TOP_UNIVPLL_D7 62 +#define CLK_TOP_UNIVPLL_D2_D2 63 +#define CLK_TOP_UNIVPLL_D2_D4 64 +#define CLK_TOP_UNIVPLL_D2_D8 65 +#define CLK_TOP_UNIVPLL_D3_D2 66 +#define CLK_TOP_UNIVPLL_D3_D4 67 +#define CLK_TOP_UNIVPLL_D3_D8 68 +#define CLK_TOP_UNIVPLL_D5_D2 69 +#define CLK_TOP_UNIVPLL_D5_D4 70 +#define CLK_TOP_UNIVPLL_D5_D8 71 +#define CLK_TOP_APLL1_CK 72 +#define CLK_TOP_APLL1_D2 73 +#define CLK_TOP_APLL1_D4 74 +#define CLK_TOP_APLL1_D8 75 +#define CLK_TOP_APLL2_CK 76 +#define CLK_TOP_APLL2_D2 77 +#define CLK_TOP_APLL2_D4 78 +#define CLK_TOP_APLL2_D8 79 +#define CLK_TOP_TVDPLL_CK 80 +#define CLK_TOP_TVDPLL_D2 81 +#define CLK_TOP_TVDPLL_D4 82 +#define CLK_TOP_TVDPLL_D8 83 +#define CLK_TOP_TVDPLL_D16 84 +#define CLK_TOP_MSDCPLL_CK 85 +#define CLK_TOP_MSDCPLL_D2 86 +#define CLK_TOP_MSDCPLL_D4 87 +#define CLK_TOP_MSDCPLL_D8 88 +#define CLK_TOP_MSDCPLL_D16 89 +#define CLK_TOP_AD_OSC_CK 90 +#define CLK_TOP_OSC_D2 91 +#define CLK_TOP_OSC_D4 92 +#define CLK_TOP_OSC_D8 93 +#define CLK_TOP_OSC_D16 94 +#define CLK_TOP_F26M_CK_D2 95 +#define CLK_TOP_MFGPLL_CK 96 +#define CLK_TOP_UNIVP_192M_CK 97 +#define CLK_TOP_UNIVP_192M_D2 98 +#define CLK_TOP_UNIVP_192M_D4 99 +#define CLK_TOP_UNIVP_192M_D8 100 +#define CLK_TOP_UNIVP_192M_D16 101 +#define CLK_TOP_UNIVP_192M_D32 102 +#define CLK_TOP_MMPLL_CK 103 +#define CLK_TOP_MMPLL_D4 104 +#define CLK_TOP_MMPLL_D4_D2 105 +#define CLK_TOP_MMPLL_D4_D4 106 +#define CLK_TOP_MMPLL_D5 107 +#define CLK_TOP_MMPLL_D5_D2 108 +#define CLK_TOP_MMPLL_D5_D4 109 +#define CLK_TOP_MMPLL_D6 110 +#define CLK_TOP_MMPLL_D7 111 +#define CLK_TOP_CLK26M 112 +#define CLK_TOP_CLK13M 113 +#define CLK_TOP_ULPOSC 114 +#define CLK_TOP_UNIVP_192M 115 +#define CLK_TOP_MUX_APLL_I2S0 116 +#define CLK_TOP_MUX_APLL_I2S1 117 +#define CLK_TOP_MUX_APLL_I2S2 118 +#define CLK_TOP_MUX_APLL_I2S3 119 +#define CLK_TOP_MUX_APLL_I2S4 120 +#define CLK_TOP_MUX_APLL_I2S5 121 +#define CLK_TOP_APLL12_DIV0 122 +#define CLK_TOP_APLL12_DIV1 123 +#define CLK_TOP_APLL12_DIV2 124 +#define CLK_TOP_APLL12_DIV3 125 +#define CLK_TOP_APLL12_DIV4 126 +#define CLK_TOP_APLL12_DIVB 127 +#define CLK_TOP_UNIVPLL 128 +#define CLK_TOP_ARMPLL_DIV_PLL1 129 +#define CLK_TOP_ARMPLL_DIV_PLL2 130 +#define CLK_TOP_UNIVPLL_D3_D16 131 +#define CLK_TOP_NR_CLK 132 + +/* CAMSYS */ +#define CLK_CAM_LARB6 0 +#define CLK_CAM_DFP_VAD 1 +#define CLK_CAM_CAM 2 +#define CLK_CAM_CAMTG 3 +#define CLK_CAM_SENINF 4 +#define CLK_CAM_CAMSV0 5 +#define CLK_CAM_CAMSV1 6 +#define CLK_CAM_CAMSV2 7 +#define CLK_CAM_CCU 8 +#define CLK_CAM_LARB3 9 +#define CLK_CAM_NR_CLK 10 + +/* INFRACFG_AO */ +#define CLK_INFRA_PMIC_TMR 0 +#define CLK_INFRA_PMIC_AP 1 +#define CLK_INFRA_PMIC_MD 2 +#define CLK_INFRA_PMIC_CONN 3 +#define CLK_INFRA_SCPSYS 4 +#define CLK_INFRA_SEJ 5 +#define CLK_INFRA_APXGPT 6 +#define CLK_INFRA_ICUSB 7 +#define CLK_INFRA_GCE 8 +#define CLK_INFRA_THERM 9 +#define CLK_INFRA_I2C0 10 +#define CLK_INFRA_I2C1 11 +#define CLK_INFRA_I2C2 12 +#define CLK_INFRA_I2C3 13 +#define CLK_INFRA_PWM_HCLK 14 +#define CLK_INFRA_PWM1 15 +#define CLK_INFRA_PWM2 16 +#define CLK_INFRA_PWM3 17 +#define CLK_INFRA_PWM4 18 +#define CLK_INFRA_PWM 19 +#define CLK_INFRA_UART0 20 +#define CLK_INFRA_UART1 21 +#define CLK_INFRA_UART2 22 +#define CLK_INFRA_UART3 23 +#define CLK_INFRA_GCE_26M 24 +#define CLK_INFRA_CQ_DMA_FPC 25 +#define CLK_INFRA_BTIF 26 +#define CLK_INFRA_SPI0 27 +#define CLK_INFRA_MSDC0 28 +#define CLK_INFRA_MSDC1 29 +#define CLK_INFRA_MSDC2 30 +#define CLK_INFRA_MSDC0_SCK 31 +#define CLK_INFRA_DVFSRC 32 +#define CLK_INFRA_GCPU 33 +#define CLK_INFRA_TRNG 34 +#define CLK_INFRA_AUXADC 35 +#define CLK_INFRA_CPUM 36 +#define CLK_INFRA_CCIF1_AP 37 +#define CLK_INFRA_CCIF1_MD 38 +#define CLK_INFRA_AUXADC_MD 39 +#define CLK_INFRA_MSDC1_SCK 40 +#define CLK_INFRA_MSDC2_SCK 41 +#define CLK_INFRA_AP_DMA 42 +#define CLK_INFRA_XIU 43 +#define CLK_INFRA_DEVICE_APC 44 +#define CLK_INFRA_CCIF_AP 45 +#define CLK_INFRA_DEBUGSYS 46 +#define CLK_INFRA_AUDIO 47 +#define CLK_INFRA_CCIF_MD 48 +#define CLK_INFRA_DXCC_SEC_CORE 49 +#define CLK_INFRA_DXCC_AO 50 +#define CLK_INFRA_DRAMC_F26M 51 +#define CLK_INFRA_IRTX 52 +#define CLK_INFRA_DISP_PWM 53 +#define CLK_INFRA_CLDMA_BCLK 54 +#define CLK_INFRA_AUDIO_26M_BCLK 55 +#define CLK_INFRA_SPI1 56 +#define CLK_INFRA_I2C4 57 +#define CLK_INFRA_MODEM_TEMP_SHARE 58 +#define CLK_INFRA_SPI2 59 +#define CLK_INFRA_SPI3 60 +#define CLK_INFRA_UNIPRO_SCK 61 +#define CLK_INFRA_UNIPRO_TICK 62 +#define CLK_INFRA_UFS_MP_SAP_BCLK 63 +#define CLK_INFRA_MD32_BCLK 64 +#define CLK_INFRA_SSPM 65 +#define CLK_INFRA_UNIPRO_MBIST 66 +#define CLK_INFRA_SSPM_BUS_HCLK 67 +#define CLK_INFRA_I2C5 68 +#define CLK_INFRA_I2C5_ARBITER 69 +#define CLK_INFRA_I2C5_IMM 70 +#define CLK_INFRA_I2C1_ARBITER 71 +#define CLK_INFRA_I2C1_IMM 72 +#define CLK_INFRA_I2C2_ARBITER 73 +#define CLK_INFRA_I2C2_IMM 74 +#define CLK_INFRA_SPI4 75 +#define CLK_INFRA_SPI5 76 +#define CLK_INFRA_CQ_DMA 77 +#define CLK_INFRA_UFS 78 +#define CLK_INFRA_AES_UFSFDE 79 +#define CLK_INFRA_UFS_TICK 80 +#define CLK_INFRA_MSDC0_SELF 81 +#define CLK_INFRA_MSDC1_SELF 82 +#define CLK_INFRA_MSDC2_SELF 83 +#define CLK_INFRA_SSPM_26M_SELF 84 +#define CLK_INFRA_SSPM_32K_SELF 85 +#define CLK_INFRA_UFS_AXI 86 +#define CLK_INFRA_I2C6 87 +#define CLK_INFRA_AP_MSDC0 88 +#define CLK_INFRA_MD_MSDC0 89 +#define CLK_INFRA_USB 90 +#define CLK_INFRA_DEVMPU_BCLK 91 +#define CLK_INFRA_CCIF2_AP 92 +#define CLK_INFRA_CCIF2_MD 93 +#define CLK_INFRA_CCIF3_AP 94 +#define CLK_INFRA_CCIF3_MD 95 +#define CLK_INFRA_SEJ_F13M 96 +#define CLK_INFRA_AES_BCLK 97 +#define CLK_INFRA_I2C7 98 +#define CLK_INFRA_I2C8 99 +#define CLK_INFRA_FBIST2FPC 100 +#define CLK_INFRA_NR_CLK 101 + +/* MFGCFG */ +#define CLK_MFG_BG3D 0 +#define CLK_MFG_NR_CLK 1 + +/* IMG */ +#define CLK_IMG_OWE 0 +#define CLK_IMG_WPE_B 1 +#define CLK_IMG_WPE_A 2 +#define CLK_IMG_MFB 3 +#define CLK_IMG_RSC 4 +#define CLK_IMG_DPE 5 +#define CLK_IMG_FDVT 6 +#define CLK_IMG_DIP 7 +#define CLK_IMG_LARB2 8 +#define CLK_IMG_LARB5 9 +#define CLK_IMG_NR_CLK 10 + +/* MMSYS_CONFIG */ +#define CLK_MM_SMI_COMMON 0 +#define CLK_MM_SMI_LARB0 1 +#define CLK_MM_SMI_LARB1 2 +#define CLK_MM_GALS_COMM0 3 +#define CLK_MM_GALS_COMM1 4 +#define CLK_MM_GALS_CCU2MM 5 +#define CLK_MM_GALS_IPU12MM 6 +#define CLK_MM_GALS_IMG2MM 7 +#define CLK_MM_GALS_CAM2MM 8 +#define CLK_MM_GALS_IPU2MM 9 +#define CLK_MM_MDP_DL_TXCK 10 +#define CLK_MM_IPU_DL_TXCK 11 +#define CLK_MM_MDP_RDMA0 12 +#define CLK_MM_MDP_RDMA1 13 +#define CLK_MM_MDP_RSZ0 14 +#define CLK_MM_MDP_RSZ1 15 +#define CLK_MM_MDP_TDSHP 16 +#define CLK_MM_MDP_WROT0 17 +#define CLK_MM_FAKE_ENG 18 +#define CLK_MM_DISP_OVL0 19 +#define CLK_MM_DISP_OVL0_2L 20 +#define CLK_MM_DISP_OVL1_2L 21 +#define CLK_MM_DISP_RDMA0 22 +#define CLK_MM_DISP_RDMA1 23 +#define CLK_MM_DISP_WDMA0 24 +#define CLK_MM_DISP_COLOR0 25 +#define CLK_MM_DISP_CCORR0 26 +#define CLK_MM_DISP_AAL0 27 +#define CLK_MM_DISP_GAMMA0 28 +#define CLK_MM_DISP_DITHER0 29 +#define CLK_MM_DISP_SPLIT 30 +#define CLK_MM_DSI0_MM 31 +#define CLK_MM_DSI0_IF 32 +#define CLK_MM_DPI_MM 33 +#define CLK_MM_DPI_IF 34 +#define CLK_MM_FAKE_ENG2 35 +#define CLK_MM_MDP_DL_RX 36 +#define CLK_MM_IPU_DL_RX 37 +#define CLK_MM_26M 38 +#define CLK_MM_MMSYS_R2Y 39 +#define CLK_MM_DISP_RSZ 40 +#define CLK_MM_MDP_WDMA0 41 +#define CLK_MM_MDP_AAL 42 +#define CLK_MM_MDP_CCORR 43 +#define CLK_MM_DBI_MM 44 +#define CLK_MM_DBI_IF 45 +#define CLK_MM_NR_CLK 46 + +/* VDEC_GCON */ +#define CLK_VDEC_VDEC 0 +#define CLK_VDEC_LARB1 1 +#define CLK_VDEC_NR_CLK 2 + +/* VENC_GCON */ +#define CLK_VENC_LARB 0 +#define CLK_VENC_VENC 1 +#define CLK_VENC_JPGENC 2 +#define CLK_VENC_NR_CLK 3 + +/* AUDIO */ +#define CLK_AUDIO_TML 0 +#define CLK_AUDIO_DAC_PREDIS 1 +#define CLK_AUDIO_DAC 2 +#define CLK_AUDIO_ADC 3 +#define CLK_AUDIO_APLL_TUNER 4 +#define CLK_AUDIO_APLL2_TUNER 5 +#define CLK_AUDIO_24M 6 +#define CLK_AUDIO_22M 7 +#define CLK_AUDIO_AFE 8 +#define CLK_AUDIO_I2S4 9 +#define CLK_AUDIO_I2S3 10 +#define CLK_AUDIO_I2S2 11 +#define CLK_AUDIO_I2S1 12 +#define CLK_AUDIO_PDN_ADDA6_ADC 13 +#define CLK_AUDIO_TDM 14 +#define CLK_AUDIO_NR_CLK 15 + +/* IPU_CONN */ +#define CLK_IPU_CONN_IPU 0 +#define CLK_IPU_CONN_AHB 1 +#define CLK_IPU_CONN_AXI 2 +#define CLK_IPU_CONN_ISP 3 +#define CLK_IPU_CONN_CAM_ADL 4 +#define CLK_IPU_CONN_IMG_ADL 5 +#define CLK_IPU_CONN_DAP_RX 6 +#define CLK_IPU_CONN_APB2AXI 7 +#define CLK_IPU_CONN_APB2AHB 8 +#define CLK_IPU_CONN_IPU_CAB1TO2 9 +#define CLK_IPU_CONN_IPU1_CAB1TO2 10 +#define CLK_IPU_CONN_IPU2_CAB1TO2 11 +#define CLK_IPU_CONN_CAB3TO3 12 +#define CLK_IPU_CONN_CAB2TO1 13 +#define CLK_IPU_CONN_CAB3TO1_SLICE 14 +#define CLK_IPU_CONN_NR_CLK 15 + +/* IPU_ADL */ +#define CLK_IPU_ADL_CABGEN 0 +#define CLK_IPU_ADL_NR_CLK 1 + +/* IPU_CORE0 */ +#define CLK_IPU_CORE0_JTAG 0 +#define CLK_IPU_CORE0_AXI 1 +#define CLK_IPU_CORE0_IPU 2 +#define CLK_IPU_CORE0_NR_CLK 3 + +/* IPU_CORE1 */ +#define CLK_IPU_CORE1_JTAG 0 +#define CLK_IPU_CORE1_AXI 1 +#define CLK_IPU_CORE1_IPU 2 +#define CLK_IPU_CORE1_NR_CLK 3 + +/* MCUCFG */ +#define CLK_MCU_MP0_SEL 0 +#define CLK_MCU_MP2_SEL 1 +#define CLK_MCU_BUS_SEL 2 +#define CLK_MCU_NR_CLK 3 + +#endif /* _DT_BINDINGS_CLK_MT8183_H */
Signature · 1 line
2.18.0
PATCH v2 7/11 clk: mediatek: Add flags support for mtk_gate data
In reply to Weiyi LuOn some Mediatek platforms, there are critical clocks of clock gate type.
To register clock gate with flags CLK_IS_CRITICAL,
we need to add the flags field in mtk_gate data and register APIs.
--- drivers/clk/mediatek/clk-gate.c | 5 +++-- drivers/clk/mediatek/clk-gate.h | 3 ++- drivers/clk/mediatek/clk-mtk.c | 3 ++- drivers/clk/mediatek/clk-mtk.h | 1 + 4 files changed, 8 insertions(+), 4 deletions(-)
drivers/clk/mediatek/clk-gate.c +3 -2
@@ -157,7 +157,8 @@ struct clk *mtk_clk_register_gate(int clr_ofs, int sta_ofs, u8 bit, - const struct clk_ops *ops) + const struct clk_ops *ops, + unsigned long flags) { struct mtk_clk_gate *cg;struct clk *clk;
@@ -168,7 +169,7 @@ struct clk *mtk_clk_register_gate(return ERR_PTR (-ENOMEM ); init.name = name; - init.flags =CLK_SET_RATE_PARENT ; + init.flags = flags |CLK_SET_RATE_PARENT ; init.parent_names = parent_name ? &parent_name :NULL ; init.num_parents = parent_name ?1 :0 ; init.ops = ops;
drivers/clk/mediatek/clk-gate.h +2 -1
@@ -47,6 +47,7 @@ struct clk *mtk_clk_register_gate(int clr_ofs, int sta_ofs, u8 bit, - const struct clk_ops *ops); + const struct clk_ops *ops, + unsigned long flags);#endif /* __DRV_CLK_GATE_H */
drivers/clk/mediatek/clk-mtk.c +2 -1
@@ -130,7 +130,8 @@ int mtk_clk_register_gates(struct device_node *node, gate->regs->set_ofs, gate->regs->clr_ofs, gate->regs->sta_ofs, - gate->shift, gate->ops); + gate->shift, gate->ops, + gate->flags);if (IS_ERR (clk)) { pr_err("Failed to register clk %s: %ld\n",
drivers/clk/mediatek/clk-mtk.h +1 -0
@@ -158,6 +158,7 @@ struct mtk_gate {const struct mtk_gate_regs *regs;int shift;const struct clk_ops *ops; +unsigned long flags; }; int mtk_clk_register_gates(struct device_node *node,
Signature · 1 line
2.18.0
PATCH v2 8/11 clk: mediatek: Add MT8183 clock support
In reply to Weiyi LuAdd MT8183 clock support, include topckgen, apmixedsys, infracfg, mcucfg and subsystem clocks.
--- drivers/clk/mediatek/Kconfig | 75 ++ drivers/clk/mediatek/Makefile | 12 + drivers/clk/mediatek/clk-gate.h | 14 + drivers/clk/mediatek/clk-mt8183-audio.c | 102 ++ drivers/clk/mediatek/clk-mt8183-cam.c | 70 ++ drivers/clk/mediatek/clk-mt8183-img.c | 70 ++ drivers/clk/mediatek/clk-mt8183-ipu0.c | 63 + drivers/clk/mediatek/clk-mt8183-ipu1.c | 63 + drivers/clk/mediatek/clk-mt8183-ipu_adl.c | 61 + drivers/clk/mediatek/clk-mt8183-ipu_conn.c | 130 ++ drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 61 + drivers/clk/mediatek/clk-mt8183-mm.c | 118 ++ drivers/clk/mediatek/clk-mt8183-vdec.c | 74 ++ drivers/clk/mediatek/clk-mt8183-venc.c | 66 + drivers/clk/mediatek/clk-mt8183.c | 1305 ++++++++++++++++++++ 15 files changed, 2284 insertions(+) create mode 100644 drivers/clk/mediatek/clk-mt8183-audio.c create mode 100644 drivers/clk/mediatek/clk-mt8183-cam.c create mode 100644 drivers/clk/mediatek/clk-mt8183-img.c create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu0.c create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu1.c create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu_adl.c create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu_conn.c create mode 100644 drivers/clk/mediatek/clk-mt8183-mfgcfg.c create mode 100644 drivers/clk/mediatek/clk-mt8183-mm.c create mode 100644 drivers/clk/mediatek/clk-mt8183-vdec.c create mode 100644 drivers/clk/mediatek/clk-mt8183-venc.c create mode 100644 drivers/clk/mediatek/clk-mt8183.c
drivers/clk/mediatek/Kconfig +75 -0
@@ -193,4 +193,79 @@ config COMMON_CLK_MT8173 default ARCH_MEDIATEK ---help--- This driver supports MediaTek MT8173 clocks. + +config COMMON_CLK_MT8183 + bool "Clock driver for MediaTek MT8183" + depends on (ARCH_MEDIATEK && ARM64) || COMPILE_TEST + select COMMON_CLK_MEDIATEK + default ARCH_MEDIATEK && ARM64 + help + This driver supports MediaTek MT8183 basic clocks. + +config COMMON_CLK_MT8183_AUDIOSYS + bool "Clock driver for MediaTek MT8183 audiosys" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 audiosys clocks. + +config COMMON_CLK_MT8183_CAMSYS + bool "Clock driver for MediaTek MT8183 camsys" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 camsys clocks. + +config COMMON_CLK_MT8183_IMGSYS + bool "Clock driver for MediaTek MT8183 imgsys" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 imgsys clocks. + +config COMMON_CLK_MT8183_IPU_CORE0 + bool "Clock driver for MediaTek MT8183 ipu_core0" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 ipu_core0 clocks. + +config COMMON_CLK_MT8183_IPU_CORE1 + bool "Clock driver for MediaTek MT8183 ipu_core1" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 ipu_core1 clocks. + +config COMMON_CLK_MT8183_IPU_ADL + bool "Clock driver for MediaTek MT8183 ipu_adl" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 ipu_adl clocks. + +config COMMON_CLK_MT8183_IPU_CONN + bool "Clock driver for MediaTek MT8183 ipu_conn" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 ipu_conn clocks. + +config COMMON_CLK_MT8183_MFGCFG + bool "Clock driver for MediaTek MT8183 mfgcfg" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 mfgcfg clocks. + +config COMMON_CLK_MT8183_MMSYS + bool "Clock driver for MediaTek MT8183 mmsys" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 mmsys clocks. + +config COMMON_CLK_MT8183_VDECSYS + bool "Clock driver for MediaTek MT8183 vdecsys" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 vdecsys clocks. + +config COMMON_CLK_MT8183_VENCSYS + bool "Clock driver for MediaTek MT8183 vencsys" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 vencsys clocks. + endmenu
drivers/clk/mediatek/Makefile +12 -0
@@ -28,3 +28,15 @@ obj-$(CONFIG_COMMON_CLK_MT7622_HIFSYS) += clk-mt7622-hif.o obj-$(CONFIG_COMMON_CLK_MT7622_AUDSYS) += clk-mt7622-aud.o obj-$(CONFIG_COMMON_CLK_MT8135) += clk-mt8135.o obj-$(CONFIG_COMMON_CLK_MT8173) += clk-mt8173.o +obj-$(CONFIG_COMMON_CLK_MT8183) += clk-mt8183.o +obj-$(CONFIG_COMMON_CLK_MT8183_AUDIOSYS) += clk-mt8183-audio.o +obj-$(CONFIG_COMMON_CLK_MT8183_CAMSYS) += clk-mt8183-cam.o +obj-$(CONFIG_COMMON_CLK_MT8183_IMGSYS) += clk-mt8183-img.o +obj-$(CONFIG_COMMON_CLK_MT8183_IPU_CORE0) += clk-mt8183-ipu0.o +obj-$(CONFIG_COMMON_CLK_MT8183_IPU_CORE1) += clk-mt8183-ipu1.o +obj-$(CONFIG_COMMON_CLK_MT8183_IPU_ADL) += clk-mt8183-ipu_adl.o +obj-$(CONFIG_COMMON_CLK_MT8183_IPU_CONN) += clk-mt8183-ipu_conn.o +obj-$(CONFIG_COMMON_CLK_MT8183_MFGCFG) += clk-mt8183-mfgcfg.o +obj-$(CONFIG_COMMON_CLK_MT8183_MMSYS) += clk-mt8183-mm.o +obj-$(CONFIG_COMMON_CLK_MT8183_VDECSYS) += clk-mt8183-vdec.o +obj-$(CONFIG_COMMON_CLK_MT8183_VENCSYS) += clk-mt8183-venc.o
drivers/clk/mediatek/clk-gate.h +14 -0
@@ -50,4 +50,18 @@ struct clk *mtk_clk_register_gate(const struct clk_ops *ops, unsigned long flags); +#define GATE_MTK_FLAGS (_id, _name, _parent, _regs, _shift, \ + _ops, _flags) { \ + .id = _id, \ + .name = _name, \ + .parent_name = _parent, \ + .regs = _regs, \ + .shift = _shift, \ + .ops = _ops, \ + .flags = _flags, \ + } + +#define GATE_MTK (_id, _name, _parent, _regs, _shift, _ops) \ + GATE_MTK_FLAGS(_id, _name, _parent, _regs, _shift, _ops, 0) +#endif /* __DRV_CLK_GATE_H */
drivers/clk/mediatek/clk-mt8183-audio.c new file +102 -0
102 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-cam.c new file +70 -0
70 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-img.c new file +70 -0
70 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-ipu0.c new file +63 -0
63 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-ipu1.c new file +63 -0
63 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-ipu_adl.c new file +61 -0
61 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-ipu_conn.c new file +130 -0
130 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-mfgcfg.c new file +61 -0
61 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-mm.c new file +118 -0
118 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-vdec.c new file +74 -0
74 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-venc.c new file +66 -0
66 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183.c new file +1305 -0
1,305 lines not on this page · raw message
Signature · 1 line
2.18.0
kbuild test robot
build botRe: [PATCH v2 08/11] clk: mediatek: Add MT8183 clock support
Thank you for the patch! Perhaps something to improve:
Hi Weiyi,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on clk/clk-next]
[also build test WARNING on v4.20-rc4 next-20181126]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Weiyi-Lu/Mediatek-MT8183-clock-and-scpsys-support/20181127-114621 base: https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
coccinelle warnings: (new ones prefixed by >>)
>> drivers/clk/mediatek/clk-mt8183.c:1295:3-8: No need to set .owner here. The core will do it.
Please review and possibly fold the followup patch.
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
kbuild test robot
build bot[PATCH] clk: mediatek: fix platform_no_drv_owner.cocci warnings
In reply to Weiyi Ludrivers/clk/mediatek/clk-mt8183.c:1295:3-8: No need to set .owner here. The core will do it.
From: kbuild test robot <[email protected]>
drivers/clk/mediatek/clk-mt8183.c:1295:3-8: No need to set .owner here. The core will do it.
Remove .owner field if calls are used which set it automatically
Generated by: scripts/coccinelle/api/platform_no_drv_owner.cocci
---
url: https://github.com/0day-ci/linux/commits/Weiyi-Lu/Mediatek-MT8183-clock-and-scpsys-support/20181127-114621 base: https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
clk-mt8183.c | 1 - 1 file changed, 1 deletion(-)
drivers/clk/mediatek/clk-mt8183.c +0 -1
@@ -1292,7 +1292,6 @@ static struct platform_driver clk_mt8183 .probe = clk_mt8183_probe, .driver = { .name = "clk-mt8183", - .owner = THIS_MODULE, .of_match_table = of_match_clk_mt8183, }, };
PATCH v2 9/11 dt-bindings: soc: fix typo of MT8173 power dt-bindings
In reply to Weiyi Lufix incorrect IC name that will affect the MT8183 power dt-bindings
--- include/dt-bindings/power/mt8173-power.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/dt-bindings/power/mt8173-power.h +3 -3
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _DT_BINDINGS_POWER_MT8183_POWER_H -#define _DT_BINDINGS_POWER_MT8183_POWER_H +#ifndef _DT_BINDINGS_POWER_MT8173_POWER_H +#define _DT_BINDINGS_POWER_MT8173_POWER_H#define MT8173_POWER_DOMAIN_VDEC 0#define MT8173_POWER_DOMAIN_VENC 1
@@ -13,4 +13,4 @@#define MT8173_POWER_DOMAIN_MFG_2D 8#define MT8173_POWER_DOMAIN_MFG 9 -#endif /* _DT_BINDINGS_POWER_MT8183_POWER_H */ +#endif /* _DT_BINDINGS_POWER_MT8173_POWER_H */
Signature · 1 line
2.18.0
PATCH v2 10/11 dt-bindings: soc: Add MT8183 power dt-bindings
In reply to Weiyi LuAdd power dt-bindings for MT8183.
--- .../bindings/soc/mediatek/scpsys.txt | 14 ++++++++++ include/dt-bindings/power/mt8183-power.h | 26 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 include/dt-bindings/power/mt8183-power.h
Documentation/devicetree/bindings/soc/mediatek/scpsys.txt +14 -0
@@ -14,6 +14,7 @@ power/power_domain.txt. It provides the power domains defined in - include/dt-bindings/power/mt2701-power.h - include/dt-bindings/power/mt2712-power.h - include/dt-bindings/power/mt7622-power.h +- include/dt-bindings/power/mt8183-power.h Required properties: - compatible: Should be one of:
@@ -24,18 +25,31 @@ Required properties: - "mediatek,mt7623-scpsys", "mediatek,mt2701-scpsys": For MT7623 SoC - "mediatek,mt7623a-scpsys": For MT7623A SoC - "mediatek,mt8173-scpsys" + - "mediatek,mt8183-scpsys" - #power-domain-cells: Must be 1 - reg: Address range of the SCPSYS unit - infracfg: must contain a phandle to the infracfg controller - clock, clock-names: clocks according to the common clock binding. These are clocks which hardware needs to be enabled before enabling certain power domains. + The new clock type "BASIC" belongs to the type above. + As to the new clock type "SUBSYS" needs to be + enabled before releasing bus protection. Required clocks for MT2701 or MT7623: "mm", "mfg", "ethif" Required clocks for MT2712: "mm", "mfg", "venc", "jpgdec", "audio", "vdec" Required clocks for MT6797: "mm", "mfg", "vdec" Required clocks for MT7622: "hif_sel" Required clocks for MT7622A: "ethif" Required clocks for MT8173: "mm", "mfg", "venc", "venc_lt" + Required clocks for MT8183: BASIC: "audio", "mfg", "mm", "cam", "isp", + "vpu", "vpu1", "vpu2", "vpu3" + SUBSYS: "mm-0", "mm-1", "mm-2", "mm-3", + "mm-4", "mm-5", "mm-6", "mm-7", + "mm-8", "mm-9", "isp-0", "isp-1", + "cam-0", "cam-1", "cam-2", "cam-3", + "cam-4", "cam-5", "cam-6", "vpu-0", + "vpu-1", "vpu-2", "vpu-3", "vpu-4", + "vpu-5" Optional properties: - vdec-supply: Power supply for the vdec power domain
include/dt-bindings/power/mt8183-power.h new file +26 -0
@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0 +* +* Copyright (c) 2018 MediaTek Inc. +* Author: Weiyi Lu <[email protected]> +*/ + +#ifndef _DT_BINDINGS_POWER_MT8183_POWER_H +#define _DT_BINDINGS_POWER_MT8183_POWER_H + +#define MT8183_POWER_DOMAIN_AUDIO 0 +#define MT8183_POWER_DOMAIN_CONN 1 +#define MT8183_POWER_DOMAIN_MFG_ASYNC 2 +#define MT8183_POWER_DOMAIN_MFG 3 +#define MT8183_POWER_DOMAIN_MFG_CORE0 4 +#define MT8183_POWER_DOMAIN_MFG_CORE1 5 +#define MT8183_POWER_DOMAIN_MFG_2D 6 +#define MT8183_POWER_DOMAIN_DISP 7 +#define MT8183_POWER_DOMAIN_CAM 8 +#define MT8183_POWER_DOMAIN_ISP 9 +#define MT8183_POWER_DOMAIN_VDEC 10 +#define MT8183_POWER_DOMAIN_VENC 11 +#define MT8183_POWER_DOMAIN_VPU_TOP 12 +#define MT8183_POWER_DOMAIN_VPU_CORE0 13 +#define MT8183_POWER_DOMAIN_VPU_CORE1 14 + +#endif /* _DT_BINDINGS_POWER_MT8183_POWER_H */
Signature · 1 line
2.18.0
PATCH v2 11/11 soc: mediatek: Add MT8183 scpsys support
In reply to Weiyi LuAdd scpsys driver for MT8183
--- drivers/soc/mediatek/mtk-scpsys.c | 227 +++++++++++++++++++++++++++++- 1 file changed, 226 insertions(+), 1 deletion(-)
drivers/soc/mediatek/mtk-scpsys.c +226 -1
@@ -29,6 +29,7 @@#include <dt-bindings/power/mt7622-power.h> #include <dt-bindings/power/mt7623a-power.h> #include <dt-bindings/power/mt8173-power.h> +#include <dt-bindings/power/mt8183-power.h> #define MTK_POLL_DELAY_US 10#define MTK_POLL_TIMEOUT (jiffies_to_usecs(HZ))
@@ -397,7 +398,6 @@ static int scpsys_power_on(struct generic_pm_domain *genpd)if (ret <0 ) goto err_pwr_ack; - val &= ~PWR_CLK_DIS_BIT ;writel (val, ctl_addr);
@@ -1179,6 +1179,217 @@ static const struct scp_subdomain scp_subdomain_mt8173[] = { {MT8173_POWER_DOMAIN_MFG_2D, MT8173_POWER_DOMAIN_MFG}, }; +/* +* MT8183 power domain support +*/ + +static const struct scp_domain_data scp_domain_data_mt8183[] = { + [MT8183_POWER_DOMAIN_AUDIO ] = { + .name ="audio" , + .sta_mask =PWR_STATUS_AUDIO , + .ctl_offs =0x0314 , + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (15 ,12 ), + .basic_clk_name = {"audio" ,"audio1" ,"audio2" }, + }, + [MT8183_POWER_DOMAIN_CONN ] = { + .name ="conn" , + .sta_mask =PWR_STATUS_CONN , + .ctl_offs =0x032c , + .sram_pdn_bits =0 , + .sram_pdn_ack_bits =0 , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (13 ) |BIT (14 ),BIT (13 ) |BIT (14 )), + }, + }, + [MT8183_POWER_DOMAIN_MFG_ASYNC ] = { + .name ="mfg_async" , + .sta_mask =PWR_STATUS_MFG_ASYNC , + .ctl_offs =0x0334 , + .sram_pdn_bits =0 , + .sram_pdn_ack_bits =0 , + .basic_clk_name = {"mfg" }, + }, + [MT8183_POWER_DOMAIN_MFG ] = { + .name ="mfg" , + .sta_mask =PWR_STATUS_MFG , + .ctl_offs =0x0338 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + }, + [MT8183_POWER_DOMAIN_MFG_CORE0 ] = { + .name ="mfg_core0" , + .sta_mask =BIT (7 ), + .ctl_offs =0x034c , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + }, + [MT8183_POWER_DOMAIN_MFG_CORE1 ] = { + .name ="mfg_core1" , + .sta_mask =BIT (20 ), + .ctl_offs =0x0310 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + }, + [MT8183_POWER_DOMAIN_MFG_2D ] = { + .name ="mfg_2d" , + .sta_mask =PWR_STATUS_MFG_2D , + .ctl_offs =0x0348 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2a8 ,0x2ac ,0 ,0x258 , +BIT (19 ) |BIT (20 ) |BIT (21 ), +BIT (19 ) |BIT (20 ) |BIT (21 )), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (21 ) |BIT (22 ),BIT (21 ) |BIT (22 )), + }, + }, + [MT8183_POWER_DOMAIN_DISP ] = { + .name ="disp" , + .sta_mask =PWR_STATUS_DISP , + .ctl_offs =0x030c , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .basic_clk_name = {"mm" }, + .subsys_clk_prefix ="mm" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2a8 ,0x2ac ,0 ,0x258 , +BIT (16 ) |BIT (17 ),BIT (16 ) |BIT (17 )), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (10 ) |BIT (11 ),BIT (10 ) |BIT (11 )), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +GENMASK (7 ,0 ),GENMASK (7 ,0 )), + }, + }, + [MT8183_POWER_DOMAIN_CAM ] = { + .name ="cam" , + .sta_mask =BIT (25 ), + .ctl_offs =0x0344 , + .sram_pdn_bits =GENMASK (9 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_name = {"cam" }, + .subsys_clk_prefix ="cam" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (4 ) |BIT (5 ) |BIT (9 ) |BIT (13 ), +BIT (4 ) |BIT (5 ) |BIT (9 ) |BIT (13 )), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (28 ),BIT (28 )), +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (11 ),0 ), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (3 ) |BIT (4 ),BIT (3 ) |BIT (4 )), + }, + }, + [MT8183_POWER_DOMAIN_ISP ] = { + .name ="isp" , + .sta_mask =PWR_STATUS_ISP , + .ctl_offs =0x0308 , + .sram_pdn_bits =GENMASK (9 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_name = {"isp" }, + .subsys_clk_prefix ="isp" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (3 ) |BIT (8 ),BIT (3 ) |BIT (8 )), +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (10 ),0 ), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (2 ),BIT (2 )), + }, + }, + [MT8183_POWER_DOMAIN_VDEC ] = { + .name ="vdec" , + .sta_mask =BIT (31 ), + .ctl_offs =0x0300 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_table = { +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (7 ),BIT (7 )), + }, + }, + [MT8183_POWER_DOMAIN_VENC ] = { + .name ="venc" , + .sta_mask =PWR_STATUS_VENC , + .ctl_offs =0x0304 , + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (15 ,12 ), + .bp_table = { +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (1 ),BIT (1 )), + }, + }, + [MT8183_POWER_DOMAIN_VPU_TOP ] = { + .name ="vpu_top" , + .sta_mask =BIT (26 ), + .ctl_offs =0x0324 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .basic_clk_name = {"vpu" ,"vpu1" }, + .subsys_clk_prefix ="vpu" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +GENMASK (9 ,6 ) |BIT (12 ), +GENMASK (9 ,6 ) |BIT (12 )), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (27 ),BIT (27 )), +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (10 ) |BIT (11 ),BIT (10 ) |BIT (11 )), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (5 ) |BIT (6 ),BIT (5 ) |BIT (6 )), + }, + }, + [MT8183_POWER_DOMAIN_VPU_CORE0 ] = { + .name ="vpu_core0" , + .sta_mask =BIT (27 ), + .ctl_offs =0x33c , + .sram_iso_ctrl = true, + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_name = {"vpu2" }, + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +BIT (6 ),BIT (6 )), +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +BIT (0 ) |BIT (2 ) |BIT (4 ), +BIT (0 ) |BIT (2 ) |BIT (4 )), + }, + }, + [MT8183_POWER_DOMAIN_VPU_CORE1 ] = { + .name ="vpu_core1" , + .sta_mask =BIT (28 ), + .ctl_offs =0x0340 , + .sram_iso_ctrl = true, + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_name = {"vpu3" }, + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +BIT (7 ),BIT (7 )), +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +BIT (1 ) |BIT (3 ) |BIT (5 ), +BIT (1 ) |BIT (3 ) |BIT (5 )), + }, + }, +}; + +static const struct scp_subdomain scp_subdomain_mt8183[] = { + {MT8183_POWER_DOMAIN_MFG_ASYNC ,MT8183_POWER_DOMAIN_MFG }, + {MT8183_POWER_DOMAIN_MFG ,MT8183_POWER_DOMAIN_MFG_2D }, + {MT8183_POWER_DOMAIN_MFG ,MT8183_POWER_DOMAIN_MFG_CORE0 }, + {MT8183_POWER_DOMAIN_MFG ,MT8183_POWER_DOMAIN_MFG_CORE1 }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_CAM }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_ISP }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_VDEC }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_VENC }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_VPU_TOP }, + {MT8183_POWER_DOMAIN_VPU_TOP ,MT8183_POWER_DOMAIN_VPU_CORE0 }, + {MT8183_POWER_DOMAIN_VPU_TOP ,MT8183_POWER_DOMAIN_VPU_CORE1 }, +}; +static const struct scp_soc_data mt2701_data = { .domains = scp_domain_data_mt2701, .num_domains = ARRAY_SIZE(scp_domain_data_mt2701),
@@ -1245,6 +1456,17 @@ static const struct scp_soc_data mt8173_data = { .bus_prot_reg_update = true, }; +static const struct scp_soc_data mt8183_data = { + .domains = scp_domain_data_mt8183, + .num_domains =ARRAY_SIZE (scp_domain_data_mt8183), + .subdomains = scp_subdomain_mt8183, + .num_subdomains =ARRAY_SIZE (scp_subdomain_mt8183), + .regs = { + .pwr_sta_offs =0x0180 , + .pwr_sta2nd_offs =0x0184 + } +}; +/* * scpsys driver init */
@@ -1268,6 +1490,9 @@ static const struct of_device_id of_scpsys_match_tbl[] = { }, { .compatible = "mediatek,mt8173-scpsys", .data = &mt8173_data, + }, { + .compatible = "mediatek,mt8183-scpsys", + .data = &mt8183_data, }, { /* sentinel */ }
Signature · 1 line
2.18.0
Re: [PATCH v2 11/11] soc: mediatek: Add MT8183 scpsys support
Quoted 21 lines · Weiyi Lu
Add scpsys driver for MT8183
Signed-off-by Weiyi Lu <[email protected]>--- drivers/soc/mediatek/mtk-scpsys.c | 227 +++++++++++++++++++++++++++++- 1 file changed, 226 insertions(+), 1 deletion(-)drivers/soc/mediatek/mtk-scpsys.c +1
-0@@ -29,6 +29,7 @@#include <dt-bindings/power/mt7622-power.h> #include <dt-bindings/power/mt7623a-power.h> #include <dt-bindings/power/mt8173-power.h> +#include <dt-bindings/power/mt8183-power.h> #define MTK_POLL_DELAY_US 10#define MTK_POLL_TIMEOUT (jiffies_to_usecs(HZ))
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_on(struct generic_pm_domain *genpd) · line 400
Quoted 4 lines
drivers/soc/mediatek/mtk-scpsys.c +0
-1@@ -397,7 +398,6 @@ static int scpsys_power_on(struct generic_pm_domain *genpd)if (ret <0 ) goto err_pwr_ack; -
Oh, this belongs in patch [04/11].
Quoted 252 lines
drivers/soc/mediatek/mtk-scpsys.c +225
-1val &= ~PWR_CLK_DIS_BIT ;writel (val, ctl_addr);@@ -1179,6 +1179,217 @@ static const struct scp_subdomain scp_subdomain_mt8173[] = { {MT8173_POWER_DOMAIN_MFG_2D, MT8173_POWER_DOMAIN_MFG}, }; +/* +* MT8183 power domain support +*/ + +static const struct scp_domain_data scp_domain_data_mt8183[] = { + [MT8183_POWER_DOMAIN_AUDIO ] = { + .name ="audio" , + .sta_mask =PWR_STATUS_AUDIO , + .ctl_offs =0x0314 , + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (15 ,12 ), + .basic_clk_name = {"audio" ,"audio1" ,"audio2" }, + }, + [MT8183_POWER_DOMAIN_CONN ] = { + .name ="conn" , + .sta_mask =PWR_STATUS_CONN , + .ctl_offs =0x032c , + .sram_pdn_bits =0 , + .sram_pdn_ack_bits =0 , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (13 ) |BIT (14 ),BIT (13 ) |BIT (14 )), + }, + }, + [MT8183_POWER_DOMAIN_MFG_ASYNC ] = { + .name ="mfg_async" , + .sta_mask =PWR_STATUS_MFG_ASYNC , + .ctl_offs =0x0334 , + .sram_pdn_bits =0 , + .sram_pdn_ack_bits =0 , + .basic_clk_name = {"mfg" }, + }, + [MT8183_POWER_DOMAIN_MFG ] = { + .name ="mfg" , + .sta_mask =PWR_STATUS_MFG , + .ctl_offs =0x0338 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + }, + [MT8183_POWER_DOMAIN_MFG_CORE0 ] = { + .name ="mfg_core0" , + .sta_mask =BIT (7 ), + .ctl_offs =0x034c , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + }, + [MT8183_POWER_DOMAIN_MFG_CORE1 ] = { + .name ="mfg_core1" , + .sta_mask =BIT (20 ), + .ctl_offs =0x0310 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + }, + [MT8183_POWER_DOMAIN_MFG_2D ] = { + .name ="mfg_2d" , + .sta_mask =PWR_STATUS_MFG_2D , + .ctl_offs =0x0348 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2a8 ,0x2ac ,0 ,0x258 , +BIT (19 ) |BIT (20 ) |BIT (21 ), +BIT (19 ) |BIT (20 ) |BIT (21 )), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (21 ) |BIT (22 ),BIT (21 ) |BIT (22 )), + }, + }, + [MT8183_POWER_DOMAIN_DISP ] = { + .name ="disp" , + .sta_mask =PWR_STATUS_DISP , + .ctl_offs =0x030c , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .basic_clk_name = {"mm" }, + .subsys_clk_prefix ="mm" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2a8 ,0x2ac ,0 ,0x258 , +BIT (16 ) |BIT (17 ),BIT (16 ) |BIT (17 )), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (10 ) |BIT (11 ),BIT (10 ) |BIT (11 )), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +GENMASK (7 ,0 ),GENMASK (7 ,0 )), + }, + }, + [MT8183_POWER_DOMAIN_CAM ] = { + .name ="cam" , + .sta_mask =BIT (25 ), + .ctl_offs =0x0344 , + .sram_pdn_bits =GENMASK (9 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_name = {"cam" }, + .subsys_clk_prefix ="cam" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (4 ) |BIT (5 ) |BIT (9 ) |BIT (13 ), +BIT (4 ) |BIT (5 ) |BIT (9 ) |BIT (13 )), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (28 ),BIT (28 )), +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (11 ),0 ), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (3 ) |BIT (4 ),BIT (3 ) |BIT (4 )), + }, + }, + [MT8183_POWER_DOMAIN_ISP ] = { + .name ="isp" , + .sta_mask =PWR_STATUS_ISP , + .ctl_offs =0x0308 , + .sram_pdn_bits =GENMASK (9 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_name = {"isp" }, + .subsys_clk_prefix ="isp" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (3 ) |BIT (8 ),BIT (3 ) |BIT (8 )), +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (10 ),0 ), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (2 ),BIT (2 )), + }, + }, + [MT8183_POWER_DOMAIN_VDEC ] = { + .name ="vdec" , + .sta_mask =BIT (31 ), + .ctl_offs =0x0300 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_table = { +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (7 ),BIT (7 )), + }, + }, + [MT8183_POWER_DOMAIN_VENC ] = { + .name ="venc" , + .sta_mask =PWR_STATUS_VENC , + .ctl_offs =0x0304 , + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (15 ,12 ), + .bp_table = { +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (1 ),BIT (1 )), + }, + }, + [MT8183_POWER_DOMAIN_VPU_TOP ] = { + .name ="vpu_top" , + .sta_mask =BIT (26 ), + .ctl_offs =0x0324 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .basic_clk_name = {"vpu" ,"vpu1" }, + .subsys_clk_prefix ="vpu" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +GENMASK (9 ,6 ) |BIT (12 ), +GENMASK (9 ,6 ) |BIT (12 )), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (27 ),BIT (27 )), +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (10 ) |BIT (11 ),BIT (10 ) |BIT (11 )), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (5 ) |BIT (6 ),BIT (5 ) |BIT (6 )), + }, + }, + [MT8183_POWER_DOMAIN_VPU_CORE0 ] = { + .name ="vpu_core0" , + .sta_mask =BIT (27 ), + .ctl_offs =0x33c , + .sram_iso_ctrl = true, + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_name = {"vpu2" }, + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +BIT (6 ),BIT (6 )), +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +BIT (0 ) |BIT (2 ) |BIT (4 ), +BIT (0 ) |BIT (2 ) |BIT (4 )), + }, + }, + [MT8183_POWER_DOMAIN_VPU_CORE1 ] = { + .name ="vpu_core1" , + .sta_mask =BIT (28 ), + .ctl_offs =0x0340 , + .sram_iso_ctrl = true, + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_name = {"vpu3" }, + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +BIT (7 ),BIT (7 )), +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +BIT (1 ) |BIT (3 ) |BIT (5 ), +BIT (1 ) |BIT (3 ) |BIT (5 )), + }, + }, +}; + +static const struct scp_subdomain scp_subdomain_mt8183[] = { + {MT8183_POWER_DOMAIN_MFG_ASYNC ,MT8183_POWER_DOMAIN_MFG }, + {MT8183_POWER_DOMAIN_MFG ,MT8183_POWER_DOMAIN_MFG_2D }, + {MT8183_POWER_DOMAIN_MFG ,MT8183_POWER_DOMAIN_MFG_CORE0 }, + {MT8183_POWER_DOMAIN_MFG ,MT8183_POWER_DOMAIN_MFG_CORE1 }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_CAM }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_ISP }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_VDEC }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_VENC }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_VPU_TOP }, + {MT8183_POWER_DOMAIN_VPU_TOP ,MT8183_POWER_DOMAIN_VPU_CORE0 }, + {MT8183_POWER_DOMAIN_VPU_TOP ,MT8183_POWER_DOMAIN_VPU_CORE1 }, +}; +static const struct scp_soc_data mt2701_data = { .domains = scp_domain_data_mt2701, .num_domains = ARRAY_SIZE(scp_domain_data_mt2701),@@ -1245,6 +1456,17 @@ static const struct scp_soc_data mt8173_data = { .bus_prot_reg_update = true, }; +static const struct scp_soc_data mt8183_data = { + .domains = scp_domain_data_mt8183, + .num_domains =ARRAY_SIZE (scp_domain_data_mt8183), + .subdomains = scp_subdomain_mt8183, + .num_subdomains =ARRAY_SIZE (scp_subdomain_mt8183), + .regs = { + .pwr_sta_offs =0x0180 , + .pwr_sta2nd_offs =0x0184 + } +}; +/* * scpsys driver init */ @@ -1268,6 +1490,9 @@ static const struct of_device_id of_scpsys_match_tbl[] = { }, { .compatible = "mediatek,mt8173-scpsys", .data = &mt8173_data, + }, { + .compatible = "mediatek,mt8183-scpsys", + .data = &mt8183_data, }, { /* sentinel */ } --2.18.0