* [PATCH v2 0/3] Add the support for SM8750 Video clock controller
@ 2025-08-29 10:15 Taniya Das
2025-08-29 10:15 ` [PATCH v2 1/3] clk: qcom: branch: Extend invert logic for branch2 mem clocks Taniya Das
` (2 more replies)
0 siblings, 3 replies; 15+ messages in thread
From: Taniya Das @ 2025-08-29 10:15 UTC (permalink / raw)
To: Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: Ajit Pandey, Imran Shaik, Jagadeesh Kona, linux-arm-msm,
linux-clk, linux-kernel, devicetree, Taniya Das
Support the Video clock controller for SM8750 Qualcomm SoC. It includes
the extended logic for branch clocks with mem_ops which requires the
inverted logic.
Changes in v2:
- Update the commit message for the invert branch mem ops [Dmitry]
- Update the email to 'oss' and also update copyright.
- update the RB-by tag from Rob.
- Link to v1: https://lore.kernel.org/all/20241206-sm8750_videocc-v1-0-5da6e7eea2bd@quicinc.com/
Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com>
---
Taniya Das (3):
clk: qcom: branch: Extend invert logic for branch2 mem clocks
dt-bindings: clock: qcom: Add SM8750 video clock controller
clk: qcom: videocc-sm8750: Add video clock controller driver for SM8750
.../bindings/clock/qcom,sm8450-videocc.yaml | 5 +-
drivers/clk/qcom/Kconfig | 11 +
drivers/clk/qcom/Makefile | 1 +
drivers/clk/qcom/clk-branch.c | 14 +-
drivers/clk/qcom/clk-branch.h | 4 +
drivers/clk/qcom/videocc-sm8750.c | 472 +++++++++++++++++++++
include/dt-bindings/clock/qcom,sm8750-videocc.h | 40 ++
7 files changed, 543 insertions(+), 4 deletions(-)
---
base-commit: 3cace99d63192a7250461b058279a42d91075d0c
change-id: 20250829-sm8750-videocc-v2-6311b334f7a9
Best regards,
--
Taniya Das <taniya.das@oss.qualcomm.com>
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH v2 1/3] clk: qcom: branch: Extend invert logic for branch2 mem clocks 2025-08-29 10:15 [PATCH v2 0/3] Add the support for SM8750 Video clock controller Taniya Das @ 2025-08-29 10:15 ` Taniya Das 2025-08-30 0:17 ` Dmitry Baryshkov 2025-09-02 11:57 ` Konrad Dybcio 2025-08-29 10:15 ` [PATCH v2 2/3] dt-bindings: clock: qcom: Add SM8750 video clock controller Taniya Das 2025-08-29 10:15 ` [PATCH v2 3/3] clk: qcom: videocc-sm8750: Add video clock controller driver for SM8750 Taniya Das 2 siblings, 2 replies; 15+ messages in thread From: Taniya Das @ 2025-08-29 10:15 UTC (permalink / raw) To: Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley Cc: Ajit Pandey, Imran Shaik, Jagadeesh Kona, linux-arm-msm, linux-clk, linux-kernel, devicetree, Taniya Das Some clock branches require inverted logic for memory gating, where disabling the memory involves setting a bit and enabling it involves clearing the same bit. This behavior differs from the standard approach memory branch clocks ops where enabling typically sets the bit. Introducing the mem_enable_invert to allow conditional handling of these sequences of the inverted control logic for memory operations required on those memory clock branches. Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> --- drivers/clk/qcom/clk-branch.c | 14 +++++++++++--- drivers/clk/qcom/clk-branch.h | 4 ++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/clk/qcom/clk-branch.c b/drivers/clk/qcom/clk-branch.c index 0f10090d4ae681babbdbbb1b6c68ffe77af7a784..90da1c94b4736f65c87aec92303d511c4aa9a173 100644 --- a/drivers/clk/qcom/clk-branch.c +++ b/drivers/clk/qcom/clk-branch.c @@ -142,8 +142,12 @@ static int clk_branch2_mem_enable(struct clk_hw *hw) u32 val; int ret; - regmap_update_bits(branch.clkr.regmap, mem_br->mem_enable_reg, - mem_br->mem_enable_ack_mask, mem_br->mem_enable_ack_mask); + if (mem_br->mem_enable_invert) + regmap_update_bits(branch.clkr.regmap, mem_br->mem_enable_reg, + mem_br->mem_enable_mask, 0); + else + regmap_update_bits(branch.clkr.regmap, mem_br->mem_enable_reg, + mem_br->mem_enable_ack_mask, mem_br->mem_enable_ack_mask); ret = regmap_read_poll_timeout(branch.clkr.regmap, mem_br->mem_ack_reg, val, val & mem_br->mem_enable_ack_mask, 0, 200); @@ -159,7 +163,11 @@ static void clk_branch2_mem_disable(struct clk_hw *hw) { struct clk_mem_branch *mem_br = to_clk_mem_branch(hw); - regmap_update_bits(mem_br->branch.clkr.regmap, mem_br->mem_enable_reg, + if (mem_br->mem_enable_invert) + regmap_update_bits(mem_br->branch.clkr.regmap, mem_br->mem_enable_reg, + mem_br->mem_enable_mask, mem_br->mem_enable_mask); + else + regmap_update_bits(mem_br->branch.clkr.regmap, mem_br->mem_enable_reg, mem_br->mem_enable_ack_mask, 0); return clk_branch2_disable(hw); diff --git a/drivers/clk/qcom/clk-branch.h b/drivers/clk/qcom/clk-branch.h index 292756435f53648640717734af198442a315272e..6bc2ba2b5350554005b7f0c84f933580b7582fc7 100644 --- a/drivers/clk/qcom/clk-branch.h +++ b/drivers/clk/qcom/clk-branch.h @@ -44,6 +44,8 @@ struct clk_branch { * @mem_enable_reg: branch clock memory gating register * @mem_ack_reg: branch clock memory ack register * @mem_enable_ack_mask: branch clock memory enable and ack field in @mem_ack_reg + * @mem_enable_mask: branch clock memory enable mask + * @mem_enable_invert: branch clock memory enable and disable has invert logic * @branch: branch clock gating handle * * Clock which can gate its memories. @@ -52,6 +54,8 @@ struct clk_mem_branch { u32 mem_enable_reg; u32 mem_ack_reg; u32 mem_enable_ack_mask; + u32 mem_enable_mask; + bool mem_enable_invert; struct clk_branch branch; }; -- 2.34.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v2 1/3] clk: qcom: branch: Extend invert logic for branch2 mem clocks 2025-08-29 10:15 ` [PATCH v2 1/3] clk: qcom: branch: Extend invert logic for branch2 mem clocks Taniya Das @ 2025-08-30 0:17 ` Dmitry Baryshkov 2025-09-03 6:48 ` Taniya Das 2025-09-02 11:57 ` Konrad Dybcio 1 sibling, 1 reply; 15+ messages in thread From: Dmitry Baryshkov @ 2025-08-30 0:17 UTC (permalink / raw) To: Taniya Das Cc: Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Ajit Pandey, Imran Shaik, Jagadeesh Kona, linux-arm-msm, linux-clk, linux-kernel, devicetree On Fri, Aug 29, 2025 at 03:45:17PM +0530, Taniya Das wrote: > Some clock branches require inverted logic for memory gating, where > disabling the memory involves setting a bit and enabling it involves > clearing the same bit. This behavior differs from the standard approach > memory branch clocks ops where enabling typically sets the bit. > > Introducing the mem_enable_invert to allow conditional handling of > these sequences of the inverted control logic for memory operations > required on those memory clock branches. > > Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> > --- > drivers/clk/qcom/clk-branch.c | 14 +++++++++++--- > drivers/clk/qcom/clk-branch.h | 4 ++++ > 2 files changed, 15 insertions(+), 3 deletions(-) > > diff --git a/drivers/clk/qcom/clk-branch.c b/drivers/clk/qcom/clk-branch.c > index 0f10090d4ae681babbdbbb1b6c68ffe77af7a784..90da1c94b4736f65c87aec92303d511c4aa9a173 100644 > --- a/drivers/clk/qcom/clk-branch.c > +++ b/drivers/clk/qcom/clk-branch.c > @@ -142,8 +142,12 @@ static int clk_branch2_mem_enable(struct clk_hw *hw) > u32 val; > int ret; > > - regmap_update_bits(branch.clkr.regmap, mem_br->mem_enable_reg, > - mem_br->mem_enable_ack_mask, mem_br->mem_enable_ack_mask); > + if (mem_br->mem_enable_invert) > + regmap_update_bits(branch.clkr.regmap, mem_br->mem_enable_reg, > + mem_br->mem_enable_mask, 0); > + else > + regmap_update_bits(branch.clkr.regmap, mem_br->mem_enable_reg, > + mem_br->mem_enable_ack_mask, mem_br->mem_enable_ack_mask); Please check that your lines are properly indented. > > ret = regmap_read_poll_timeout(branch.clkr.regmap, mem_br->mem_ack_reg, > val, val & mem_br->mem_enable_ack_mask, 0, 200); > @@ -159,7 +163,11 @@ static void clk_branch2_mem_disable(struct clk_hw *hw) > { > struct clk_mem_branch *mem_br = to_clk_mem_branch(hw); > > - regmap_update_bits(mem_br->branch.clkr.regmap, mem_br->mem_enable_reg, > + if (mem_br->mem_enable_invert) > + regmap_update_bits(mem_br->branch.clkr.regmap, mem_br->mem_enable_reg, > + mem_br->mem_enable_mask, mem_br->mem_enable_mask); This creates assymmetry. The drivers uses mem_enable_mask in one case and mem_enable_ack_mask in another. > + else > + regmap_update_bits(mem_br->branch.clkr.regmap, mem_br->mem_enable_reg, > mem_br->mem_enable_ack_mask, 0); And here. > > return clk_branch2_disable(hw); > diff --git a/drivers/clk/qcom/clk-branch.h b/drivers/clk/qcom/clk-branch.h > index 292756435f53648640717734af198442a315272e..6bc2ba2b5350554005b7f0c84f933580b7582fc7 100644 > --- a/drivers/clk/qcom/clk-branch.h > +++ b/drivers/clk/qcom/clk-branch.h > @@ -44,6 +44,8 @@ struct clk_branch { > * @mem_enable_reg: branch clock memory gating register > * @mem_ack_reg: branch clock memory ack register > * @mem_enable_ack_mask: branch clock memory enable and ack field in @mem_ack_reg > + * @mem_enable_mask: branch clock memory enable mask > + * @mem_enable_invert: branch clock memory enable and disable has invert logic > * @branch: branch clock gating handle > * > * Clock which can gate its memories. > @@ -52,6 +54,8 @@ struct clk_mem_branch { > u32 mem_enable_reg; > u32 mem_ack_reg; > u32 mem_enable_ack_mask; > + u32 mem_enable_mask; > + bool mem_enable_invert; > struct clk_branch branch; > }; > > > -- > 2.34.1 > -- With best wishes Dmitry ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 1/3] clk: qcom: branch: Extend invert logic for branch2 mem clocks 2025-08-30 0:17 ` Dmitry Baryshkov @ 2025-09-03 6:48 ` Taniya Das 0 siblings, 0 replies; 15+ messages in thread From: Taniya Das @ 2025-09-03 6:48 UTC (permalink / raw) To: Dmitry Baryshkov Cc: Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Ajit Pandey, Imran Shaik, Jagadeesh Kona, linux-arm-msm, linux-clk, linux-kernel, devicetree On 8/30/2025 5:47 AM, Dmitry Baryshkov wrote: > On Fri, Aug 29, 2025 at 03:45:17PM +0530, Taniya Das wrote: >> Some clock branches require inverted logic for memory gating, where >> disabling the memory involves setting a bit and enabling it involves >> clearing the same bit. This behavior differs from the standard approach >> memory branch clocks ops where enabling typically sets the bit. >> >> Introducing the mem_enable_invert to allow conditional handling of >> these sequences of the inverted control logic for memory operations >> required on those memory clock branches. >> >> Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> >> --- >> drivers/clk/qcom/clk-branch.c | 14 +++++++++++--- >> drivers/clk/qcom/clk-branch.h | 4 ++++ >> 2 files changed, 15 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/clk/qcom/clk-branch.c b/drivers/clk/qcom/clk-branch.c >> index 0f10090d4ae681babbdbbb1b6c68ffe77af7a784..90da1c94b4736f65c87aec92303d511c4aa9a173 100644 >> --- a/drivers/clk/qcom/clk-branch.c >> +++ b/drivers/clk/qcom/clk-branch.c >> @@ -142,8 +142,12 @@ static int clk_branch2_mem_enable(struct clk_hw *hw) >> u32 val; >> int ret; >> >> - regmap_update_bits(branch.clkr.regmap, mem_br->mem_enable_reg, >> - mem_br->mem_enable_ack_mask, mem_br->mem_enable_ack_mask); >> + if (mem_br->mem_enable_invert) >> + regmap_update_bits(branch.clkr.regmap, mem_br->mem_enable_reg, >> + mem_br->mem_enable_mask, 0); >> + else >> + regmap_update_bits(branch.clkr.regmap, mem_br->mem_enable_reg, >> + mem_br->mem_enable_ack_mask, mem_br->mem_enable_ack_mask); > > Please check that your lines are properly indented. > Sorry, sure will fix in the next patch. >> >> ret = regmap_read_poll_timeout(branch.clkr.regmap, mem_br->mem_ack_reg, >> val, val & mem_br->mem_enable_ack_mask, 0, 200); >> @@ -159,7 +163,11 @@ static void clk_branch2_mem_disable(struct clk_hw *hw) >> { >> struct clk_mem_branch *mem_br = to_clk_mem_branch(hw); >> >> - regmap_update_bits(mem_br->branch.clkr.regmap, mem_br->mem_enable_reg, >> + if (mem_br->mem_enable_invert) >> + regmap_update_bits(mem_br->branch.clkr.regmap, mem_br->mem_enable_reg, >> + mem_br->mem_enable_mask, mem_br->mem_enable_mask); > > This creates assymmetry. The drivers uses mem_enable_mask in one case > and mem_enable_ack_mask in another. Will try to use the common mask. > >> + else >> + regmap_update_bits(mem_br->branch.clkr.regmap, mem_br->mem_enable_reg, >> mem_br->mem_enable_ack_mask, 0); > > And here. > Will fix here too. >> >> return clk_branch2_disable(hw); >> diff --git a/drivers/clk/qcom/clk-branch.h b/drivers/clk/qcom/clk-branch.h >> index 292756435f53648640717734af198442a315272e..6bc2ba2b5350554005b7f0c84f933580b7582fc7 100644 >> --- a/drivers/clk/qcom/clk-branch.h >> +++ b/drivers/clk/qcom/clk-branch.h >> @@ -44,6 +44,8 @@ struct clk_branch { >> * @mem_enable_reg: branch clock memory gating register >> * @mem_ack_reg: branch clock memory ack register >> * @mem_enable_ack_mask: branch clock memory enable and ack field in @mem_ack_reg >> + * @mem_enable_mask: branch clock memory enable mask >> + * @mem_enable_invert: branch clock memory enable and disable has invert logic >> * @branch: branch clock gating handle >> * >> * Clock which can gate its memories. >> @@ -52,6 +54,8 @@ struct clk_mem_branch { >> u32 mem_enable_reg; >> u32 mem_ack_reg; >> u32 mem_enable_ack_mask; >> + u32 mem_enable_mask; >> + bool mem_enable_invert; >> struct clk_branch branch; >> }; >> >> >> -- >> 2.34.1 >> > -- Thanks, Taniya Das ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 1/3] clk: qcom: branch: Extend invert logic for branch2 mem clocks 2025-08-29 10:15 ` [PATCH v2 1/3] clk: qcom: branch: Extend invert logic for branch2 mem clocks Taniya Das 2025-08-30 0:17 ` Dmitry Baryshkov @ 2025-09-02 11:57 ` Konrad Dybcio 2025-09-03 6:50 ` Taniya Das 1 sibling, 1 reply; 15+ messages in thread From: Konrad Dybcio @ 2025-09-02 11:57 UTC (permalink / raw) To: Taniya Das, Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley Cc: Ajit Pandey, Imran Shaik, Jagadeesh Kona, linux-arm-msm, linux-clk, linux-kernel, devicetree On 8/29/25 12:15 PM, Taniya Das wrote: > Some clock branches require inverted logic for memory gating, where > disabling the memory involves setting a bit and enabling it involves > clearing the same bit. This behavior differs from the standard approach > memory branch clocks ops where enabling typically sets the bit. > > Introducing the mem_enable_invert to allow conditional handling of > these sequences of the inverted control logic for memory operations > required on those memory clock branches. > > Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> > --- > drivers/clk/qcom/clk-branch.c | 14 +++++++++++--- > drivers/clk/qcom/clk-branch.h | 4 ++++ > 2 files changed, 15 insertions(+), 3 deletions(-) > > diff --git a/drivers/clk/qcom/clk-branch.c b/drivers/clk/qcom/clk-branch.c > index 0f10090d4ae681babbdbbb1b6c68ffe77af7a784..90da1c94b4736f65c87aec92303d511c4aa9a173 100644 > --- a/drivers/clk/qcom/clk-branch.c > +++ b/drivers/clk/qcom/clk-branch.c > @@ -142,8 +142,12 @@ static int clk_branch2_mem_enable(struct clk_hw *hw) > u32 val; > int ret; > > - regmap_update_bits(branch.clkr.regmap, mem_br->mem_enable_reg, > - mem_br->mem_enable_ack_mask, mem_br->mem_enable_ack_mask); > + if (mem_br->mem_enable_invert) > + regmap_update_bits(branch.clkr.regmap, mem_br->mem_enable_reg, > + mem_br->mem_enable_mask, 0); > + else > + regmap_update_bits(branch.clkr.regmap, mem_br->mem_enable_reg, > + mem_br->mem_enable_ack_mask, mem_br->mem_enable_ack_mask); regmap_assign_bits() is your friend Konrad ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 1/3] clk: qcom: branch: Extend invert logic for branch2 mem clocks 2025-09-02 11:57 ` Konrad Dybcio @ 2025-09-03 6:50 ` Taniya Das 0 siblings, 0 replies; 15+ messages in thread From: Taniya Das @ 2025-09-03 6:50 UTC (permalink / raw) To: Konrad Dybcio, Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley Cc: Ajit Pandey, Imran Shaik, Jagadeesh Kona, linux-arm-msm, linux-clk, linux-kernel, devicetree On 9/2/2025 5:27 PM, Konrad Dybcio wrote: > On 8/29/25 12:15 PM, Taniya Das wrote: >> Some clock branches require inverted logic for memory gating, where >> disabling the memory involves setting a bit and enabling it involves >> clearing the same bit. This behavior differs from the standard approach >> memory branch clocks ops where enabling typically sets the bit. >> >> Introducing the mem_enable_invert to allow conditional handling of >> these sequences of the inverted control logic for memory operations >> required on those memory clock branches. >> >> Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> >> --- >> drivers/clk/qcom/clk-branch.c | 14 +++++++++++--- >> drivers/clk/qcom/clk-branch.h | 4 ++++ >> 2 files changed, 15 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/clk/qcom/clk-branch.c b/drivers/clk/qcom/clk-branch.c >> index 0f10090d4ae681babbdbbb1b6c68ffe77af7a784..90da1c94b4736f65c87aec92303d511c4aa9a173 100644 >> --- a/drivers/clk/qcom/clk-branch.c >> +++ b/drivers/clk/qcom/clk-branch.c >> @@ -142,8 +142,12 @@ static int clk_branch2_mem_enable(struct clk_hw *hw) >> u32 val; >> int ret; >> >> - regmap_update_bits(branch.clkr.regmap, mem_br->mem_enable_reg, >> - mem_br->mem_enable_ack_mask, mem_br->mem_enable_ack_mask); >> + if (mem_br->mem_enable_invert) >> + regmap_update_bits(branch.clkr.regmap, mem_br->mem_enable_reg, >> + mem_br->mem_enable_mask, 0); >> + else >> + regmap_update_bits(branch.clkr.regmap, mem_br->mem_enable_reg, >> + mem_br->mem_enable_ack_mask, mem_br->mem_enable_ack_mask); > > regmap_assign_bits() is your friend > Thanks, Konrad, will use this API. > Konrad -- Thanks, Taniya Das ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 2/3] dt-bindings: clock: qcom: Add SM8750 video clock controller 2025-08-29 10:15 [PATCH v2 0/3] Add the support for SM8750 Video clock controller Taniya Das 2025-08-29 10:15 ` [PATCH v2 1/3] clk: qcom: branch: Extend invert logic for branch2 mem clocks Taniya Das @ 2025-08-29 10:15 ` Taniya Das 2025-09-15 10:58 ` Bryan O'Donoghue 2025-08-29 10:15 ` [PATCH v2 3/3] clk: qcom: videocc-sm8750: Add video clock controller driver for SM8750 Taniya Das 2 siblings, 1 reply; 15+ messages in thread From: Taniya Das @ 2025-08-29 10:15 UTC (permalink / raw) To: Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley Cc: Ajit Pandey, Imran Shaik, Jagadeesh Kona, linux-arm-msm, linux-clk, linux-kernel, devicetree, Taniya Das Add compatible string for SM8750 video clock controller and the bindings for SM8750 Qualcomm SoC. Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> Reviewed-by: Rob Herring (Arm) <robh@kernel.org> --- .../bindings/clock/qcom,sm8450-videocc.yaml | 5 ++- include/dt-bindings/clock/qcom,sm8750-videocc.h | 40 ++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml b/Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml index fcd2727dae46711650fc8fe71221a06630040026..b31bd833552937fa896f69966cfe5c79d9cfdd21 100644 --- a/Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Qualcomm Video Clock & Reset Controller on SM8450 maintainers: - - Taniya Das <quic_tdas@quicinc.com> + - Taniya Das <taniya.das@oss.qualcomm.com> - Jagadeesh Kona <quic_jkona@quicinc.com> description: | @@ -17,6 +17,7 @@ description: | See also: include/dt-bindings/clock/qcom,sm8450-videocc.h include/dt-bindings/clock/qcom,sm8650-videocc.h + include/dt-bindings/clock/qcom,sm8750-videocc.h properties: compatible: @@ -25,6 +26,7 @@ properties: - qcom,sm8475-videocc - qcom,sm8550-videocc - qcom,sm8650-videocc + - qcom,sm8750-videocc - qcom,x1e80100-videocc clocks: @@ -61,6 +63,7 @@ allOf: enum: - qcom,sm8450-videocc - qcom,sm8550-videocc + - qcom,sm8750-videocc then: required: - required-opps diff --git a/include/dt-bindings/clock/qcom,sm8750-videocc.h b/include/dt-bindings/clock/qcom,sm8750-videocc.h new file mode 100644 index 0000000000000000000000000000000000000000..f3bfa2ba51607d0133efcdad9c7729eb7a49b177 --- /dev/null +++ b/include/dt-bindings/clock/qcom,sm8750-videocc.h @@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ +/* + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. + */ + +#ifndef _DT_BINDINGS_CLK_QCOM_VIDEO_CC_SM8750_H +#define _DT_BINDINGS_CLK_QCOM_VIDEO_CC_SM8750_H + +/* VIDEO_CC clocks */ +#define VIDEO_CC_AHB_CLK 0 +#define VIDEO_CC_AHB_CLK_SRC 1 +#define VIDEO_CC_MVS0_CLK 2 +#define VIDEO_CC_MVS0_CLK_SRC 3 +#define VIDEO_CC_MVS0_DIV_CLK_SRC 4 +#define VIDEO_CC_MVS0_FREERUN_CLK 5 +#define VIDEO_CC_MVS0_SHIFT_CLK 6 +#define VIDEO_CC_MVS0C_CLK 7 +#define VIDEO_CC_MVS0C_DIV2_DIV_CLK_SRC 8 +#define VIDEO_CC_MVS0C_FREERUN_CLK 9 +#define VIDEO_CC_MVS0C_SHIFT_CLK 10 +#define VIDEO_CC_PLL0 11 +#define VIDEO_CC_SLEEP_CLK 12 +#define VIDEO_CC_SLEEP_CLK_SRC 13 +#define VIDEO_CC_XO_CLK 14 +#define VIDEO_CC_XO_CLK_SRC 15 + +/* VIDEO_CC power domains */ +#define VIDEO_CC_MVS0_GDSC 0 +#define VIDEO_CC_MVS0C_GDSC 1 + +/* VIDEO_CC resets */ +#define VIDEO_CC_INTERFACE_BCR 0 +#define VIDEO_CC_MVS0_BCR 1 +#define VIDEO_CC_MVS0C_CLK_ARES 2 +#define VIDEO_CC_MVS0C_BCR 3 +#define VIDEO_CC_MVS0_FREERUN_CLK_ARES 4 +#define VIDEO_CC_MVS0C_FREERUN_CLK_ARES 5 +#define VIDEO_CC_XO_CLK_ARES 6 + +#endif -- 2.34.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v2 2/3] dt-bindings: clock: qcom: Add SM8750 video clock controller 2025-08-29 10:15 ` [PATCH v2 2/3] dt-bindings: clock: qcom: Add SM8750 video clock controller Taniya Das @ 2025-09-15 10:58 ` Bryan O'Donoghue 2025-09-26 9:18 ` Taniya Das 2025-10-09 10:46 ` Krzysztof Kozlowski 0 siblings, 2 replies; 15+ messages in thread From: Bryan O'Donoghue @ 2025-09-15 10:58 UTC (permalink / raw) To: Taniya Das, Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley Cc: Ajit Pandey, Imran Shaik, Jagadeesh Kona, linux-arm-msm, linux-clk, linux-kernel, devicetree On 29/08/2025 11:15, Taniya Das wrote: > Add compatible string for SM8750 video clock controller and the bindings > for SM8750 Qualcomm SoC. > > Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> > Reviewed-by: Rob Herring (Arm) <robh@kernel.org> > --- > .../bindings/clock/qcom,sm8450-videocc.yaml | 5 ++- > include/dt-bindings/clock/qcom,sm8750-videocc.h | 40 ++++++++++++++++++++++ > 2 files changed, 44 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml b/Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml > index fcd2727dae46711650fc8fe71221a06630040026..b31bd833552937fa896f69966cfe5c79d9cfdd21 100644 > --- a/Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml > +++ b/Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml > @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# > title: Qualcomm Video Clock & Reset Controller on SM8450 > > maintainers: > - - Taniya Das <quic_tdas@quicinc.com> > + - Taniya Das <taniya.das@oss.qualcomm.com> > - Jagadeesh Kona <quic_jkona@quicinc.com> > > description: | > @@ -17,6 +17,7 @@ description: | > See also: > include/dt-bindings/clock/qcom,sm8450-videocc.h > include/dt-bindings/clock/qcom,sm8650-videocc.h > + include/dt-bindings/clock/qcom,sm8750-videocc.h > > properties: > compatible: > @@ -25,6 +26,7 @@ properties: > - qcom,sm8475-videocc > - qcom,sm8550-videocc > - qcom,sm8650-videocc > + - qcom,sm8750-videocc Shouldn't this be qcom,pakala-videocc now ? --- bod ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 2/3] dt-bindings: clock: qcom: Add SM8750 video clock controller 2025-09-15 10:58 ` Bryan O'Donoghue @ 2025-09-26 9:18 ` Taniya Das 2025-09-26 11:14 ` Konrad Dybcio 2025-10-09 10:46 ` Krzysztof Kozlowski 1 sibling, 1 reply; 15+ messages in thread From: Taniya Das @ 2025-09-26 9:18 UTC (permalink / raw) To: Bryan O'Donoghue, Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley Cc: Ajit Pandey, Imran Shaik, Jagadeesh Kona, linux-arm-msm, linux-clk, linux-kernel, devicetree On 9/15/2025 4:28 PM, Bryan O'Donoghue wrote: > On 29/08/2025 11:15, Taniya Das wrote: >> Add compatible string for SM8750 video clock controller and the bindings >> for SM8750 Qualcomm SoC. >> >> Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> >> Reviewed-by: Rob Herring (Arm) <robh@kernel.org> >> --- >> .../bindings/clock/qcom,sm8450-videocc.yaml | 5 ++- >> include/dt-bindings/clock/qcom,sm8750-videocc.h | 40 ++++++++++++ >> ++++++++++ >> 2 files changed, 44 insertions(+), 1 deletion(-) >> >> diff --git a/Documentation/devicetree/bindings/clock/qcom,sm8450- >> videocc.yaml b/Documentation/devicetree/bindings/clock/qcom,sm8450- >> videocc.yaml >> index >> fcd2727dae46711650fc8fe71221a06630040026..b31bd833552937fa896f69966cfe5c79d9cfdd21 100644 >> --- a/Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml >> +++ b/Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml >> @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# >> title: Qualcomm Video Clock & Reset Controller on SM8450 >> >> maintainers: >> - - Taniya Das <quic_tdas@quicinc.com> >> + - Taniya Das <taniya.das@oss.qualcomm.com> >> - Jagadeesh Kona <quic_jkona@quicinc.com> >> >> description: | >> @@ -17,6 +17,7 @@ description: | >> See also: >> include/dt-bindings/clock/qcom,sm8450-videocc.h >> include/dt-bindings/clock/qcom,sm8650-videocc.h >> + include/dt-bindings/clock/qcom,sm8750-videocc.h >> >> properties: >> compatible: >> @@ -25,6 +26,7 @@ properties: >> - qcom,sm8475-videocc >> - qcom,sm8550-videocc >> - qcom,sm8650-videocc >> + - qcom,sm8750-videocc > > Shouldn't this be qcom,pakala-videocc now ? > As of now, Bryan, all of Pakala is using the SM8750. We can migrate everything together to maintain consistency. -- Thanks, Taniya Das ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 2/3] dt-bindings: clock: qcom: Add SM8750 video clock controller 2025-09-26 9:18 ` Taniya Das @ 2025-09-26 11:14 ` Konrad Dybcio 2025-10-09 10:36 ` Taniya Das 0 siblings, 1 reply; 15+ messages in thread From: Konrad Dybcio @ 2025-09-26 11:14 UTC (permalink / raw) To: Taniya Das, Bryan O'Donoghue, Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley Cc: Ajit Pandey, Imran Shaik, Jagadeesh Kona, linux-arm-msm, linux-clk, linux-kernel, devicetree On 9/26/25 11:18 AM, Taniya Das wrote: > > > On 9/15/2025 4:28 PM, Bryan O'Donoghue wrote: >> On 29/08/2025 11:15, Taniya Das wrote: >>> Add compatible string for SM8750 video clock controller and the bindings >>> for SM8750 Qualcomm SoC. >>> >>> Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> >>> Reviewed-by: Rob Herring (Arm) <robh@kernel.org> >>> --- [...] >>> properties: >>> compatible: >>> @@ -25,6 +26,7 @@ properties: >>> - qcom,sm8475-videocc >>> - qcom,sm8550-videocc >>> - qcom,sm8650-videocc >>> + - qcom,sm8750-videocc >> >> Shouldn't this be qcom,pakala-videocc now ? >> > > As of now, Bryan, all of Pakala is using the SM8750. We can migrate > everything together to maintain consistency. We settled on keeping new compatibles numerical for already-numerical platforms (except board compatibles where all the fuss was / as it makes sense) Konrad ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 2/3] dt-bindings: clock: qcom: Add SM8750 video clock controller 2025-09-26 11:14 ` Konrad Dybcio @ 2025-10-09 10:36 ` Taniya Das 0 siblings, 0 replies; 15+ messages in thread From: Taniya Das @ 2025-10-09 10:36 UTC (permalink / raw) To: Konrad Dybcio, Bryan O'Donoghue, Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley Cc: Ajit Pandey, Imran Shaik, Jagadeesh Kona, linux-arm-msm, linux-clk, linux-kernel, devicetree On 9/26/2025 4:44 PM, Konrad Dybcio wrote: > On 9/26/25 11:18 AM, Taniya Das wrote: >> >> >> On 9/15/2025 4:28 PM, Bryan O'Donoghue wrote: >>> On 29/08/2025 11:15, Taniya Das wrote: >>>> Add compatible string for SM8750 video clock controller and the bindings >>>> for SM8750 Qualcomm SoC. >>>> >>>> Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> >>>> Reviewed-by: Rob Herring (Arm) <robh@kernel.org> >>>> --- > > [...] > >>>> properties: >>>> compatible: >>>> @@ -25,6 +26,7 @@ properties: >>>> - qcom,sm8475-videocc >>>> - qcom,sm8550-videocc >>>> - qcom,sm8650-videocc >>>> + - qcom,sm8750-videocc >>> >>> Shouldn't this be qcom,pakala-videocc now ? >>> >> >> As of now, Bryan, all of Pakala is using the SM8750. We can migrate >> everything together to maintain consistency. > > We settled on keeping new compatibles numerical for already-numerical > platforms (except board compatibles where all the fuss was / as it makes > sense) > > Konrad Thanks Konrad, will keep "qcom,sm8750-videocc". -- Thanks, Taniya Das ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 2/3] dt-bindings: clock: qcom: Add SM8750 video clock controller 2025-09-15 10:58 ` Bryan O'Donoghue 2025-09-26 9:18 ` Taniya Das @ 2025-10-09 10:46 ` Krzysztof Kozlowski 1 sibling, 0 replies; 15+ messages in thread From: Krzysztof Kozlowski @ 2025-10-09 10:46 UTC (permalink / raw) To: Bryan O'Donoghue, Taniya Das, Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley Cc: Ajit Pandey, Imran Shaik, Jagadeesh Kona, linux-arm-msm, linux-clk, linux-kernel, devicetree On 15/09/2025 19:58, Bryan O'Donoghue wrote: >> properties: >> compatible: >> @@ -25,6 +26,7 @@ properties: >> - qcom,sm8475-videocc >> - qcom,sm8550-videocc >> - qcom,sm8650-videocc >> + - qcom,sm8750-videocc > > Shouldn't this be qcom,pakala-videocc now ? No, why? There is no such soc as "pakala". See qcom bindings. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 3/3] clk: qcom: videocc-sm8750: Add video clock controller driver for SM8750 2025-08-29 10:15 [PATCH v2 0/3] Add the support for SM8750 Video clock controller Taniya Das 2025-08-29 10:15 ` [PATCH v2 1/3] clk: qcom: branch: Extend invert logic for branch2 mem clocks Taniya Das 2025-08-29 10:15 ` [PATCH v2 2/3] dt-bindings: clock: qcom: Add SM8750 video clock controller Taniya Das @ 2025-08-29 10:15 ` Taniya Das 2025-09-12 11:08 ` Konrad Dybcio 2 siblings, 1 reply; 15+ messages in thread From: Taniya Das @ 2025-08-29 10:15 UTC (permalink / raw) To: Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley Cc: Ajit Pandey, Imran Shaik, Jagadeesh Kona, linux-arm-msm, linux-clk, linux-kernel, devicetree, Taniya Das Add support for the video clock controller for video clients to be able to request for videocc clocks on SM8750 platform. Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> --- drivers/clk/qcom/Kconfig | 11 + drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/videocc-sm8750.c | 472 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 484 insertions(+) diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig index aeb6197d7c902098459c9b2cba75072bd519b0f3..2c5a0c86e01f0bf2518e5b78a9f50835fac3d019 100644 --- a/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig @@ -1489,6 +1489,17 @@ config SM_VIDEOCC_8550 Say Y if you want to support video devices and functionality such as video encode/decode. +config SM_VIDEOCC_8750 + tristate "SM8750 Video Clock Controller" + depends on ARM64 || COMPILE_TEST + select SM_GCC_8750 + select QCOM_GDSC + help + Support for the video clock controller on Qualcomm Technologies, Inc. + SM8750 devices. + Say Y if you want to support video devices and functionality such as + video encode/decode. + config SPMI_PMIC_CLKDIV tristate "SPMI PMIC clkdiv Support" depends on SPMI || COMPILE_TEST diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile index 98de55eb64026a12d89587db295f8a6ac59ee2f7..fccb7eb5135dc4df3ccadf711f2c7b9ce0459a83 100644 --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile @@ -181,6 +181,7 @@ obj-$(CONFIG_SM_VIDEOCC_8250) += videocc-sm8250.o obj-$(CONFIG_SM_VIDEOCC_8350) += videocc-sm8350.o obj-$(CONFIG_SM_VIDEOCC_8450) += videocc-sm8450.o obj-$(CONFIG_SM_VIDEOCC_8550) += videocc-sm8550.o +obj-$(CONFIG_SM_VIDEOCC_8750) += videocc-sm8750.o obj-$(CONFIG_SM_VIDEOCC_MILOS) += videocc-milos.o obj-$(CONFIG_SPMI_PMIC_CLKDIV) += clk-spmi-pmic-div.o obj-$(CONFIG_KPSS_XCC) += kpss-xcc.o diff --git a/drivers/clk/qcom/videocc-sm8750.c b/drivers/clk/qcom/videocc-sm8750.c new file mode 100644 index 0000000000000000000000000000000000000000..27b5b34602da0dcde8826e9d2fdbda5ff09fde5b --- /dev/null +++ b/drivers/clk/qcom/videocc-sm8750.c @@ -0,0 +1,472 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. + */ + +#include <linux/clk-provider.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/regmap.h> + +#include <dt-bindings/clock/qcom,sm8750-videocc.h> + +#include "clk-alpha-pll.h" +#include "clk-branch.h" +#include "clk-pll.h" +#include "clk-rcg.h" +#include "clk-regmap.h" +#include "clk-regmap-divider.h" +#include "clk-regmap-mux.h" +#include "common.h" +#include "gdsc.h" +#include "reset.h" + +enum { + DT_BI_TCXO, + DT_BI_TCXO_AO, + DT_SLEEP_CLK, +}; + +enum { + P_BI_TCXO, + P_SLEEP_CLK, + P_VIDEO_CC_PLL0_OUT_MAIN, +}; + +static const struct pll_vco taycan_elu_vco[] = { + { 249600000, 2500000000, 0 }, +}; + +static const struct alpha_pll_config video_cc_pll0_config = { + .l = 0x25, + .alpha = 0x8000, + .config_ctl_val = 0x19660387, + .config_ctl_hi_val = 0x098060a0, + .config_ctl_hi1_val = 0xb416cb20, + .user_ctl_val = 0x00000000, + .user_ctl_hi_val = 0x00000002, +}; + +static struct clk_alpha_pll video_cc_pll0 = { + .offset = 0x0, + .vco_table = taycan_elu_vco, + .num_vco = ARRAY_SIZE(taycan_elu_vco), + .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_TAYCAN_ELU], + .clkr = { + .hw.init = &(const struct clk_init_data) { + .name = "video_cc_pll0", + .parent_data = &(const struct clk_parent_data) { + .index = DT_BI_TCXO, + }, + .num_parents = 1, + .ops = &clk_alpha_pll_taycan_elu_ops, + }, + }, +}; + +static const struct parent_map video_cc_parent_map_0[] = { + { P_BI_TCXO, 0 }, +}; + +static const struct clk_parent_data video_cc_parent_data_0_ao[] = { + { .index = DT_BI_TCXO_AO }, +}; + +static const struct parent_map video_cc_parent_map_1[] = { + { P_BI_TCXO, 0 }, + { P_VIDEO_CC_PLL0_OUT_MAIN, 1 }, +}; + +static const struct clk_parent_data video_cc_parent_data_1[] = { + { .index = DT_BI_TCXO }, + { .hw = &video_cc_pll0.clkr.hw }, +}; + +static const struct parent_map video_cc_parent_map_2[] = { + { P_SLEEP_CLK, 0 }, +}; + +static const struct clk_parent_data video_cc_parent_data_2_ao[] = { + { .index = DT_SLEEP_CLK }, +}; + +static const struct freq_tbl ftbl_video_cc_ahb_clk_src[] = { + F(19200000, P_BI_TCXO, 1, 0, 0), + { } +}; + +static struct clk_rcg2 video_cc_ahb_clk_src = { + .cmd_rcgr = 0x8018, + .mnd_width = 0, + .hid_width = 5, + .parent_map = video_cc_parent_map_0, + .freq_tbl = ftbl_video_cc_ahb_clk_src, + .clkr.hw.init = &(const struct clk_init_data) { + .name = "video_cc_ahb_clk_src", + .parent_data = video_cc_parent_data_0_ao, + .num_parents = ARRAY_SIZE(video_cc_parent_data_0_ao), + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_rcg2_ops, + }, +}; + +static const struct freq_tbl ftbl_video_cc_mvs0_clk_src[] = { + F(720000000, P_VIDEO_CC_PLL0_OUT_MAIN, 1, 0, 0), + F(1014000000, P_VIDEO_CC_PLL0_OUT_MAIN, 1, 0, 0), + F(1260000000, P_VIDEO_CC_PLL0_OUT_MAIN, 1, 0, 0), + F(1332000000, P_VIDEO_CC_PLL0_OUT_MAIN, 1, 0, 0), + F(1600000000, P_VIDEO_CC_PLL0_OUT_MAIN, 1, 0, 0), + F(1710000000, P_VIDEO_CC_PLL0_OUT_MAIN, 1, 0, 0), + F(1890000000, P_VIDEO_CC_PLL0_OUT_MAIN, 1, 0, 0), + { } +}; + +static struct clk_rcg2 video_cc_mvs0_clk_src = { + .cmd_rcgr = 0x8000, + .mnd_width = 0, + .hid_width = 5, + .parent_map = video_cc_parent_map_1, + .freq_tbl = ftbl_video_cc_mvs0_clk_src, + .clkr.hw.init = &(const struct clk_init_data) { + .name = "video_cc_mvs0_clk_src", + .parent_data = video_cc_parent_data_1, + .num_parents = ARRAY_SIZE(video_cc_parent_data_1), + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_rcg2_shared_ops, + }, +}; + +static const struct freq_tbl ftbl_video_cc_sleep_clk_src[] = { + F(32000, P_SLEEP_CLK, 1, 0, 0), + { } +}; + +static struct clk_rcg2 video_cc_sleep_clk_src = { + .cmd_rcgr = 0x80e0, + .mnd_width = 0, + .hid_width = 5, + .parent_map = video_cc_parent_map_2, + .freq_tbl = ftbl_video_cc_sleep_clk_src, + .clkr.hw.init = &(const struct clk_init_data) { + .name = "video_cc_sleep_clk_src", + .parent_data = video_cc_parent_data_2_ao, + .num_parents = ARRAY_SIZE(video_cc_parent_data_2_ao), + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 video_cc_xo_clk_src = { + .cmd_rcgr = 0x80bc, + .mnd_width = 0, + .hid_width = 5, + .parent_map = video_cc_parent_map_0, + .freq_tbl = ftbl_video_cc_ahb_clk_src, + .clkr.hw.init = &(const struct clk_init_data) { + .name = "video_cc_xo_clk_src", + .parent_data = video_cc_parent_data_0_ao, + .num_parents = ARRAY_SIZE(video_cc_parent_data_0_ao), + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_regmap_div video_cc_mvs0_div_clk_src = { + .reg = 0x809c, + .shift = 0, + .width = 4, + .clkr.hw.init = &(const struct clk_init_data) { + .name = "video_cc_mvs0_div_clk_src", + .parent_hws = (const struct clk_hw*[]) { + &video_cc_mvs0_clk_src.clkr.hw, + }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_regmap_div_ro_ops, + }, +}; + +static struct clk_regmap_div video_cc_mvs0c_div2_div_clk_src = { + .reg = 0x8060, + .shift = 0, + .width = 4, + .clkr.hw.init = &(const struct clk_init_data) { + .name = "video_cc_mvs0c_div2_div_clk_src", + .parent_hws = (const struct clk_hw*[]) { + &video_cc_mvs0_clk_src.clkr.hw, + }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_regmap_div_ro_ops, + }, +}; + +static struct clk_branch video_cc_mvs0_clk = { + .halt_reg = 0x807c, + .halt_check = BRANCH_HALT_VOTED, + .hwcg_reg = 0x807c, + .hwcg_bit = 1, + .clkr = { + .enable_reg = 0x807c, + .enable_mask = BIT(0), + .hw.init = &(const struct clk_init_data) { + .name = "video_cc_mvs0_clk", + .parent_hws = (const struct clk_hw*[]) { + &video_cc_mvs0_div_clk_src.clkr.hw, + }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_mem_branch video_cc_mvs0_freerun_clk = { + .mem_enable_reg = 0x8090, + .mem_ack_reg = 0x8090, + .mem_enable_mask = BIT(3), + .mem_enable_ack_mask = 0xc00, + .mem_enable_invert = true, + .branch = { + .halt_reg = 0x808c, + .halt_check = BRANCH_HALT, + .clkr = { + .enable_reg = 0x808c, + .enable_mask = BIT(0), + .hw.init = &(const struct clk_init_data) { + .name = "video_cc_mvs0_freerun_clk", + .parent_hws = (const struct clk_hw*[]) { + &video_cc_mvs0_div_clk_src.clkr.hw, + }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_branch2_mem_ops, + }, + }, + }, +}; + +static struct clk_branch video_cc_mvs0_shift_clk = { + .halt_reg = 0x80d8, + .halt_check = BRANCH_HALT_VOTED, + .hwcg_reg = 0x80d8, + .hwcg_bit = 1, + .clkr = { + .enable_reg = 0x80d8, + .enable_mask = BIT(0), + .hw.init = &(const struct clk_init_data) { + .name = "video_cc_mvs0_shift_clk", + .parent_hws = (const struct clk_hw*[]) { + &video_cc_xo_clk_src.clkr.hw, + }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch video_cc_mvs0c_clk = { + .halt_reg = 0x804c, + .halt_check = BRANCH_HALT, + .clkr = { + .enable_reg = 0x804c, + .enable_mask = BIT(0), + .hw.init = &(const struct clk_init_data) { + .name = "video_cc_mvs0c_clk", + .parent_hws = (const struct clk_hw*[]) { + &video_cc_mvs0c_div2_div_clk_src.clkr.hw, + }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch video_cc_mvs0c_freerun_clk = { + .halt_reg = 0x805c, + .halt_check = BRANCH_HALT, + .clkr = { + .enable_reg = 0x805c, + .enable_mask = BIT(0), + .hw.init = &(const struct clk_init_data) { + .name = "video_cc_mvs0c_freerun_clk", + .parent_hws = (const struct clk_hw*[]) { + &video_cc_mvs0c_div2_div_clk_src.clkr.hw, + }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch video_cc_mvs0c_shift_clk = { + .halt_reg = 0x80dc, + .halt_check = BRANCH_HALT_VOTED, + .hwcg_reg = 0x80dc, + .hwcg_bit = 1, + .clkr = { + .enable_reg = 0x80dc, + .enable_mask = BIT(0), + .hw.init = &(const struct clk_init_data) { + .name = "video_cc_mvs0c_shift_clk", + .parent_hws = (const struct clk_hw*[]) { + &video_cc_xo_clk_src.clkr.hw, + }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct gdsc video_cc_mvs0c_gdsc = { + .gdscr = 0x8034, + .en_rest_wait_val = 0x2, + .en_few_wait_val = 0x2, + .clk_dis_wait_val = 0x6, + .pd = { + .name = "video_cc_mvs0c_gdsc", + }, + .pwrsts = PWRSTS_OFF_ON, + .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, +}; + +static struct gdsc video_cc_mvs0_gdsc = { + .gdscr = 0x8068, + .en_rest_wait_val = 0x2, + .en_few_wait_val = 0x2, + .clk_dis_wait_val = 0x6, + .pd = { + .name = "video_cc_mvs0_gdsc", + }, + .pwrsts = PWRSTS_OFF_ON, + .parent = &video_cc_mvs0c_gdsc.pd, + .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE | HW_CTRL_TRIGGER, +}; + +static struct clk_regmap *video_cc_sm8750_clocks[] = { + [VIDEO_CC_AHB_CLK_SRC] = &video_cc_ahb_clk_src.clkr, + [VIDEO_CC_MVS0_CLK] = &video_cc_mvs0_clk.clkr, + [VIDEO_CC_MVS0_CLK_SRC] = &video_cc_mvs0_clk_src.clkr, + [VIDEO_CC_MVS0_DIV_CLK_SRC] = &video_cc_mvs0_div_clk_src.clkr, + [VIDEO_CC_MVS0_FREERUN_CLK] = &video_cc_mvs0_freerun_clk.branch.clkr, + [VIDEO_CC_MVS0_SHIFT_CLK] = &video_cc_mvs0_shift_clk.clkr, + [VIDEO_CC_MVS0C_CLK] = &video_cc_mvs0c_clk.clkr, + [VIDEO_CC_MVS0C_DIV2_DIV_CLK_SRC] = &video_cc_mvs0c_div2_div_clk_src.clkr, + [VIDEO_CC_MVS0C_FREERUN_CLK] = &video_cc_mvs0c_freerun_clk.clkr, + [VIDEO_CC_MVS0C_SHIFT_CLK] = &video_cc_mvs0c_shift_clk.clkr, + [VIDEO_CC_PLL0] = &video_cc_pll0.clkr, + [VIDEO_CC_SLEEP_CLK_SRC] = &video_cc_sleep_clk_src.clkr, + [VIDEO_CC_XO_CLK_SRC] = &video_cc_xo_clk_src.clkr, +}; + +static struct gdsc *video_cc_sm8750_gdscs[] = { + [VIDEO_CC_MVS0_GDSC] = &video_cc_mvs0_gdsc, + [VIDEO_CC_MVS0C_GDSC] = &video_cc_mvs0c_gdsc, +}; + +static const struct qcom_reset_map video_cc_sm8750_resets[] = { + [VIDEO_CC_INTERFACE_BCR] = { 0x80a0 }, + [VIDEO_CC_MVS0_BCR] = { 0x8064 }, + [VIDEO_CC_MVS0C_CLK_ARES] = { 0x804c, 2 }, + [VIDEO_CC_MVS0C_BCR] = { 0x8030 }, + [VIDEO_CC_MVS0_FREERUN_CLK_ARES] = { 0x808c, 2 }, + [VIDEO_CC_MVS0C_FREERUN_CLK_ARES] = { 0x805c, 2 }, + [VIDEO_CC_XO_CLK_ARES] = { 0x80d4, 2 }, +}; + +static const struct regmap_config video_cc_sm8750_regmap_config = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .max_register = 0x9f4c, + .fast_io = true, +}; + +static struct qcom_cc_desc video_cc_sm8750_desc = { + .config = &video_cc_sm8750_regmap_config, + .clks = video_cc_sm8750_clocks, + .num_clks = ARRAY_SIZE(video_cc_sm8750_clocks), + .resets = video_cc_sm8750_resets, + .num_resets = ARRAY_SIZE(video_cc_sm8750_resets), + .gdscs = video_cc_sm8750_gdscs, + .num_gdscs = ARRAY_SIZE(video_cc_sm8750_gdscs), +}; + +static const struct of_device_id video_cc_sm8750_match_table[] = { + { .compatible = "qcom,sm8750-videocc" }, + { } +}; +MODULE_DEVICE_TABLE(of, video_cc_sm8750_match_table); + +static int video_cc_sm8750_probe(struct platform_device *pdev) +{ + struct regmap *regmap; + int ret; + + ret = devm_pm_runtime_enable(&pdev->dev); + if (ret) + return ret; + + ret = pm_runtime_resume_and_get(&pdev->dev); + if (ret) + return ret; + + regmap = qcom_cc_map(pdev, &video_cc_sm8750_desc); + if (IS_ERR(regmap)) { + pm_runtime_put(&pdev->dev); + return PTR_ERR(regmap); + } + + clk_taycan_elu_pll_configure(&video_cc_pll0, regmap, &video_cc_pll0_config); + + /* Update DLY_ACCU_RED_SHIFTER_DONE to 0xF for mvs0, mvs0c */ + regmap_update_bits(regmap, 0x8074, 0x1e00000, 0x1e00000); + regmap_update_bits(regmap, 0x8040, 0x1e00000, 0x1e00000); + + regmap_update_bits(regmap, 0x9f24, BIT(0), BIT(0)); + + /* + * Keep clocks always enabled: + * video_cc_ahb_clk + * video_cc_sleep_clk + * video_cc_xo_clk + */ + regmap_update_bits(regmap, 0x80a4, BIT(0), BIT(0)); + regmap_update_bits(regmap, 0x80f8, BIT(0), BIT(0)); + regmap_update_bits(regmap, 0x80d4, BIT(0), BIT(0)); + + ret = qcom_cc_really_probe(&pdev->dev, &video_cc_sm8750_desc, regmap); + + pm_runtime_put(&pdev->dev); + + return ret; +} + +static struct platform_driver video_cc_sm8750_driver = { + .probe = video_cc_sm8750_probe, + .driver = { + .name = "video_cc-sm8750", + .of_match_table = video_cc_sm8750_match_table, + }, +}; + +static int __init video_cc_sm8750_init(void) +{ + return platform_driver_register(&video_cc_sm8750_driver); +} +subsys_initcall(video_cc_sm8750_init); + +static void __exit video_cc_sm8750_exit(void) +{ + platform_driver_unregister(&video_cc_sm8750_driver); +} +module_exit(video_cc_sm8750_exit); + +MODULE_DESCRIPTION("QTI VIDEO_CC SM8750 Driver"); +MODULE_LICENSE("GPL"); -- 2.34.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v2 3/3] clk: qcom: videocc-sm8750: Add video clock controller driver for SM8750 2025-08-29 10:15 ` [PATCH v2 3/3] clk: qcom: videocc-sm8750: Add video clock controller driver for SM8750 Taniya Das @ 2025-09-12 11:08 ` Konrad Dybcio 2025-09-26 9:20 ` Taniya Das 0 siblings, 1 reply; 15+ messages in thread From: Konrad Dybcio @ 2025-09-12 11:08 UTC (permalink / raw) To: Taniya Das, Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley Cc: Ajit Pandey, Imran Shaik, Jagadeesh Kona, linux-arm-msm, linux-clk, linux-kernel, devicetree On 8/29/25 12:15 PM, Taniya Das wrote: > Add support for the video clock controller for video clients to be able > to request for videocc clocks on SM8750 platform. > > Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> > --- [...] > +static int video_cc_sm8750_probe(struct platform_device *pdev) > +{ > + struct regmap *regmap; > + int ret; > + > + ret = devm_pm_runtime_enable(&pdev->dev); > + if (ret) > + return ret; > + > + ret = pm_runtime_resume_and_get(&pdev->dev); > + if (ret) > + return ret; > + > + regmap = qcom_cc_map(pdev, &video_cc_sm8750_desc); > + if (IS_ERR(regmap)) { > + pm_runtime_put(&pdev->dev); > + return PTR_ERR(regmap); > + } > + > + clk_taycan_elu_pll_configure(&video_cc_pll0, regmap, &video_cc_pll0_config); > + > + /* Update DLY_ACCU_RED_SHIFTER_DONE to 0xF for mvs0, mvs0c */ > + regmap_update_bits(regmap, 0x8074, 0x1e00000, 0x1e00000); regmap_update_bits(..., GENMASK(x, y) /* full field width */, 0xf) would be easier for the next person to check against docs in case this needs to ever change or be validated > + regmap_update_bits(regmap, 0x8040, 0x1e00000, 0x1e00000); > + > + regmap_update_bits(regmap, 0x9f24, BIT(0), BIT(0)); The register description mentions a ticket which I believe says this is not necessary in production hardware > + > + /* > + * Keep clocks always enabled: > + * video_cc_ahb_clk > + * video_cc_sleep_clk > + * video_cc_xo_clk > + */ > + regmap_update_bits(regmap, 0x80a4, BIT(0), BIT(0)); > + regmap_update_bits(regmap, 0x80f8, BIT(0), BIT(0)); > + regmap_update_bits(regmap, 0x80d4, BIT(0), BIT(0)); Please use the new _desc infra Konrad ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 3/3] clk: qcom: videocc-sm8750: Add video clock controller driver for SM8750 2025-09-12 11:08 ` Konrad Dybcio @ 2025-09-26 9:20 ` Taniya Das 0 siblings, 0 replies; 15+ messages in thread From: Taniya Das @ 2025-09-26 9:20 UTC (permalink / raw) To: Konrad Dybcio, Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley Cc: Ajit Pandey, Imran Shaik, Jagadeesh Kona, linux-arm-msm, linux-clk, linux-kernel, devicetree On 9/12/2025 4:38 PM, Konrad Dybcio wrote: > On 8/29/25 12:15 PM, Taniya Das wrote: >> Add support for the video clock controller for video clients to be able >> to request for videocc clocks on SM8750 platform. >> >> Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> >> --- > > [...] > >> +static int video_cc_sm8750_probe(struct platform_device *pdev) >> +{ >> + struct regmap *regmap; >> + int ret; >> + >> + ret = devm_pm_runtime_enable(&pdev->dev); >> + if (ret) >> + return ret; >> + >> + ret = pm_runtime_resume_and_get(&pdev->dev); >> + if (ret) >> + return ret; >> + >> + regmap = qcom_cc_map(pdev, &video_cc_sm8750_desc); >> + if (IS_ERR(regmap)) { >> + pm_runtime_put(&pdev->dev); >> + return PTR_ERR(regmap); >> + } >> + >> + clk_taycan_elu_pll_configure(&video_cc_pll0, regmap, &video_cc_pll0_config); >> + >> + /* Update DLY_ACCU_RED_SHIFTER_DONE to 0xF for mvs0, mvs0c */ >> + regmap_update_bits(regmap, 0x8074, 0x1e00000, 0x1e00000); > > regmap_update_bits(..., GENMASK(x, y) /* full field width */, 0xf) Sure, Konrad, will update the change. > > would be easier for the next person to check against docs in case this > needs to ever change or be validated >> + regmap_update_bits(regmap, 0x8040, 0x1e00000, 0x1e00000); >> + >> + regmap_update_bits(regmap, 0x9f24, BIT(0), BIT(0)); > > The register description mentions a ticket which I believe says this > is not necessary in production hardware > It is required on production hardware as well. >> + >> + /* >> + * Keep clocks always enabled: >> + * video_cc_ahb_clk >> + * video_cc_sleep_clk >> + * video_cc_xo_clk >> + */ >> + regmap_update_bits(regmap, 0x80a4, BIT(0), BIT(0)); >> + regmap_update_bits(regmap, 0x80f8, BIT(0), BIT(0)); >> + regmap_update_bits(regmap, 0x80d4, BIT(0), BIT(0)); > > Please use the new _desc infra > > Konrad Yes, will migrate to use the _desc infra. -- Thanks, Taniya Das ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2025-10-09 10:46 UTC | newest] Thread overview: 15+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2025-08-29 10:15 [PATCH v2 0/3] Add the support for SM8750 Video clock controller Taniya Das 2025-08-29 10:15 ` [PATCH v2 1/3] clk: qcom: branch: Extend invert logic for branch2 mem clocks Taniya Das 2025-08-30 0:17 ` Dmitry Baryshkov 2025-09-03 6:48 ` Taniya Das 2025-09-02 11:57 ` Konrad Dybcio 2025-09-03 6:50 ` Taniya Das 2025-08-29 10:15 ` [PATCH v2 2/3] dt-bindings: clock: qcom: Add SM8750 video clock controller Taniya Das 2025-09-15 10:58 ` Bryan O'Donoghue 2025-09-26 9:18 ` Taniya Das 2025-09-26 11:14 ` Konrad Dybcio 2025-10-09 10:36 ` Taniya Das 2025-10-09 10:46 ` Krzysztof Kozlowski 2025-08-29 10:15 ` [PATCH v2 3/3] clk: qcom: videocc-sm8750: Add video clock controller driver for SM8750 Taniya Das 2025-09-12 11:08 ` Konrad Dybcio 2025-09-26 9:20 ` Taniya Das
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox