Introduce MediaTek frequency hopping driver
Subsystems (3)
v2 cover Introduce MediaTek frequency hopping driver
The purpose of this serie is to enhance frequency hopping and spread spectrum clocking feature for MT8186.
We introduce new PLL register APIs and some helpers for FHCTL hardware control. For MT8186 PLL driver, we replace mtk_clk_register_plls() with newly added API to support frequency hopping and SSC function for specific PLLs.
Changes in v2:
- Use SoC-specific compatible instead of generic one.
- Use standard clocks property and vendor-specific property in dt-binding.
- Remove some unused arguments and fix some coding style.
Johnson Wang (4):
clk: mediatek: Export PLL operations symbols
dt-bindings: arm: mediatek: Add new bindings of MediaTek frequency
hopping
clk: mediatek: Add new clock driver to handle FHCTL hardware
clk: mediatek: Change PLL register API for MT8186
.../bindings/arm/mediatek/mediatek,fhctl.yaml | 47 +++ drivers/clk/mediatek/Makefile | 2 +- drivers/clk/mediatek/clk-fhctl.c | 244 ++++++++++++++++ drivers/clk/mediatek/clk-fhctl.h | 26 ++ drivers/clk/mediatek/clk-mt8186-apmixedsys.c | 66 ++++- drivers/clk/mediatek/clk-pll.c | 84 +++--- drivers/clk/mediatek/clk-pll.h | 56 ++++ drivers/clk/mediatek/clk-pllfh.c | 268 ++++++++++++++++++ drivers/clk/mediatek/clk-pllfh.h | 82 ++++++ 9 files changed, 821 insertions(+), 54 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml create mode 100644 drivers/clk/mediatek/clk-fhctl.c create mode 100644 drivers/clk/mediatek/clk-fhctl.h create mode 100644 drivers/clk/mediatek/clk-pllfh.c create mode 100644 drivers/clk/mediatek/clk-pllfh.h
Signature · 1 line
2.18.0
PATCH v2 1/4 clk: mediatek: Export PLL operations symbols
Export PLL operations and register functions for different type of clock driver used.
--- drivers/clk/mediatek/clk-pll.c | 84 ++++++++++++++-------------------- drivers/clk/mediatek/clk-pll.h | 56 +++++++++++++++++++++++ 2 files changed, 90 insertions(+), 50 deletions(-)
drivers/clk/mediatek/clk-pll.c +34 -50
@@ -27,37 +27,10 @@#define AUDPLL_TUNER_EN BIT(31) -#define POSTDIV_MASK 0x7 -/* default 7 bits integer, can be overridden with pcwibits. */ #define INTEGER_BITS 7 -/* -* MediaTek PLLs are configured through their pcw value. The pcw value describes -* a divider in the PLL feedback loop which consists of 7 bits for the integer -* part and the remaining bits (if present) for the fractional part. Also they -* have a 3 bit power-of-two post divider. -*/ - -struct mtk_clk_pll { -struct clk_hw hw; -void __iomem *base_addr; -void __iomem *pd_addr; -void __iomem *pwr_addr; -void __iomem *tuner_addr; -void __iomem *tuner_en_addr; -void __iomem *pcw_addr; -void __iomem *pcw_chg_addr; -void __iomem *en_addr; -const struct mtk_pll_data *data; -}; - -static inline struct mtk_clk_pll *to_mtk_clk_pll (struct clk_hw *hw) -{ - return container_of(hw, struct mtk_clk_pll, hw); -} - -static int mtk_pll_is_prepared (struct clk_hw *hw) +int mtk_pll_is_prepared (struct clk_hw *hw) {struct mtk_clk_pll *pll =to_mtk_clk_pll (hw);
@@ -161,8 +134,8 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,* @fin: The input frequency * */ -static void mtk_pll_calc_values (struct mtk_clk_pll *pll,u32 *pcw,u32 *postdiv, -u32 freq,u32 fin) +void mtk_pll_calc_values (struct mtk_clk_pll *pll,u32 *pcw,u32 *postdiv, +u32 freq,u32 fin) {unsigned long fmin = pll->data->fmin ? pll->data->fmin : (1000 *MHZ );const struct mtk_pll_div_table *div_table = pll->data->div_table;
@@ -198,8 +171,8 @@ static void mtk_pll_calc_values(struct mtk_clk_pll *pll, u32 *pcw, u32 *postdiv, *pcw = (u32 )_pcw; } -static int mtk_pll_set_rate (struct clk_hw *hw,unsigned long rate, -unsigned long parent_rate) +int mtk_pll_set_rate (struct clk_hw *hw,unsigned long rate, +unsigned long parent_rate) {struct mtk_clk_pll *pll =to_mtk_clk_pll (hw);u32 pcw =0 ;
@@ -211,8 +184,7 @@ static int mtk_pll_set_rate(struct clk_hw *hw, unsigned long rate,return 0 ; } -static unsigned long mtk_pll_recalc_rate (struct clk_hw *hw, -unsigned long parent_rate) +unsigned long mtk_pll_recalc_rate (struct clk_hw *hw,unsigned long parent_rate) {struct mtk_clk_pll *pll =to_mtk_clk_pll (hw);u32 postdiv;
@@ -227,8 +199,8 @@ static unsigned long mtk_pll_recalc_rate(struct clk_hw *hw,return __mtk_pll_recalc_rate (pll, parent_rate, pcw, postdiv); } -static long mtk_pll_round_rate (struct clk_hw *hw,unsigned long rate, -unsigned long *prate) +long mtk_pll_round_rate (struct clk_hw *hw,unsigned long rate, +unsigned long *prate) {struct mtk_clk_pll *pll =to_mtk_clk_pll (hw);u32 pcw =0 ;
@@ -239,7 +211,7 @@ static long mtk_pll_round_rate(struct clk_hw *hw, unsigned long rate,return __mtk_pll_recalc_rate (pll, *prate, pcw, postdiv); } -static int mtk_pll_prepare (struct clk_hw *hw) +int mtk_pll_prepare (struct clk_hw *hw) {struct mtk_clk_pll *pll =to_mtk_clk_pll (hw);u32 r;
@@ -273,7 +245,7 @@ static int mtk_pll_prepare(struct clk_hw *hw)return 0 ; } -static void mtk_pll_unprepare (struct clk_hw *hw) +void mtk_pll_unprepare (struct clk_hw *hw) {struct mtk_clk_pll *pll =to_mtk_clk_pll (hw);u32 r;
@@ -301,7 +273,7 @@ static void mtk_pll_unprepare(struct clk_hw *hw)writel (r, pll->pwr_addr); } -static const struct clk_ops mtk_pll_ops = { +const struct clk_ops mtk_pll_ops = { .is_prepared = mtk_pll_is_prepared, .prepare = mtk_pll_prepare, .unprepare = mtk_pll_unprepare,
@@ -310,18 +282,15 @@ static const struct clk_ops mtk_pll_ops = { .set_rate = mtk_pll_set_rate, }; -static struct clk_hw *mtk_clk_register_pll (const struct mtk_pll_data *data, -void __iomem *base) +struct clk_hw *mtk_clk_register_pll_ops (struct mtk_clk_pll *pll, +const struct mtk_pll_data *data, +void __iomem *base, +const struct clk_ops *pll_ops) { -struct mtk_clk_pll *pll;struct clk_init_data init = {};int ret;const char *parent_name ="clk26m" ; - pll =kzalloc (sizeof (*pll),GFP_KERNEL ); -if (!pll) -return ERR_PTR (-ENOMEM ); - pll->base_addr = base + data->reg; pll->pwr_addr = base + data->pwr_reg; pll->pd_addr = base + data->pd_reg;
@@ -343,7 +312,7 @@ static struct clk_hw *mtk_clk_register_pll(const struct mtk_pll_data *data, init.name = data->name; init.flags = (data->flags &PLL_AO ) ?CLK_IS_CRITICAL :0 ; - init.ops = &mtk_pll_ops; + init.ops = pll_ops;if (data->parent_name) init.parent_names = &data->parent_name;else
@@ -360,7 +329,22 @@ static struct clk_hw *mtk_clk_register_pll(const struct mtk_pll_data *data,return &pll->hw; } -static void mtk_clk_unregister_pll (struct clk_hw *hw) +struct clk_hw *mtk_clk_register_pll (const struct mtk_pll_data *data, +void __iomem *base) +{ +struct mtk_clk_pll *pll; +struct clk_hw *hw; + + pll =kzalloc (sizeof (*pll),GFP_KERNEL ); +if (!pll) +return ERR_PTR (-ENOMEM ); + + hw =mtk_clk_register_pll_ops (pll, data, base, &mtk_pll_ops); + +return hw; +} + +void mtk_clk_unregister_pll (struct clk_hw *hw) {struct mtk_clk_pll *pll;
@@ -423,8 +407,8 @@ int mtk_clk_register_plls(struct device_node *node, }EXPORT_SYMBOL_GPL (mtk_clk_register_plls); -static __iomem void *mtk_clk_pll_get_base (struct clk_hw *hw, -const struct mtk_pll_data *data) +__iomem void *mtk_clk_pll_get_base (struct clk_hw *hw, +const struct mtk_pll_data *data) {struct mtk_clk_pll *pll =to_mtk_clk_pll (hw);
drivers/clk/mediatek/clk-pll.h +56 -0
78 lines not on this page · raw message
Signature · 1 line
2.18.0
PATCH v2 2/4 dt-bindings: arm: mediatek: Add new bindings of MediaTek frequency hopping
In reply to Johnson WangAdd the new binding documentation for MediaTek frequency hopping and spread spectrum clocking control.
--- .../bindings/arm/mediatek/mediatek,fhctl.yaml | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +47 -0
@@ -0,0 +1,47 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/arm/mediatek/mediatek,fhctl.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MediaTek frequency hopping and spread spectrum clocking control + +maintainers: + - Edward-JW Yang <[email protected]> + +description: | + Frequency hopping control (FHCTL) is a piece of hardware that control + some PLLs to adopt "hopping" mechanism to adjust their frequency. + Spread spectrum clocking (SSC) is another function provided by this hardware. + +properties: + compatible: + const: mediatek,mt8186-fhctl + + reg: + maxItems: 1 + + clocks: + description: Phandles of the PLL with FHCTL hardware capability. + + mediatek,hopping-ssc-percents: + description: The percentage of spread spectrum clocking for one PLL. + $ref: /schemas/types.yaml#/definitions/uint32 + maximum: 8 + +required: + - compatible + - reg + - clocks + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/mt8186-clk.h> + fhctl: fhctl@1000ce00 { + compatible = "mediatek,mt8186-fhctl"; + reg = <0x1000c000 0xe00>; + clocks = <&apmixedsys CLK_APMIXED_MSDCPLL>; + mediatek,hopping-ssc-percents = <3>; + };
Signature · 1 line
2.18.0
AngeloGioacchino Del Regno
maintainerRe: [PATCH v2 2/4] dt-bindings: arm: mediatek: Add new bindings of MediaTek frequency hopping
Il 14/09/22 14:45, Johnson Wang ha scritto:
Quoted 29 lines
Add the new binding documentation for MediaTek frequency hopping and spread spectrum clocking control.
Co-developed-by Edward-JW Yang <[email protected]>Signed-off-by Edward-JW Yang <[email protected]>Signed-off-by Johnson Wang <[email protected]>--- .../bindings/arm/mediatek/mediatek,fhctl.yaml | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+)create mode 100644
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yamlDocumentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +12
-0@@ -0,0 +1,47 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/arm/mediatek/mediatek,fhctl.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MediaTek frequency hopping and spread spectrum clocking control + +maintainers: + - Edward-JW Yang <[email protected]> + +description: |
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml line 22
Quoted 10 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +10
-0+ Frequency hopping control (FHCTL) is a piece of hardware that control + some PLLs to adopt "hopping" mechanism to adjust their frequency. + Spread spectrum clocking (SSC) is another function provided by this hardware. + +properties: + compatible: + const: mediatek,mt8186-fhctl + + reg: + maxItems: 1
There are still a few issues in this binding that I can immediately see...
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml line 24
Quoted 2 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +2
-0+ + clocks:
MT8195 has 23 PLLs, MT8186 has 14, but perhaps in the future we may see something more than that on some newer SoC, so...
clocks:
maxItems: 30
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml line 29
Quoted 5 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +5
-0+ description: Phandles of the PLL with FHCTL hardware capability. + + mediatek,hopping-ssc-percents: + description: The percentage of spread spectrum clocking for one PLL. + $ref: /schemas/types.yaml#/definitions/uint32
This is an array, so...
$ref: /schemas/types.yaml#/definitions/uint32-array
...also, maxItems?
and you should also specify:
default: 0 <- because, by default, SSC is disabled
minimum: 0 <- because this is the minimum accepted value
Regards,
Angelo
Quoted 18 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +18
-0+ maximum: 8 + +required: + - compatible + - reg + - clocks + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/mt8186-clk.h> + fhctl: fhctl@1000ce00 { + compatible = "mediatek,mt8186-fhctl"; + reg = <0x1000c000 0xe00>; + clocks = <&apmixedsys CLK_APMIXED_MSDCPLL>; + mediatek,hopping-ssc-percents = <3>; + };
Re: [PATCH v2 2/4] dt-bindings: arm: mediatek: Add new bindings of MediaTek frequency hopping
Hi Angelo,
Thanks for your review.
Quoted 63 lines · AngeloGioacchino Del Regno
Il 14/09/22 14:45, Johnson Wang ha scritto:
Quoted 48 lines
Add the new binding documentation for MediaTek frequency hopping and spread spectrum clocking control.
Co-developed-by Edward-JW Yang <[email protected]>Signed-off-by Edward-JW Yang <[email protected]>Signed-off-by Johnson Wang <[email protected]>--- .../bindings/arm/mediatek/mediatek,fhctl.yaml | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+)create mode 100644
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yamldiff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yam l b/Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yam l
new file mode 100644
index 000000000000..7b0fd0889bb6
---/dev/null
+++
b/Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yam lDocumentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +4
-0@@ -0,0 +1,47 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id:(quoted diff) +2
-0+ +title: MediaTek frequency hopping and spread spectrum clockingcontrol
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +6
-0+ +maintainers: + - Edward-JW Yang <[email protected]> + +description: | + Frequency hopping control (FHCTL) is a piece of hardware thatcontrol
+ some PLLs to adopt "hopping" mechanism to adjust their frequency.
+ Spread spectrum clocking (SSC) is another function provided by this hardware.Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml line 22
Quoted 7 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +7
-0+ +properties: + compatible: + const: mediatek,mt8186-fhctl + + reg: + maxItems: 1There are still a few issues in this binding that I can immediately see...
Review
Quoted 2 lines
(quoted diff) +2
-0+ + clocks:
Quoted 6 lines
MT8195 has 23 PLLs, MT8186 has 14, but perhaps in the future we may see
something more than that on some newer SoC, so...clocks:
maxItems: 30
May I add "minItems: 1" to clocks property?
Without this, dt_binding_check will fail because we don't have enough clocks in the example. (Both MT8195 and MT8186 don't have 30 PLLs)
Quoted 9 lines
Quoted 8 lines
+ description: Phandles of the PLL with FHCTL hardware
capability.Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +3
-0+ + mediatek,hopping-ssc-percents: + description: The percentage of spread spectrum clocking forone PLL.
+ $ref: /schemas/types.yaml#/definitions/uint32
Quoted 4 lines
This is an array, so...
$ref: /schemas/types.yaml#/definitions/uint32-array...also, maxItems?
As you know, mediatek,hopping-ssc-percents property is used to specify ssc rate for matching clocks.
If we have to add maxItems, I think we should specify the same value as clocks property. Is my understanding wrong?
Thanks!
BRs,
Johnson Wang
Quoted 30 lines
and you should also specify:
default: 0 <- because, by default, SSC is disabled
minimum: 0 <- because this is the minimum accepted valueRegards,
AngeloQuoted 18 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +18
-0+ maximum: 8 + +required: + - compatible + - reg + - clocks + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/mt8186-clk.h> + fhctl: fhctl@1000ce00 { + compatible = "mediatek,mt8186-fhctl"; + reg = <0x1000c000 0xe00>; + clocks = <&apmixedsys CLK_APMIXED_MSDCPLL>; + mediatek,hopping-ssc-percents = <3>; + };
AngeloGioacchino Del Regno
maintainerRe: [PATCH v2 2/4] dt-bindings: arm: mediatek: Add new bindings of MediaTek frequency hopping
Il 15/09/22 06:00, Johnson Wang ha scritto:
Quoted 68 lines
Hi Angelo,
Thanks for your review.
Quoted 63 lines · AngeloGioacchino Del Regno
Il 14/09/22 14:45, Johnson Wang ha scritto:
Quoted 48 lines
Add the new binding documentation for MediaTek frequency hopping and spread spectrum clocking control.
Co-developed-by Edward-JW Yang <[email protected]>Signed-off-by Edward-JW Yang <[email protected]>Signed-off-by Johnson Wang <[email protected]>--- .../bindings/arm/mediatek/mediatek,fhctl.yaml | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+)create mode 100644
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yamldiff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yam l b/Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yam l
new file mode 100644
index 000000000000..7b0fd0889bb6
---/dev/null
+++
b/Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yam lDocumentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +4
-0@@ -0,0 +1,47 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id:(quoted diff) +2
-0+ +title: MediaTek frequency hopping and spread spectrum clockingcontrol
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +6
-0+ +maintainers: + - Edward-JW Yang <[email protected]> + +description: | + Frequency hopping control (FHCTL) is a piece of hardware thatcontrol
+ some PLLs to adopt "hopping" mechanism to adjust their frequency.
+ Spread spectrum clocking (SSC) is another function provided by this hardware.Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml line 22
Quoted 7 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +7
-0+ +properties: + compatible: + const: mediatek,mt8186-fhctl + + reg: + maxItems: 1There are still a few issues in this binding that I can immediately see...
Quoted 2 lines
(quoted diff) +2
-0+ + clocks:
Quoted 9 lines
Quoted 6 lines
MT8195 has 23 PLLs, MT8186 has 14, but perhaps in the future we may see
something more than that on some newer SoC, so...clocks:
maxItems: 30May I add "minItems: 1" to clocks property?
Of course you can! Sorry for the incomplete advice here :-)
Quoted 15 lines
Without this,
dt_binding_checkwill fail because we don't have enough clocks in the example. (Both MT8195 and MT8186 don't have 30 PLLs)Quoted 12 lines
Quoted 8 lines
+ description: Phandles of the PLL with FHCTL hardware
capability.Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +3
-0+ + mediatek,hopping-ssc-percents: + description: The percentage of spread spectrum clocking forone PLL.
+ $ref: /schemas/types.yaml#/definitions/uint32This is an array, so...
$ref: /schemas/types.yaml#/definitions/uint32-array
Quoted 8 lines
Quoted 1 line
...also, maxItems?
As you know, mediatek,hopping-ssc-percents property is used to specify ssc rate for matching clocks.
If we have to add maxItems, I think we should specify the same value as clocks property. Is my understanding wrong?
Your understanding is right. The number of min/max items on the ssc percents will be the same as clocks.
Regards,
Angelo
Quoted 36 lines
Thanks!
BRs,
Johnson WangQuoted 30 lines
and you should also specify:
default: 0 <- because, by default, SSC is disabled
minimum: 0 <- because this is the minimum accepted valueRegards,
AngeloQuoted 18 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +18
-0+ maximum: 8 + +required: + - compatible + - reg + - clocks + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/mt8186-clk.h> + fhctl: fhctl@1000ce00 { + compatible = "mediatek,mt8186-fhctl"; + reg = <0x1000c000 0xe00>; + clocks = <&apmixedsys CLK_APMIXED_MSDCPLL>; + mediatek,hopping-ssc-percents = <3>; + };
Signature · 6 lines
AngeloGioacchino Del Regno Software Engineer Collabora Ltd. Platinum Building, St John's Innovation Park, Cambridge CB4 0DS, UK Registered in England & Wales, no. 5513718
Re: [PATCH v2 2/4] dt-bindings: arm: mediatek: Add new bindings of MediaTek frequency hopping
In reply to Johnson WangDocumentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml
Quoted 16 lines · Johnson Wang
Add the new binding documentation for MediaTek frequency hopping and spread spectrum clocking control.
Co-developed-by Edward-JW Yang <[email protected]>Signed-off-by Edward-JW Yang <[email protected]>Signed-off-by Johnson Wang <[email protected]>--- .../bindings/arm/mediatek/mediatek,fhctl.yaml | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yamlDocumentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +0
-0
Name of file matching compatible.
Quoted 16 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +15
-0@@ -0,0 +1,47 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/arm/mediatek/mediatek,fhctl.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MediaTek frequency hopping and spread spectrum clocking control + +maintainers: + - Edward-JW Yang <[email protected]> + +description: | + Frequency hopping control (FHCTL) is a piece of hardware that control + some PLLs to adopt "hopping" mechanism to adjust their frequency. + Spread spectrum clocking (SSC) is another function provided by this hardware.
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml line 25
Quoted 10 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +10
-0+ +properties: + compatible: + const: mediatek,mt8186-fhctl + + reg: + maxItems: 1 + + clocks: + description: Phandles of the PLL with FHCTL hardware capability.
You need constraints here.
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml line 27
Quoted 2 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +2
-0+ + mediatek,hopping-ssc-percents:
That's not the correct unit suffix name.
https://github.com/devicetree-org/dt-schema/blob/main/dtschema/schemas/property-units.yaml
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml line 29
Quoted 2 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +2
-0+ description: The percentage of spread spectrum clocking for one PLL. + $ref: /schemas/types.yaml#/definitions/uint32
Best regards,
Krzysztof
Re: [PATCH v2 2/4] dt-bindings: arm: mediatek: Add new bindings of MediaTek frequency hopping
Hi Krzysztof,
Sorry for the late reply.
Thanks for your review.
Quoted 26 lines · Krzysztof Kozlowski
Quoted 13 lines · Johnson Wang
Add the new binding documentation for MediaTek frequency hopping and spread spectrum clocking control.
Co-developed-by Edward-JW Yang <[email protected]>Signed-off-by Edward-JW Yang <[email protected]>Signed-off-by Johnson Wang <[email protected]>--- .../bindings/arm/mediatek/mediatek,fhctl.yaml | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yamlQuoted 11 lines
diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yam l b/Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yam l
new file mode 100644
index 000000000000..7b0fd0889bb6
---/dev/null
+++
b/Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yam l
Quoted 1 line
Name of file matching compatible.
I will change file name in the next version.
Quoted 30 lines
Quoted 30 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +4
-0@@ -0,0 +1,47 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id:(quoted diff) +2
-0+ +title: MediaTek frequency hopping and spread spectrum clockingcontrol
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +6
-0+ +maintainers: + - Edward-JW Yang <[email protected]> + +description: | + Frequency hopping control (FHCTL) is a piece of hardware thatcontrol
+ some PLLs to adopt "hopping" mechanism to adjust their frequency.
+ Spread spectrum clocking (SSC) is another function provided by this hardware.Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +5
-0+ +properties: + compatible: + const: mediatek,mt8186-fhctl +
Quoted 8 lines
Quoted 6 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,fhctl.yaml new file +5
-0+ reg: + maxItems: 1 + + clocks: + description: Phandles of the PLL with FHCTL hardwarecapability.
You need constraints here.
I will improve this in the next version.
Quoted 6 lines
Review
Quoted 3 lines
(quoted diff) +2
-0+ + mediatek,hopping-ssc-percents:That's not the correct unit suffix name.
I will go with "mediatek,hopping-ssc-percent" in the next version.
Thanks!
BRs,
Johnson Wang
Quoted 9 lines
Quoted 6 lines
+ description: The percentage of spread spectrum clocking for
one PLL.
+ $ref: /schemas/types.yaml#/definitions/uint32Best regards,
Krzysztof
PATCH v2 3/4 clk: mediatek: Add new clock driver to handle FHCTL hardware
In reply to Johnson WangTo implement frequency hopping and spread spectrum clocking function, we introduce new clock type and APIs to handle FHCTL hardware.
--- drivers/clk/mediatek/Makefile | 2 +- drivers/clk/mediatek/clk-fhctl.c | 244 ++++++++++++++++++++++++++++ drivers/clk/mediatek/clk-fhctl.h | 26 +++ drivers/clk/mediatek/clk-pllfh.c | 268 +++++++++++++++++++++++++++++++ drivers/clk/mediatek/clk-pllfh.h | 82 ++++++++++ 5 files changed, 621 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/mediatek/clk-fhctl.c create mode 100644 drivers/clk/mediatek/clk-fhctl.h create mode 100644 drivers/clk/mediatek/clk-pllfh.c create mode 100644 drivers/clk/mediatek/clk-pllfh.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 clk-mux.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 clk-fhctl.o clk-pllfh.o obj-$(CONFIG_COMMON_CLK_MT6765) += clk-mt6765.o obj-$(CONFIG_COMMON_CLK_MT6765_AUDIOSYS) += clk-mt6765-audio.o
drivers/clk/mediatek/clk-fhctl.c new file +244 -0
244 lines not on this page · raw message
drivers/clk/mediatek/clk-fhctl.h new file +26 -0
@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2022 MediaTek Inc. +* Author: Edward-JW Yang <[email protected]> +*/ + +#ifndef __CLK_FHCTL_H +#define __CLK_FHCTL_H + +struct fhctl_offset { +u32 offset_hp_en; +u32 offset_clk_con; +u32 offset_rst_con; +u32 offset_slope0; +u32 offset_slope1; +u32 offset_cfg; +u32 offset_updnlmt; +u32 offset_dds; +u32 offset_dvfs; +u32 offset_mon; +}; +const struct fhctl_offset *fhctl_get_offset_table (void ); +const struct fh_operation *fhctl_get_ops (void ); +void fhctl_hw_init (struct mtk_fh *fh); + +#endif
drivers/clk/mediatek/clk-pllfh.c new file +268 -0
268 lines not on this page · raw message
drivers/clk/mediatek/clk-pllfh.h new file +82 -0
82 lines not on this page · raw message
Signature · 1 line
2.18.0
Re: [PATCH v2 3/4] clk: mediatek: Add new clock driver to handle FHCTL hardware
Quoted 24 lines · Johnson Wang
To implement frequency hopping and spread spectrum clocking function, we introduce new clock type and APIs to handle FHCTL hardware.
Co-developed-by Edward-JW Yang <[email protected]>Signed-off-by Edward-JW Yang <[email protected]>Signed-off-by Johnson Wang <[email protected]>--- drivers/clk/mediatek/Makefile | 2 +- drivers/clk/mediatek/clk-fhctl.c | 244 ++++++++++++++++++++++++++++ drivers/clk/mediatek/clk-fhctl.h | 26 +++ drivers/clk/mediatek/clk-pllfh.c | 268 +++++++++++++++++++++++++++++++ drivers/clk/mediatek/clk-pllfh.h | 82 ++++++++++ 5 files changed, 621 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/mediatek/clk-fhctl.c create mode 100644 drivers/clk/mediatek/clk-fhctl.h create mode 100644 drivers/clk/mediatek/clk-pllfh.c create mode 100644 drivers/clk/mediatek/clk-pllfh.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 clk-mux.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 clk-fhctl.o clk-pllfh.o
We need to add a config for clk-fhctl.o and clk-pllfh.o. It's only used by specfic project.
Quoted 650 lines
drivers/clk/mediatek/Makefile +0
-0obj-$(CONFIG_COMMON_CLK_MT6765) += clk-mt6765.o obj-$(CONFIG_COMMON_CLK_MT6765_AUDIOSYS) += clk-mt6765-audio.odrivers/clk/mediatek/clk-fhctl.c new file +244
-0@@ -0,0 +1,244 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (c) 2022 MediaTek Inc. +* Author: Edward-JW Yang <[email protected]> +*/ + +#include <linux/io.h> +#include <linux/iopoll.h> + +#include "clk-mtk.h" +#include "clk-pllfh.h" +#include "clk-fhctl.h" + +#define PERCENT_TO_DDSLMT (dds, percent_m10) \ + ((((dds) * (percent_m10)) >> 5) / 100) + +static const struct fhctl_offset fhctl_offset = { + .offset_hp_en =0x0 , + .offset_clk_con =0x8 , + .offset_rst_con =0xc , + .offset_slope0 =0x10 , + .offset_slope1 =0x14 , + .offset_cfg =0x0 , + .offset_updnlmt =0x4 , + .offset_dds =0x8 , + .offset_dvfs =0xc , + .offset_mon =0x10 , +}; + +const struct fhctl_offset *fhctl_get_offset_table (void ) +{ +return &fhctl_offset; +} + +static void dump_hw (struct mtk_clk_pll *pll,struct fh_pll_regs *regs, +const struct fh_pll_data *data) +{ +pr_info ("hp_en<%x>,clk_con<%x>,slope0<%x>,slope1<%x>\n" , +readl (regs->reg_hp_en),readl (regs->reg_clk_con), +readl (regs->reg_slope0),readl (regs->reg_slope1)); +pr_info ("cfg<%x>,lmt<%x>,dds<%x>,dvfs<%x>,mon<%x>\n" , +readl (regs->reg_cfg),readl (regs->reg_updnlmt), +readl (regs->reg_dds),readl (regs->reg_dvfs), +readl (regs->reg_mon)); +pr_info ("pcw<%x>\n" ,readl (pll->pcw_addr)); +} + +static int fhctl_set_ssc_regs (struct mtk_clk_pll *pll,struct fh_pll_regs *regs, +const struct fh_pll_data *data,u32 rate) +{ +u32 updnlmt_val, r; + +writel ((readl (regs->reg_cfg) & ~(data->frddsx_en)), regs->reg_cfg); +writel ((readl (regs->reg_cfg) & ~(data->sfstrx_en)), regs->reg_cfg); +writel ((readl (regs->reg_cfg) & ~(data->fhctlx_en)), regs->reg_cfg); + +if (rate >0 ) { +/* Set the relative parameter registers (dt/df/upbnd/downbnd) */ + r =readl (regs->reg_cfg); + r &= ~(data->msk_frddsx_dys); + r |= (data->df_val << (ffs (data->msk_frddsx_dys) -1 )); +writel (r, regs->reg_cfg); + + r =readl (regs->reg_cfg); + r &= ~(data->msk_frddsx_dts); + r |= (data->dt_val << (ffs (data->msk_frddsx_dts) -1 )); +writel (r, regs->reg_cfg); + +writel ((readl (pll->pcw_addr) & data->dds_mask) | data->tgl_org, + regs->reg_dds); + +/* Calculate UPDNLMT */ + updnlmt_val =PERCENT_TO_DDSLMT ((readl (regs->reg_dds) & + data->dds_mask), rate) << + data->updnlmt_shft; + +writel (updnlmt_val, regs->reg_updnlmt); +writel (readl (regs->reg_hp_en) |BIT (data->fh_id), + regs->reg_hp_en); +/* Enable SSC */ +writel (readl (regs->reg_cfg) | data->frddsx_en, regs->reg_cfg); +/* Enable Hopping control */ +writel (readl (regs->reg_cfg) | data->fhctlx_en, regs->reg_cfg); + + }else { +/* Switch to APMIXEDSYS control */ +writel (readl (regs->reg_hp_en) & ~BIT (data->fh_id), + regs->reg_hp_en); +/* Wait for DDS to be stable */ +udelay (30 ); + } + +return 0 ; +} + +static int hopping_hw_flow (struct mtk_clk_pll *pll,struct fh_pll_regs *regs, +const struct fh_pll_data *data, +struct fh_pll_state *state,unsigned int new_dds) +{ +u32 dds_mask = data->dds_mask; +u32 mon_dds =0 ; +u32 con_pcw_tmp; +int ret; + +if (state->ssc_rate) +fhctl_set_ssc_regs (pll, regs, data,0 ); + +writel ((readl (pll->pcw_addr) & dds_mask) | data->tgl_org, + regs->reg_dds); + +writel (readl (regs->reg_cfg) | data->sfstrx_en, regs->reg_cfg); +writel (readl (regs->reg_cfg) | data->fhctlx_en, regs->reg_cfg); +writel (data->slope0_value, regs->reg_slope0); +writel (data->slope1_value, regs->reg_slope1); + +writel (readl (regs->reg_hp_en) |BIT (data->fh_id), regs->reg_hp_en); +writel ((new_dds) | (data->dvfs_tri), regs->reg_dvfs); + +/* Wait 1000 us until DDS stable */ + ret =readl_poll_timeout_atomic (regs->reg_mon, mon_dds, + (mon_dds & dds_mask) == new_dds, +10 ,1000 ); +if (ret) { +pr_warn ("%s: FHCTL hopping timeout\n" , pll->data->name); +dump_hw (pll, regs, data); + } + + con_pcw_tmp =readl (pll->pcw_addr) & (~dds_mask); + con_pcw_tmp = (con_pcw_tmp | (readl (regs->reg_mon) & dds_mask) | + data->pcwchg); + +writel (con_pcw_tmp, pll->pcw_addr); +writel (readl (regs->reg_hp_en) & ~BIT (data->fh_id), regs->reg_hp_en); + +if (state->ssc_rate) +fhctl_set_ssc_regs (pll, regs, data, state->ssc_rate); + +return ret; +} + +static unsigned int __get_postdiv (struct mtk_clk_pll *pll) +{ +unsigned int regval; + + regval =readl (pll->pd_addr) >> pll->data->pd_shift; + regval &=POSTDIV_MASK ; + +return BIT (regval); +} + +static void __set_postdiv (struct mtk_clk_pll *pll,unsigned int postdiv) +{ +unsigned int regval; + + regval =readl (pll->pd_addr); + regval &= ~(POSTDIV_MASK << pll->data->pd_shift); + regval |= (ffs (postdiv) -1 ) << pll->data->pd_shift; +writel (regval, pll->pd_addr); +} + +static int fhctl_hopping (struct mtk_fh *fh,unsigned int new_dds, +unsigned int postdiv) +{ +const struct fh_pll_data *data = &fh->pllfh_data->data; +struct fh_pll_state *state = &fh->pllfh_data->state; +struct fh_pll_regs *regs = &fh->regs; +struct mtk_clk_pll *pll = &fh->clk_pll; +spinlock_t *lock = fh->lock; +unsigned int pll_postdiv; +unsigned long flags =0 ; +int ret; + +if (postdiv) { + pll_postdiv =__get_postdiv (pll); + +if (postdiv > pll_postdiv) +__set_postdiv (pll, postdiv); + } + +spin_lock_irqsave (lock, flags); + + ret =hopping_hw_flow (pll, regs, data, state, new_dds); + +spin_unlock_irqrestore (lock, flags); + +if (postdiv && postdiv < pll_postdiv) +__set_postdiv (pll, postdiv); + +return ret; +} + +static int fhctl_ssc_enable (struct mtk_fh *fh,u32 rate) +{ +const struct fh_pll_data *data = &fh->pllfh_data->data; +struct fh_pll_state *state = &fh->pllfh_data->state; +struct fh_pll_regs *regs = &fh->regs; +struct mtk_clk_pll *pll = &fh->clk_pll; +spinlock_t *lock = fh->lock; +unsigned long flags =0 ; + +spin_lock_irqsave (lock, flags); + +fhctl_set_ssc_regs (pll, regs, data, rate); + state->ssc_rate = rate; + +spin_unlock_irqrestore (lock, flags); + +return 0 ; +} + +static const struct fh_operation fhctl_ops = { + .hopping = fhctl_hopping, + .ssc_enable = fhctl_ssc_enable, +}; + +const struct fh_operation *fhctl_get_ops (void ) +{ +return &fhctl_ops; +} + +void fhctl_hw_init (struct mtk_fh *fh) +{ +const struct fh_pll_data data = fh->pllfh_data->data; +struct fh_pll_state state = fh->pllfh_data->state; +struct fh_pll_regs regs = fh->regs; +u32 val; + +/* initial hw register */ + val =readl (regs.reg_clk_con) |BIT (data.fh_id); +writel (val, regs.reg_clk_con); + + val =readl (regs.reg_rst_con) & ~BIT (data.fh_id); +writel (val, regs.reg_rst_con); + val =readl (regs.reg_rst_con) |BIT (data.fh_id); +writel (val, regs.reg_rst_con); + +writel (0x0 , regs.reg_cfg); +writel (0x0 , regs.reg_updnlmt); +writel (0x0 , regs.reg_dds); + +/* enable ssc if needed */ +if (state.ssc_rate) + fh->ops->ssc_enable (fh, state.ssc_rate); +}drivers/clk/mediatek/clk-fhctl.h new file +26
-0@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2022 MediaTek Inc. +* Author: Edward-JW Yang <[email protected]> +*/ + +#ifndef __CLK_FHCTL_H +#define __CLK_FHCTL_H + +struct fhctl_offset { +u32 offset_hp_en; +u32 offset_clk_con; +u32 offset_rst_con; +u32 offset_slope0; +u32 offset_slope1; +u32 offset_cfg; +u32 offset_updnlmt; +u32 offset_dds; +u32 offset_dvfs; +u32 offset_mon; +}; +const struct fhctl_offset *fhctl_get_offset_table (void ); +const struct fh_operation *fhctl_get_ops (void ); +void fhctl_hw_init (struct mtk_fh *fh); + +#endif drivers/clk/mediatek/clk-pllfh.c new file +268
-0@@ -0,0 +1,268 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (c) 2022 MediaTek Inc. +* Author: Edward-JW Yang <[email protected]> +*/ + +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/io.h> +#include <linux/slab.h> +#include <linux/clkdev.h> +#include <linux/delay.h> + +#include "clk-mtk.h" +#include "clk-pllfh.h" +#include "clk-fhctl.h" + +static DEFINE_SPINLOCK (pllfh_lock); + +inline struct mtk_fh *to_mtk_fh (struct clk_hw *hw) +{ +struct mtk_clk_pll *pll =to_mtk_clk_pll (hw); + + return container_of(pll, struct mtk_fh, clk_pll); +} + +static int mtk_fhctl_set_rate (struct clk_hw *hw,unsigned long rate, +unsigned long parent_rate) +{ +struct mtk_clk_pll *pll =to_mtk_clk_pll (hw); +struct mtk_fh *fh =to_mtk_fh (hw); +u32 pcw =0 ; +u32 postdiv; + +mtk_pll_calc_values (pll, &pcw, &postdiv, rate, parent_rate); + +return fh->ops->hopping (fh, pcw, postdiv); +} + +static const struct clk_ops mtk_pllfh_ops = { + .is_prepared = mtk_pll_is_prepared, + .prepare = mtk_pll_prepare, + .unprepare = mtk_pll_unprepare, + .recalc_rate = mtk_pll_recalc_rate, + .round_rate = mtk_pll_round_rate, + .set_rate = mtk_fhctl_set_rate, +}; + +static struct mtk_pllfh_data *get_pllfh_by_id (struct mtk_pllfh_data *pllfhs, +int num_fhs,int pll_id) +{ +int i; + +for (i =0 ; i < num_fhs; i++) +if (pllfhs[i].data.pll_id == pll_id) +return &pllfhs[i]; + +return NULL ; +} + +void fhctl_parse_dt (const u8 *compatible_node,struct mtk_pllfh_data *pllfhs, +int num_fhs) +{ +void __iomem *base; +struct device_node *node; +u32 num_clocks, pll_id, ssc_rate; +int offset, i; + + node =of_find_compatible_node (NULL ,NULL , compatible_node); +if (!node) { +pr_err ("cannot find \"%s\"\n" , compatible_node); +return ; + } + + base =of_iomap (node,0 ); +if (!base) { +pr_err ("%s(): ioremap failed\n" , __func__); +return ; + } + + num_clocks =of_clk_get_parent_count (node); +if (!num_clocks) { +pr_err ("%s(): failed to get clocks property\n" , __func__); +return ; + } + +for (i =0 ; i < num_clocks; i++) { +struct mtk_pllfh_data *pllfh; + + offset = i *2 ; + +of_property_read_u32_index (node,"clocks" , offset +1 , &pll_id); +of_property_read_u32_index (node, +"mediatek,hopping-ssc-percents" , + i, &ssc_rate); + + pllfh =get_pllfh_by_id (pllfhs, num_fhs, pll_id); +if (!pllfh) +continue ; + + pllfh->state.fh_enable =1 ; + pllfh->state.ssc_rate = ssc_rate; + pllfh->state.base = base; + } +} + +static void pllfh_init (struct mtk_fh *fh,struct mtk_pllfh_data *pllfh_data) +{ +struct fh_pll_regs *regs = &fh->regs; +const struct fhctl_offset *offset; +void __iomem *base = pllfh_data->state.base; +void __iomem *fhx_base = base + pllfh_data->data.fhx_offset; + + offset =fhctl_get_offset_table (); + + regs->reg_hp_en = base + offset->offset_hp_en; + regs->reg_clk_con = base + offset->offset_clk_con; + regs->reg_rst_con = base + offset->offset_rst_con; + regs->reg_slope0 = base + offset->offset_slope0; + regs->reg_slope1 = base + offset->offset_slope1; + + regs->reg_cfg = fhx_base + offset->offset_cfg; + regs->reg_updnlmt = fhx_base + offset->offset_updnlmt; + regs->reg_dds = fhx_base + offset->offset_dds; + regs->reg_dvfs = fhx_base + offset->offset_dvfs; + regs->reg_mon = fhx_base + offset->offset_mon; + + fh->pllfh_data = pllfh_data; + fh->lock = &pllfh_lock; + + fh->ops =fhctl_get_ops (); +} + +static bool fhctl_is_supported_and_enabled (const struct mtk_pllfh_data *pllfh) +{ +return pllfh && (pllfh->state.fh_enable ==1 ); +} + +static struct clk_hw * +mtk_clk_register_pllfh (const struct mtk_pll_data *pll_data, +struct mtk_pllfh_data *pllfh_data,void __iomem *base) +{ +struct clk_hw *hw; +struct mtk_fh *fh; + + fh =kzalloc (sizeof (*fh),GFP_KERNEL ); +if (!fh) +return ERR_PTR (-ENOMEM ); + +pllfh_init (fh, pllfh_data); + + hw =mtk_clk_register_pll_ops (&fh->clk_pll, pll_data, base, + &mtk_pllfh_ops); + +if (IS_ERR (hw)) +kfree (fh); +else +fhctl_hw_init (fh); + +return hw; +} + +static void mtk_clk_unregister_pllfh (struct clk_hw *hw) +{ +struct mtk_fh *fh; + +if (!hw) +return ; + + fh =to_mtk_fh (hw); + +clk_hw_unregister (hw); +kfree (fh); +} + +int mtk_clk_register_pllfhs (struct device_node *node, +const struct mtk_pll_data *plls,int num_plls, +struct mtk_pllfh_data *pllfhs,int num_fhs, +struct clk_hw_onecell_data *clk_data) +{ +void __iomem *base; +int i; +struct clk_hw *hw; + + base =of_iomap (node,0 ); +if (!base) { +pr_err ("%s(): ioremap failed\n" , __func__); +return -EINVAL ; + } + +for (i =0 ; i < num_plls; i++) { +const struct mtk_pll_data *pll = &plls[i]; +struct mtk_pllfh_data *pllfh; + + pllfh =get_pllfh_by_id (pllfhs, num_fhs, pll->id); + +if (fhctl_is_supported_and_enabled (pllfh)) + hw =mtk_clk_register_pllfh (pll, pllfh, base); +else + hw =mtk_clk_register_pll (pll, base); + +if (IS_ERR (hw)) { +pr_err ("Failed to register clk %s: %pe\n" , pll->name, + hw); + goto err; + } + + clk_data->hws[pll->id] = hw; + } + +return 0 ; + +err: +while (--i >=0 ) { +const struct mtk_pll_data *pll = &plls[i]; +struct mtk_pllfh_data *pllfh; + + pllfh =get_pllfh_by_id (pllfhs, num_fhs, pll->id); + +if (fhctl_is_supported_and_enabled (pllfh)) +mtk_clk_unregister_pllfh (clk_data->hws[pll->id]); +else +mtk_clk_unregister_pll (clk_data->hws[pll->id]); + + clk_data->hws[pll->id] =ERR_PTR (-ENOENT ); + } + +iounmap (base); + +return PTR_ERR (hw); +} + +void mtk_clk_unregister_pllfhs (const struct mtk_pll_data *plls,int num_plls, +struct mtk_pllfh_data *pllfhs,int num_fhs, +struct clk_hw_onecell_data *clk_data) +{ +void __iomem *base =NULL , *fhctl_base =NULL ; +int i; + +if (!clk_data) +return ; + +for (i = num_plls; i >0 ; i--) { +const struct mtk_pll_data *pll = &plls[i -1 ]; +struct mtk_pllfh_data *pllfh; + +if (IS_ERR_OR_NULL (clk_data->hws[pll->id])) +continue ; + + pllfh =get_pllfh_by_id (pllfhs, num_fhs, pll->id); + +if (fhctl_is_supported_and_enabled (pllfh)) { + fhctl_base = pllfh->state.base; +mtk_clk_unregister_pllfh (clk_data->hws[pll->id]); + }else { + base =mtk_clk_pll_get_base (clk_data->hws[pll->id], + pll); +mtk_clk_unregister_pll (clk_data->hws[pll->id]); + } + + clk_data->hws[pll->id] =ERR_PTR (-ENOENT ); + } + +if (fhctl_base) +iounmap (fhctl_base); + +iounmap (base); +}drivers/clk/mediatek/clk-pllfh.h new file +82
-0@@ -0,0 +1,82 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2022 MediaTek Inc. +* Author: Edward-JW Yang <[email protected]> +*/ + +#ifndef __DRV_CLKFH_H +#define __DRV_CLKFH_H + +#include "clk-pll.h" + +struct fh_pll_state { +void __iomem *base; +u32 fh_enable; +u32 ssc_rate; +}; + +struct fh_pll_data { +int pll_id; +int fh_id; +u32 fhx_offset; +u32 dds_mask; +u32 slope0_value; +u32 slope1_value; +u32 sfstrx_en; +u32 frddsx_en; +u32 fhctlx_en; +u32 tgl_org; +u32 dvfs_tri; +u32 pcwchg; +u32 dt_val; +u32 df_val; +u32 updnlmt_shft; +u32 msk_frddsx_dys; +u32 msk_frddsx_dts; +}; + +struct mtk_pllfh_data { +struct fh_pll_state state; +const struct fh_pll_data data; +}; + +struct fh_pll_regs { +void __iomem *reg_hp_en; +void __iomem *reg_clk_con; +void __iomem *reg_rst_con; +void __iomem *reg_slope0; +void __iomem *reg_slope1; +void __iomem *reg_cfg; +void __iomem *reg_updnlmt; +void __iomem *reg_dds; +void __iomem *reg_dvfs; +void __iomem *reg_mon; +}; + +struct mtk_fh { +struct mtk_clk_pll clk_pll; +struct fh_pll_regs regs; +struct mtk_pllfh_data *pllfh_data; +const struct fh_operation *ops; +spinlock_t *lock; +}; + +struct fh_operation { +int (*hopping)(struct mtk_fh *fh,unsigned int new_dds, +unsigned int postdiv); +int (*ssc_enable)(struct mtk_fh *fh,u32 rate); +}; + +int mtk_clk_register_pllfhs (struct device_node *node, +const struct mtk_pll_data *plls,int num_plls, +struct mtk_pllfh_data *pllfhs,int num_pllfhs, +struct clk_hw_onecell_data *clk_data); + +void mtk_clk_unregister_pllfhs (const struct mtk_pll_data *plls,int num_plls, +struct mtk_pllfh_data *pllfhs,int num_fhs, +struct clk_hw_onecell_data *clk_data); + +void fhctl_parse_dt (const u8 *compatible_node,struct mtk_pllfh_data *pllfhs, +int num_pllfhs); + +#endif /* __DRV_CLKFH_H */ Signature · 1 line
2.18.0
Re: [PATCH v2 3/4] clk: mediatek: Add new clock driver to handle FHCTL hardware
Quoted 22 lines · Edward-JW Yang
Quoted 21 lines · Johnson Wang
To implement frequency hopping and spread spectrum clocking function, we introduce new clock type and APIs to handle FHCTL hardware.
Co-developed-by Edward-JW Yang <[email protected]>Signed-off-by Edward-JW Yang <[email protected]>Signed-off-by Johnson Wang <[email protected]>--- drivers/clk/mediatek/Makefile | 2 +- drivers/clk/mediatek/clk-fhctl.c | 244 ++++++++++++++++++++++++++++ drivers/clk/mediatek/clk-fhctl.h | 26 +++ drivers/clk/mediatek/clk-pllfh.c | 268 +++++++++++++++++++++++++++++++ drivers/clk/mediatek/clk-pllfh.h | 82 ++++++++++ 5 files changed, 621 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/mediatek/clk-fhctl.c create mode 100644 drivers/clk/mediatek/clk-fhctl.h create mode 100644 drivers/clk/mediatek/clk-pllfh.c create mode 100644 drivers/clk/mediatek/clk-pllfh.h
Quoted 16 lines
Quoted 8 lines
drivers/clk/mediatek/Makefile +0
-1@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_COMMON_CLK_MEDIATEK) += clk-mtk.o clk-pll.o clk-Quoted 4 lines
gate.o clk-apmixed.o clk-cpumux.o reset.o clk-mux.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 clk-fhctl.o clk-pllfh.o
We need to add a config for clk-fhctl.o and clk-pllfh.o. It's only used by specfic
project.
Hi Edward,
Thanks for your suggestion.
Then I will add one config symbol and make MT8186 to select it.
BRs,
Johnson Wang
Quoted 695 lines
Quoted 693 lines
obj-$(CONFIG_COMMON_CLK_MT6765) += clk-mt6765.o obj-$(CONFIG_COMMON_CLK_MT6765_AUDIOSYS) += clk-mt6765-audio.o
drivers/clk/mediatek/clk-fhctl.c new file +35
-0@@ -0,0 +1,244 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (c) 2022 MediaTek Inc. +* Author: Edward-JW Yang <[email protected]> +*/ + +#include <linux/io.h> +#include <linux/iopoll.h> + +#include "clk-mtk.h" +#include "clk-pllfh.h" +#include "clk-fhctl.h" + +#define PERCENT_TO_DDSLMT (dds, percent_m10) \ + ((((dds) * (percent_m10)) >> 5) / 100) + +static const struct fhctl_offset fhctl_offset = { + .offset_hp_en =0x0 , + .offset_clk_con =0x8 , + .offset_rst_con =0xc , + .offset_slope0 =0x10 , + .offset_slope1 =0x14 , + .offset_cfg =0x0 , + .offset_updnlmt =0x4 , + .offset_dds =0x8 , + .offset_dvfs =0xc , + .offset_mon =0x10 , +}; + +const struct fhctl_offset *fhctl_get_offset_table (void ) +{ +return &fhctl_offset; +} + +static void dump_hw(struct mtk_clk_pll *pll, struct fh_pll_regs*regs,
drivers/clk/mediatek/clk-fhctl.c new file +13
-0+ const struct fh_pll_data *data) +{ +pr_info ("hp_en<%x>,clk_con<%x>,slope0<%x>,slope1<%x>\n" , +readl (regs->reg_hp_en),readl (regs->reg_clk_con), +readl (regs->reg_slope0),readl (regs->reg_slope1)); +pr_info ("cfg<%x>,lmt<%x>,dds<%x>,dvfs<%x>,mon<%x>\n" , +readl (regs->reg_cfg),readl (regs->reg_updnlmt), +readl (regs->reg_dds),readl (regs->reg_dvfs), +readl (regs->reg_mon)); +pr_info ("pcw<%x>\n" ,readl (pll->pcw_addr)); +} + +static int fhctl_set_ssc_regs(struct mtk_clk_pll *pll, struct
fh_pll_regs*regs,drivers/clk/mediatek/clk-fhctl.c new file +5
-0+ const struct fh_pll_data *data, u32 rate) +{ +u32 updnlmt_val, r; + + writel((readl(regs->reg_cfg) & ~(data->frddsx_en)), regs-Quoted 1 line
reg_cfg);drivers/clk/mediatek/clk-fhctl.c new file +1
-0+ writel((readl(regs->reg_cfg) & ~(data->sfstrx_en)), regs-Quoted 1 line
reg_cfg);drivers/clk/mediatek/clk-fhctl.c new file +1
-0+ writel((readl(regs->reg_cfg) & ~(data->fhctlx_en)), regs-Quoted 1 line
reg_cfg);drivers/clk/mediatek/clk-fhctl.c new file +3
-0+ +if (rate >0 ) { +/* Set the relative parameter registers (dt/df/upbnd/downbnd) */
drivers/clk/mediatek/clk-fhctl.c new file +11
-0+ r =readl (regs->reg_cfg); + r &= ~(data->msk_frddsx_dys); + r |= (data->df_val << (ffs (data->msk_frddsx_dys) -1 )); +writel (r, regs->reg_cfg); + + r =readl (regs->reg_cfg); + r &= ~(data->msk_frddsx_dts); + r |= (data->dt_val << (ffs (data->msk_frddsx_dts) -1 )); +writel (r, regs->reg_cfg); + + writel((readl(pll->pcw_addr) & data->dds_mask) | data-Quoted 1 line
tgl_org,drivers/clk/mediatek/clk-fhctl.c new file +5
-0+ regs->reg_dds); + +/* Calculate UPDNLMT */ + updnlmt_val =PERCENT_TO_DDSLMT ((readl (regs->reg_dds) & + data->dds_mask), rate)<<
drivers/clk/mediatek/clk-fhctl.c new file +7
-0+ data->updnlmt_shft; + +writel (updnlmt_val, regs->reg_updnlmt); +writel (readl (regs->reg_hp_en) |BIT (data->fh_id), + regs->reg_hp_en); +/* Enable SSC */ + writel(readl(regs->reg_cfg) | data->frddsx_en, regs-Quoted 1 line
reg_cfg);drivers/clk/mediatek/clk-fhctl.c new file +2
-0+/* Enable Hopping control */ + writel(readl(regs->reg_cfg) | data->fhctlx_en, regs-Quoted 1 line
reg_cfg);drivers/clk/mediatek/clk-fhctl.c new file +13
-0+ + }else { +/* Switch to APMIXEDSYS control */ +writel (readl (regs->reg_hp_en) & ~BIT (data->fh_id), + regs->reg_hp_en); +/* Wait for DDS to be stable */ +udelay (30 ); + } + +return 0 ; +} + +static int hopping_hw_flow(struct mtk_clk_pll *pll, struct
fh_pll_regs*regs,drivers/clk/mediatek/clk-fhctl.c new file +2
-0+const struct fh_pll_data *data, + struct fh_pll_state *state, unsigned int
new_dds)drivers/clk/mediatek/clk-fhctl.c new file +18
-0+{ +u32 dds_mask = data->dds_mask; +u32 mon_dds =0 ; +u32 con_pcw_tmp; +int ret; + +if (state->ssc_rate) +fhctl_set_ssc_regs (pll, regs, data,0 ); + +writel ((readl (pll->pcw_addr) & dds_mask) | data->tgl_org, + regs->reg_dds); + +writel (readl (regs->reg_cfg) | data->sfstrx_en, regs->reg_cfg); +writel (readl (regs->reg_cfg) | data->fhctlx_en, regs->reg_cfg); +writel (data->slope0_value, regs->reg_slope0); +writel (data->slope1_value, regs->reg_slope1); + + writel(readl(regs->reg_hp_en) | BIT(data->fh_id), regs-Quoted 1 line
reg_hp_en);drivers/clk/mediatek/clk-fhctl.c new file +8
-0+writel ((new_dds) | (data->dvfs_tri), regs->reg_dvfs); + +/* Wait 1000 us until DDS stable */ + ret =readl_poll_timeout_atomic (regs->reg_mon, mon_dds, + (mon_dds & dds_mask) == new_dds, +10 ,1000 ); +if (ret) { + pr_warn("%s: FHCTL hopping timeout\n", pll->data-Quoted 1 line
name);
drivers/clk/mediatek/clk-fhctl.c new file +5
-0+dump_hw (pll, regs, data); + } + + con_pcw_tmp =readl (pll->pcw_addr) & (~dds_mask); + con_pcw_tmp = (con_pcw_tmp | (readl(regs->reg_mon) & dds_mask)|
drivers/clk/mediatek/clk-fhctl.c new file +4
-0+ data->pcwchg); + +writel (con_pcw_tmp, pll->pcw_addr); + writel(readl(regs->reg_hp_en) & ~BIT(data->fh_id), regs-Quoted 1 line
reg_hp_en);drivers/clk/mediatek/clk-fhctl.c new file +18
-0+ +if (state->ssc_rate) +fhctl_set_ssc_regs (pll, regs, data, state->ssc_rate); + +return ret; +} + +static unsigned int __get_postdiv (struct mtk_clk_pll *pll) +{ +unsigned int regval; + + regval =readl (pll->pd_addr) >> pll->data->pd_shift; + regval &=POSTDIV_MASK ; + +return BIT (regval); +} + +static void __set_postdiv(struct mtk_clk_pll *pll, unsigned intpostdiv)
drivers/clk/mediatek/clk-fhctl.c new file +93
-0+{ +unsigned int regval; + + regval =readl (pll->pd_addr); + regval &= ~(POSTDIV_MASK << pll->data->pd_shift); + regval |= (ffs (postdiv) -1 ) << pll->data->pd_shift; +writel (regval, pll->pd_addr); +} + +static int fhctl_hopping (struct mtk_fh *fh,unsigned int new_dds, +unsigned int postdiv) +{ +const struct fh_pll_data *data = &fh->pllfh_data->data; +struct fh_pll_state *state = &fh->pllfh_data->state; +struct fh_pll_regs *regs = &fh->regs; +struct mtk_clk_pll *pll = &fh->clk_pll; +spinlock_t *lock = fh->lock; +unsigned int pll_postdiv; +unsigned long flags =0 ; +int ret; + +if (postdiv) { + pll_postdiv =__get_postdiv (pll); + +if (postdiv > pll_postdiv) +__set_postdiv (pll, postdiv); + } + +spin_lock_irqsave (lock, flags); + + ret =hopping_hw_flow (pll, regs, data, state, new_dds); + +spin_unlock_irqrestore (lock, flags); + +if (postdiv && postdiv < pll_postdiv) +__set_postdiv (pll, postdiv); + +return ret; +} + +static int fhctl_ssc_enable (struct mtk_fh *fh,u32 rate) +{ +const struct fh_pll_data *data = &fh->pllfh_data->data; +struct fh_pll_state *state = &fh->pllfh_data->state; +struct fh_pll_regs *regs = &fh->regs; +struct mtk_clk_pll *pll = &fh->clk_pll; +spinlock_t *lock = fh->lock; +unsigned long flags =0 ; + +spin_lock_irqsave (lock, flags); + +fhctl_set_ssc_regs (pll, regs, data, rate); + state->ssc_rate = rate; + +spin_unlock_irqrestore (lock, flags); + +return 0 ; +} + +static const struct fh_operation fhctl_ops = { + .hopping = fhctl_hopping, + .ssc_enable = fhctl_ssc_enable, +}; + +const struct fh_operation *fhctl_get_ops (void ) +{ +return &fhctl_ops; +} + +void fhctl_hw_init (struct mtk_fh *fh) +{ +const struct fh_pll_data data = fh->pllfh_data->data; +struct fh_pll_state state = fh->pllfh_data->state; +struct fh_pll_regs regs = fh->regs; +u32 val; + +/* initial hw register */ + val =readl (regs.reg_clk_con) |BIT (data.fh_id); +writel (val, regs.reg_clk_con); + + val =readl (regs.reg_rst_con) & ~BIT (data.fh_id); +writel (val, regs.reg_rst_con); + val =readl (regs.reg_rst_con) |BIT (data.fh_id); +writel (val, regs.reg_rst_con); + +writel (0x0 , regs.reg_cfg); +writel (0x0 , regs.reg_updnlmt); +writel (0x0 , regs.reg_dds); + +/* enable ssc if needed */ +if (state.ssc_rate) + fh->ops->ssc_enable (fh, state.ssc_rate); +}drivers/clk/mediatek/clk-fhctl.h new file +26
-0@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2022 MediaTek Inc. +* Author: Edward-JW Yang <[email protected]> +*/ + +#ifndef __CLK_FHCTL_H +#define __CLK_FHCTL_H + +struct fhctl_offset { +u32 offset_hp_en; +u32 offset_clk_con; +u32 offset_rst_con; +u32 offset_slope0; +u32 offset_slope1; +u32 offset_cfg; +u32 offset_updnlmt; +u32 offset_dds; +u32 offset_dvfs; +u32 offset_mon; +}; +const struct fhctl_offset *fhctl_get_offset_table (void ); +const struct fh_operation *fhctl_get_ops (void ); +void fhctl_hw_init (struct mtk_fh *fh); + +#endif drivers/clk/mediatek/clk-pllfh.c new file +27
-0@@ -0,0 +1,268 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (c) 2022 MediaTek Inc. +* Author: Edward-JW Yang <[email protected]> +*/ + +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/io.h> +#include <linux/slab.h> +#include <linux/clkdev.h> +#include <linux/delay.h> + +#include "clk-mtk.h" +#include "clk-pllfh.h" +#include "clk-fhctl.h" + +static DEFINE_SPINLOCK (pllfh_lock); + +inline struct mtk_fh *to_mtk_fh (struct clk_hw *hw) +{ +struct mtk_clk_pll *pll =to_mtk_clk_pll (hw); + + return container_of(pll, struct mtk_fh, clk_pll); +} + +static int mtk_fhctl_set_rate(struct clk_hw *hw, unsigned longrate,
drivers/clk/mediatek/clk-pllfh.c new file +22
-0+ unsigned long parent_rate) +{ +struct mtk_clk_pll *pll =to_mtk_clk_pll (hw); +struct mtk_fh *fh =to_mtk_fh (hw); +u32 pcw =0 ; +u32 postdiv; + +mtk_pll_calc_values (pll, &pcw, &postdiv, rate, parent_rate); + +return fh->ops->hopping (fh, pcw, postdiv); +} + +static const struct clk_ops mtk_pllfh_ops = { + .is_prepared = mtk_pll_is_prepared, + .prepare = mtk_pll_prepare, + .unprepare = mtk_pll_unprepare, + .recalc_rate = mtk_pll_recalc_rate, + .round_rate = mtk_pll_round_rate, + .set_rate = mtk_fhctl_set_rate, +}; + +static struct mtk_pllfh_data *get_pllfh_by_id(struct
mtk_pllfh_data*pllfhs,drivers/clk/mediatek/clk-pllfh.c new file +12
-0+ int num_fhs, int pll_id) +{ + int i; + +for (i =0 ; i < num_fhs; i++) +if (pllfhs[i].data.pll_id == pll_id) +return &pllfhs[i]; + +return NULL ; +} + +void fhctl_parse_dt(const u8 *compatible_node, struct
mtk_pllfh_data*pllfhs,drivers/clk/mediatek/clk-pllfh.c new file +22
-0+ int num_fhs) +{ +void __iomem *base; +struct device_node *node; +u32 num_clocks, pll_id, ssc_rate; +int offset, i; + + node =of_find_compatible_node (NULL ,NULL , compatible_node); +if (!node) { +pr_err ("cannot find \"%s\"\n" , compatible_node); +return ; + } + + base =of_iomap (node,0 ); +if (!base) { +pr_err ("%s(): ioremap failed\n" , __func__); +return ; + } + + num_clocks =of_clk_get_parent_count (node); +if (!num_clocks) { + pr_err("%s(): failed to get clocks property\n",
__func__);drivers/clk/mediatek/clk-pllfh.c new file +9
-0+return ; + } + +for (i =0 ; i < num_clocks; i++) { +struct mtk_pllfh_data *pllfh; + + offset = i *2 ; + + of_property_read_u32_index(node, "clocks", offset + 1,
&pll_id);drivers/clk/mediatek/clk-pllfh.c new file +2
-0+ of_property_read_u32_index(node, + "mediatek,hopping-ssc-percents",
drivers/clk/mediatek/clk-pllfh.c new file +13
-0+ i, &ssc_rate); + + pllfh =get_pllfh_by_id (pllfhs, num_fhs, pll_id); +if (!pllfh) +continue ; + + pllfh->state.fh_enable =1 ; + pllfh->state.ssc_rate = ssc_rate; + pllfh->state.base = base; + } +} + +static void pllfh_init(struct mtk_fh *fh, struct mtk_pllfh_data
*pllfh_data)drivers/clk/mediatek/clk-pllfh.c new file +27
-0+{ +struct fh_pll_regs *regs = &fh->regs; +const struct fhctl_offset *offset; +void __iomem *base = pllfh_data->state.base; +void __iomem *fhx_base = base + pllfh_data->data.fhx_offset; + + offset =fhctl_get_offset_table (); + + regs->reg_hp_en = base + offset->offset_hp_en; + regs->reg_clk_con = base + offset->offset_clk_con; + regs->reg_rst_con = base + offset->offset_rst_con; + regs->reg_slope0 = base + offset->offset_slope0; + regs->reg_slope1 = base + offset->offset_slope1; + + regs->reg_cfg = fhx_base + offset->offset_cfg; + regs->reg_updnlmt = fhx_base + offset->offset_updnlmt; + regs->reg_dds = fhx_base + offset->offset_dds; + regs->reg_dvfs = fhx_base + offset->offset_dvfs; + regs->reg_mon = fhx_base + offset->offset_mon; + + fh->pllfh_data = pllfh_data; + fh->lock = &pllfh_lock; + + fh->ops =fhctl_get_ops (); +} + +static bool fhctl_is_supported_and_enabled(const struct
mtk_pllfh_data*pllfh)drivers/clk/mediatek/clk-pllfh.c new file +7
-0+{ +return pllfh && (pllfh->state.fh_enable ==1 ); +} + +static struct clk_hw * +mtk_clk_register_pllfh (const struct mtk_pll_data *pll_data, + struct mtk_pllfh_data *pllfh_data, void __iomem*base)
drivers/clk/mediatek/clk-pllfh.c new file +36
-0+{ +struct clk_hw *hw; +struct mtk_fh *fh; + + fh =kzalloc (sizeof (*fh),GFP_KERNEL ); +if (!fh) +return ERR_PTR (-ENOMEM ); + +pllfh_init (fh, pllfh_data); + + hw =mtk_clk_register_pll_ops (&fh->clk_pll, pll_data, base, + &mtk_pllfh_ops); + +if (IS_ERR (hw)) +kfree (fh); +else +fhctl_hw_init (fh); + +return hw; +} + +static void mtk_clk_unregister_pllfh (struct clk_hw *hw) +{ +struct mtk_fh *fh; + +if (!hw) +return ; + + fh =to_mtk_fh (hw); + +clk_hw_unregister (hw); +kfree (fh); +} + +int mtk_clk_register_pllfhs (struct device_node *node, + const struct mtk_pll_data *plls, int
num_plls,drivers/clk/mediatek/clk-pllfh.c new file +26
-0+ struct mtk_pllfh_data *pllfhs, int num_fhs, + struct clk_hw_onecell_data *clk_data) +{ + void __iomem *base; +int i; +struct clk_hw *hw; + + base =of_iomap (node,0 ); +if (!base) { +pr_err ("%s(): ioremap failed\n" , __func__); +return -EINVAL ; + } + +for (i =0 ; i < num_plls; i++) { +const struct mtk_pll_data *pll = &plls[i]; +struct mtk_pllfh_data *pllfh; + + pllfh =get_pllfh_by_id (pllfhs, num_fhs, pll->id); + +if (fhctl_is_supported_and_enabled (pllfh)) + hw =mtk_clk_register_pllfh (pll, pllfh, base); +else + hw =mtk_clk_register_pll (pll, base); + +if (IS_ERR (hw)) { + pr_err("Failed to register clk %s: %pe\n", pll-Quoted 1 line
name,
drivers/clk/mediatek/clk-pllfh.c new file +18
-0+ hw); + goto err; + } + + clk_data->hws[pll->id] = hw; + } + +return 0 ; + +err: +while (--i >=0 ) { +const struct mtk_pll_data *pll = &plls[i]; +struct mtk_pllfh_data *pllfh; + + pllfh =get_pllfh_by_id (pllfhs, num_fhs, pll->id); + +if (fhctl_is_supported_and_enabled (pllfh)) + mtk_clk_unregister_pllfh(clk_data->hws[pll-Quoted 1 line
id]);
drivers/clk/mediatek/clk-pllfh.c new file +12
-0+else +mtk_clk_unregister_pll (clk_data->hws[pll->id]); + + clk_data->hws[pll->id] =ERR_PTR (-ENOENT ); + } + +iounmap (base); + +return PTR_ERR (hw); +} + +void mtk_clk_unregister_pllfhs(const struct mtk_pll_data *plls,int
num_plls,drivers/clk/mediatek/clk-pllfh.c new file +1
-0+struct mtk_pllfh_data *pllfhs, int
num_fhs,drivers/clk/mediatek/clk-pllfh.c new file +20
-0+ struct clk_hw_onecell_data *clk_data) +{ +void __iomem *base =NULL , *fhctl_base =NULL ; +int i; + +if (!clk_data) +return ; + +for (i = num_plls; i >0 ; i--) { +const struct mtk_pll_data *pll = &plls[i -1 ]; +struct mtk_pllfh_data *pllfh; + +if (IS_ERR_OR_NULL (clk_data->hws[pll->id])) +continue ; + + pllfh =get_pllfh_by_id (pllfhs, num_fhs, pll->id); + +if (fhctl_is_supported_and_enabled (pllfh)) { + fhctl_base = pllfh->state.base; + mtk_clk_unregister_pllfh(clk_data->hws[pll-Quoted 1 line
id]);
drivers/clk/mediatek/clk-pllfh.c new file +2
-0+ }else { + base = mtk_clk_pll_get_base(clk_data->hws[pll-Quoted 1 line
id],
drivers/clk/mediatek/clk-pllfh.c new file +12
-0+ pll); +mtk_clk_unregister_pll (clk_data->hws[pll->id]); + } + + clk_data->hws[pll->id] =ERR_PTR (-ENOENT ); + } + +if (fhctl_base) +iounmap (fhctl_base); + +iounmap (base); +}drivers/clk/mediatek/clk-pllfh.h new file +71
-0@@ -0,0 +1,82 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2022 MediaTek Inc. +* Author: Edward-JW Yang <[email protected]> +*/ + +#ifndef __DRV_CLKFH_H +#define __DRV_CLKFH_H + +#include "clk-pll.h" + +struct fh_pll_state { +void __iomem *base; +u32 fh_enable; +u32 ssc_rate; +}; + +struct fh_pll_data { +int pll_id; +int fh_id; +u32 fhx_offset; +u32 dds_mask; +u32 slope0_value; +u32 slope1_value; +u32 sfstrx_en; +u32 frddsx_en; +u32 fhctlx_en; +u32 tgl_org; +u32 dvfs_tri; +u32 pcwchg; +u32 dt_val; +u32 df_val; +u32 updnlmt_shft; +u32 msk_frddsx_dys; +u32 msk_frddsx_dts; +}; + +struct mtk_pllfh_data { +struct fh_pll_state state; +const struct fh_pll_data data; +}; + +struct fh_pll_regs { +void __iomem *reg_hp_en; +void __iomem *reg_clk_con; +void __iomem *reg_rst_con; +void __iomem *reg_slope0; +void __iomem *reg_slope1; +void __iomem *reg_cfg; +void __iomem *reg_updnlmt; +void __iomem *reg_dds; +void __iomem *reg_dvfs; +void __iomem *reg_mon; +}; + +struct mtk_fh { +struct mtk_clk_pll clk_pll; +struct fh_pll_regs regs; +struct mtk_pllfh_data *pllfh_data; +const struct fh_operation *ops; +spinlock_t *lock; +}; + +struct fh_operation { +int (*hopping)(struct mtk_fh *fh,unsigned int new_dds, +unsigned int postdiv); +int (*ssc_enable)(struct mtk_fh *fh,u32 rate); +}; + +int mtk_clk_register_pllfhs (struct device_node *node, + const struct mtk_pll_data *plls, int
num_plls,drivers/clk/mediatek/clk-pllfh.h new file +1
-0+struct mtk_pllfh_data *pllfhs, int
num_pllfhs,drivers/clk/mediatek/clk-pllfh.h new file +3
-0+ struct clk_hw_onecell_data *clk_data); + +void mtk_clk_unregister_pllfhs(const struct mtk_pll_data *plls,int
num_plls,drivers/clk/mediatek/clk-pllfh.h new file +1
-0+struct mtk_pllfh_data *pllfhs, int
num_fhs,drivers/clk/mediatek/clk-pllfh.h new file +3
-0+ struct clk_hw_onecell_data *clk_data); + +void fhctl_parse_dt(const u8 *compatible_node, struct
mtk_pllfh_data*pllfhs,drivers/clk/mediatek/clk-pllfh.h new file +3
-0+ int num_pllfhs); + +#endif /* __DRV_CLKFH_H */ Signature · 1 line
2.18.0
PATCH v2 4/4 clk: mediatek: Change PLL register API for MT8186
In reply to Johnson WangUse mtk_clk_register_pllfhs() to enhance frequency hopping and spread spectrum clocking control for MT8186.
--- drivers/clk/mediatek/clk-mt8186-apmixedsys.c | 66 +++++++++++++++++++- 1 file changed, 63 insertions(+), 3 deletions(-)
drivers/clk/mediatek/clk-mt8186-apmixedsys.c +63 -3
@@ -9,6 +9,7 @@#include "clk-mtk.h" #include "clk-pll.h" +#include "clk-pllfh.h" #define MT8186_PLL_FMAX (3800UL * MHZ)#define MT8186_PLL_FMIN (1500UL * MHZ)
@@ -76,6 +77,59 @@ static const struct mtk_pll_data plls[] = { 0, 0, 32, 0x034C, 24, 0x0044, 0x000C, 5, 0x0350), }; +enum fh_pll_id { +FH_ARMPLL_LL , +FH_ARMPLL_BL , +FH_CCIPLL , +FH_MAINPLL , +FH_MMPLL , +FH_TVDPLL , +FH_RESERVE6 , +FH_ADSPPLL , +FH_MFGPLL , +FH_NNAPLL , +FH_NNA2PLL , +FH_MSDCPLL , +FH_RESERVE12 , +FH_NR_FH , +}; + +#define FH (_pllid, _fhid, _offset) { \ + .data = { \ + .pll_id = _pllid, \ + .fh_id = _fhid, \ + .fhx_offset = _offset, \ + .dds_mask = GENMASK(21, 0), \ + .slope0_value = 0x6003c97, \ + .slope1_value = 0x6003c97, \ + .sfstrx_en = BIT(2), \ + .frddsx_en = BIT(1), \ + .fhctlx_en = BIT(0), \ + .tgl_org = BIT(31), \ + .dvfs_tri = BIT(31), \ + .pcwchg = BIT(31), \ + .dt_val = 0x0, \ + .df_val = 0x9, \ + .updnlmt_shft = 16, \ + .msk_frddsx_dys = GENMASK(23, 20), \ + .msk_frddsx_dts = GENMASK(19, 16), \ + }, \ + } + +static struct mtk_pllfh_data pllfhs[] = { +FH (CLK_APMIXED_ARMPLL_LL ,FH_ARMPLL_LL ,0x003C ), +FH (CLK_APMIXED_ARMPLL_BL ,FH_ARMPLL_BL ,0x0050 ), +FH (CLK_APMIXED_CCIPLL ,FH_CCIPLL ,0x0064 ), +FH (CLK_APMIXED_MAINPLL ,FH_MAINPLL ,0x0078 ), +FH (CLK_APMIXED_MMPLL ,FH_MMPLL ,0x008C ), +FH (CLK_APMIXED_TVDPLL ,FH_TVDPLL ,0x00A0 ), +FH (CLK_APMIXED_ADSPPLL ,FH_ADSPPLL ,0x00C8 ), +FH (CLK_APMIXED_MFGPLL ,FH_MFGPLL ,0x00DC ), +FH (CLK_APMIXED_NNAPLL ,FH_NNAPLL ,0x00F0 ), +FH (CLK_APMIXED_NNA2PLL ,FH_NNA2PLL ,0x0104 ), +FH (CLK_APMIXED_MSDCPLL ,FH_MSDCPLL ,0x0118 ), +}; +static const struct of_device_id of_match_clk_mt8186_apmixed[] = { { .compatible ="mediatek,mt8186-apmixedsys" , }, {}
@@ -85,13 +139,17 @@ static int clk_mt8186_apmixed_probe(struct platform_device *pdev) {struct clk_hw_onecell_data *clk_data;struct device_node *node = pdev->dev.of_node; +const u8 *fhctl_node ="mediatek,mt8186-fhctl" ;int r; clk_data =mtk_alloc_clk_data (CLK_APMIXED_NR_CLK );if (!clk_data)return -ENOMEM ; - r =mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), clk_data); +fhctl_parse_dt (fhctl_node, pllfhs,ARRAY_SIZE (pllfhs)); + + r =mtk_clk_register_pllfhs (node, plls,ARRAY_SIZE (plls), + pllfhs,ARRAY_SIZE (pllfhs), clk_data);if (r) goto free_apmixed_data;
@@ -104,7 +162,8 @@ static int clk_mt8186_apmixed_probe(struct platform_device *pdev)return r; unregister_plls: -mtk_clk_unregister_plls (plls,ARRAY_SIZE (plls), clk_data); +mtk_clk_unregister_pllfhs (plls,ARRAY_SIZE (plls), pllfhs, +ARRAY_SIZE (pllfhs), clk_data); free_apmixed_data:mtk_free_clk_data (clk_data);return r;
@@ -116,7 +175,8 @@ static int clk_mt8186_apmixed_remove(struct platform_device *pdev)struct clk_hw_onecell_data *clk_data =platform_get_drvdata (pdev);of_clk_del_provider (node); -mtk_clk_unregister_plls (plls,ARRAY_SIZE (plls), clk_data); +mtk_clk_unregister_pllfhs (plls,ARRAY_SIZE (plls), pllfhs, +ARRAY_SIZE (pllfhs), clk_data);mtk_free_clk_data (clk_data);return 0 ;
Signature · 1 line
2.18.0