* [PATCH 0/3] Add video clock controller for SM6350
@ 2025-03-21 14:44 Luca Weiss
2025-03-21 14:44 ` [PATCH 1/3] dt-bindings: clock: add SM6350 QCOM video clock bindings Luca Weiss
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Luca Weiss @ 2025-03-21 14:44 UTC (permalink / raw)
To: Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Taniya Das, Konrad Dybcio
Cc: ~postmarketos/upstreaming, phone-devel, linux-arm-msm, linux-clk,
devicetree, linux-kernel, Luca Weiss
The driver for the SM6350 videocc has been lying around in some branches
of my git tree for a long time, let's upstream it. It doesn't get any
better by letting it age!
Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
---
Konrad Dybcio (2):
dt-bindings: clock: add SM6350 QCOM video clock bindings
clk: qcom: Add video clock controller driver for SM6350
Luca Weiss (1):
arm64: dts: qcom: sm6350: Add video clock controller
.../devicetree/bindings/clock/qcom,videocc.yaml | 20 ++
arch/arm64/boot/dts/qcom/sm6350.dtsi | 14 +
drivers/clk/qcom/Kconfig | 9 +
drivers/clk/qcom/Makefile | 1 +
drivers/clk/qcom/videocc-sm6350.c | 355 +++++++++++++++++++++
include/dt-bindings/clock/qcom,sm6350-videocc.h | 27 ++
6 files changed, 426 insertions(+)
---
base-commit: 73b8c1dbc2508188e383023080ce6a582ff5f279
change-id: 20250321-sm6350-videocc-6ecdb9ab2756
Best regards,
--
Luca Weiss <luca.weiss@fairphone.com>
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/3] dt-bindings: clock: add SM6350 QCOM video clock bindings 2025-03-21 14:44 [PATCH 0/3] Add video clock controller for SM6350 Luca Weiss @ 2025-03-21 14:44 ` Luca Weiss 2025-03-21 14:45 ` [PATCH 2/3] clk: qcom: Add video clock controller driver for SM6350 Luca Weiss 2025-03-21 14:45 ` [PATCH 3/3] arm64: dts: qcom: sm6350: Add video clock controller Luca Weiss 2 siblings, 0 replies; 10+ messages in thread From: Luca Weiss @ 2025-03-21 14:44 UTC (permalink / raw) To: Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Taniya Das, Konrad Dybcio Cc: ~postmarketos/upstreaming, phone-devel, linux-arm-msm, linux-clk, devicetree, linux-kernel, Luca Weiss From: Konrad Dybcio <konradybcio@kernel.org> Add device tree bindings for video clock controller for SM6350 SoCs. Signed-off-by: Konrad Dybcio <konradybcio@kernel.org> Co-developed-by: Luca Weiss <luca.weiss@fairphone.com> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> --- .../devicetree/bindings/clock/qcom,videocc.yaml | 20 ++++++++++++++++ include/dt-bindings/clock/qcom,sm6350-videocc.h | 27 ++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/Documentation/devicetree/bindings/clock/qcom,videocc.yaml b/Documentation/devicetree/bindings/clock/qcom,videocc.yaml index 340c7e5cf98024dedad6d7db4fea10e9f8077419..5f7738d6835c4ba999402e163fc85a07e3a47a5a 100644 --- a/Documentation/devicetree/bindings/clock/qcom,videocc.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,videocc.yaml @@ -14,6 +14,7 @@ description: | domains on Qualcomm SoCs. See also:: + include/dt-bindings/clock/qcom,sm6350-videocc.h include/dt-bindings/clock/qcom,videocc-sc7180.h include/dt-bindings/clock/qcom,videocc-sc7280.h include/dt-bindings/clock/qcom,videocc-sdm845.h @@ -26,6 +27,7 @@ properties: - qcom,sc7180-videocc - qcom,sc7280-videocc - qcom,sdm845-videocc + - qcom,sm6350-videocc - qcom,sm8150-videocc - qcom,sm8250-videocc @@ -87,6 +89,24 @@ allOf: - const: bi_tcxo - const: bi_tcxo_ao + - if: + properties: + compatible: + enum: + - qcom,sm6350-videocc + then: + properties: + clocks: + items: + - description: Video AHB clock from GCC + - description: Board XO source + - description: Sleep Clock source + clock-names: + items: + - const: iface + - const: bi_tcxo + - const: sleep_clk + - if: properties: compatible: diff --git a/include/dt-bindings/clock/qcom,sm6350-videocc.h b/include/dt-bindings/clock/qcom,sm6350-videocc.h new file mode 100644 index 0000000000000000000000000000000000000000..2af7f91fa023bed469bbb2c071d93383dba29441 --- /dev/null +++ b/include/dt-bindings/clock/qcom,sm6350-videocc.h @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ +/* + * Copyright (c) 2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2021, Konrad Dybcio <konrad.dybcio@somainline.org> + */ + +#ifndef _DT_BINDINGS_CLK_QCOM_VIDEO_CC_SM6350_H +#define _DT_BINDINGS_CLK_QCOM_VIDEO_CC_SM6350_H + +/* VIDEO_CC clocks */ +#define VIDEO_PLL0 0 +#define VIDEO_PLL0_OUT_EVEN 1 +#define VIDEO_CC_IRIS_AHB_CLK 2 +#define VIDEO_CC_IRIS_CLK_SRC 3 +#define VIDEO_CC_MVS0_AXI_CLK 4 +#define VIDEO_CC_MVS0_CORE_CLK 5 +#define VIDEO_CC_MVSC_CORE_CLK 6 +#define VIDEO_CC_MVSC_CTL_AXI_CLK 7 +#define VIDEO_CC_SLEEP_CLK 8 +#define VIDEO_CC_SLEEP_CLK_SRC 9 +#define VIDEO_CC_VENUS_AHB_CLK 10 + +/* GDSCs */ +#define MVSC_GDSC 0 +#define MVS0_GDSC 1 + +#endif -- 2.49.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/3] clk: qcom: Add video clock controller driver for SM6350 2025-03-21 14:44 [PATCH 0/3] Add video clock controller for SM6350 Luca Weiss 2025-03-21 14:44 ` [PATCH 1/3] dt-bindings: clock: add SM6350 QCOM video clock bindings Luca Weiss @ 2025-03-21 14:45 ` Luca Weiss 2025-03-21 15:55 ` Dmitry Baryshkov 2025-03-21 14:45 ` [PATCH 3/3] arm64: dts: qcom: sm6350: Add video clock controller Luca Weiss 2 siblings, 1 reply; 10+ messages in thread From: Luca Weiss @ 2025-03-21 14:45 UTC (permalink / raw) To: Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Taniya Das, Konrad Dybcio Cc: ~postmarketos/upstreaming, phone-devel, linux-arm-msm, linux-clk, devicetree, linux-kernel, Luca Weiss From: Konrad Dybcio <konradybcio@kernel.org> Add support for the video clock controller found on SM6350 based devices. Signed-off-by: Konrad Dybcio <konradybcio@kernel.org> Co-developed-by: Luca Weiss <luca.weiss@fairphone.com> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> --- drivers/clk/qcom/Kconfig | 9 + drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/videocc-sm6350.c | 355 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 365 insertions(+) diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig index 7d5dac26b244bfe785370033ad8ba49876d6627d..602e35d3d6c5b3b76947d892bb705fe742daf081 100644 --- a/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig @@ -1329,6 +1329,15 @@ config SA_VIDEOCC_8775P Say Y if you want to support video devices and functionality such as video encode/decode. +config SM_VIDEOCC_6350 + tristate "SM6350 Video Clock Controller" + select SM_GCC_6350 + select QCOM_GDSC + help + Support for the video clock controller on SM6350 devices. + Say Y if you want to support video devices and functionality such as + video encode and decode. + config SM_VIDEOCC_7150 tristate "SM7150 Video Clock Controller" depends on ARM64 || COMPILE_TEST diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile index 96862e99e5d432bbfba193c961d59ec5e601f10a..70895bc465549b87c7c7a8dc6f8ac84c223a85d6 100644 --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile @@ -164,6 +164,7 @@ obj-$(CONFIG_SM_LPASSCC_6115) += lpasscc-sm6115.o obj-$(CONFIG_SM_TCSRCC_8550) += tcsrcc-sm8550.o obj-$(CONFIG_SM_TCSRCC_8650) += tcsrcc-sm8650.o obj-$(CONFIG_SM_TCSRCC_8750) += tcsrcc-sm8750.o +obj-$(CONFIG_SM_VIDEOCC_6350) += videocc-sm6350.o obj-$(CONFIG_SM_VIDEOCC_7150) += videocc-sm7150.o obj-$(CONFIG_SM_VIDEOCC_8150) += videocc-sm8150.o obj-$(CONFIG_SM_VIDEOCC_8250) += videocc-sm8250.o diff --git a/drivers/clk/qcom/videocc-sm6350.c b/drivers/clk/qcom/videocc-sm6350.c new file mode 100644 index 0000000000000000000000000000000000000000..1427a783d9bc6f7473704cd935035b16b831fa1f --- /dev/null +++ b/drivers/clk/qcom/videocc-sm6350.c @@ -0,0 +1,355 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2021, Konrad Dybcio <konrad.dybcio@somainline.org> + * Copyright (c) 2025, Luca Weiss <luca.weiss@fairphone.com> + */ + +#include <linux/clk-provider.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +#include <dt-bindings/clock/qcom,sm6350-videocc.h> + +#include "clk-alpha-pll.h" +#include "clk-branch.h" +#include "clk-rcg.h" +#include "clk-regmap.h" +#include "common.h" +#include "gdsc.h" + +enum { + DT_IFACE, + DT_BI_TCXO, + DT_SLEEP_CLK, +}; + +enum { + P_BI_TCXO, + P_CHIP_SLEEP_CLK, + P_VIDEO_PLL0_OUT_EVEN, +}; + +static const struct pll_vco fabia_vco[] = { + { 125000000, 1000000000, 1 }, +}; + +/* 600 MHz */ +static const struct alpha_pll_config video_pll0_config = { + .l = 0x1F, + .alpha = 0x4000, + .config_ctl_val = 0x20485699, + .config_ctl_hi_val = 0x00002067, + .test_ctl_val = 0x40000000, + .test_ctl_hi_val = 0x00000002, + .user_ctl_val = 0x00000101, + .user_ctl_hi_val = 0x00004005, +}; + +static struct clk_alpha_pll video_pll0 = { + .offset = 0x0, + .vco_table = fabia_vco, + .num_vco = ARRAY_SIZE(fabia_vco), + .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_FABIA], + .clkr = { + .hw.init = &(const struct clk_init_data) { + .name = "video_pll0", + .parent_data = &(const struct clk_parent_data) { + .index = DT_BI_TCXO, + }, + .num_parents = 1, + .ops = &clk_alpha_pll_fabia_ops, + }, + }, +}; + +static const struct clk_div_table post_div_table_video_pll0_out_even[] = { + { 0x1, 2 }, + { } +}; + +static struct clk_alpha_pll_postdiv video_pll0_out_even = { + .offset = 0x0, + .post_div_shift = 8, + .post_div_table = post_div_table_video_pll0_out_even, + .num_post_div = ARRAY_SIZE(post_div_table_video_pll0_out_even), + .width = 4, + .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_FABIA], + .clkr.hw.init = &(const struct clk_init_data) { + .name = "video_pll0_out_even", + .parent_hws = (const struct clk_hw*[]) { + &video_pll0.clkr.hw, + }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_alpha_pll_postdiv_fabia_ops, + }, +}; + +static const struct parent_map video_cc_parent_map_0[] = { + { P_BI_TCXO, 0 }, + { P_VIDEO_PLL0_OUT_EVEN, 3 }, +}; + +static const struct clk_parent_data video_cc_parent_data_0[] = { + { .index = DT_BI_TCXO }, + { .hw = &video_pll0_out_even.clkr.hw }, +}; + +static const struct parent_map video_cc_parent_map_1[] = { + { P_CHIP_SLEEP_CLK, 0 }, +}; + +static const struct clk_parent_data video_cc_parent_data_1[] = { + { .index = DT_SLEEP_CLK }, +}; + +static const struct freq_tbl ftbl_video_cc_iris_clk_src[] = { + F(133250000, P_VIDEO_PLL0_OUT_EVEN, 2, 0, 0), + F(240000000, P_VIDEO_PLL0_OUT_EVEN, 1.5, 0, 0), + F(300000000, P_VIDEO_PLL0_OUT_EVEN, 1, 0, 0), + F(380000000, P_VIDEO_PLL0_OUT_EVEN, 1, 0, 0), + F(460000000, P_VIDEO_PLL0_OUT_EVEN, 1, 0, 0), + { } +}; + +static struct clk_rcg2 video_cc_iris_clk_src = { + .cmd_rcgr = 0x1000, + .mnd_width = 0, + .hid_width = 5, + .parent_map = video_cc_parent_map_0, + .freq_tbl = ftbl_video_cc_iris_clk_src, + .clkr.hw.init = &(const struct clk_init_data) { + .name = "video_cc_iris_clk_src", + .parent_data = video_cc_parent_data_0, + .num_parents = ARRAY_SIZE(video_cc_parent_data_0), + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_rcg2_shared_ops, + }, +}; + +static const struct freq_tbl ftbl_video_cc_sleep_clk_src[] = { + F(32764, P_CHIP_SLEEP_CLK, 1, 0, 0), + { } +}; + +static struct clk_rcg2 video_cc_sleep_clk_src = { + .cmd_rcgr = 0x701c, + .mnd_width = 0, + .hid_width = 5, + .parent_map = video_cc_parent_map_1, + .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_1, + .num_parents = ARRAY_SIZE(video_cc_parent_data_1), + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_branch video_cc_iris_ahb_clk = { + .halt_reg = 0x5004, + .halt_check = BRANCH_VOTED, + .clkr = { + .enable_reg = 0x5004, + .enable_mask = BIT(0), + .hw.init = &(const struct clk_init_data) { + .name = "video_cc_iris_ahb_clk", + .parent_hws = (const struct clk_hw*[]) { + &video_cc_iris_clk_src.clkr.hw, + }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch video_cc_mvs0_axi_clk = { + .halt_reg = 0x800c, + .halt_check = BRANCH_HALT, + .clkr = { + .enable_reg = 0x800c, + .enable_mask = BIT(0), + .hw.init = &(const struct clk_init_data) { + .name = "video_cc_mvs0_axi_clk", + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch video_cc_mvs0_core_clk = { + .halt_reg = 0x3010, + .halt_check = BRANCH_VOTED, + .hwcg_reg = 0x3010, + .hwcg_bit = 1, + .clkr = { + .enable_reg = 0x3010, + .enable_mask = BIT(0), + .hw.init = &(const struct clk_init_data) { + .name = "video_cc_mvs0_core_clk", + .parent_hws = (const struct clk_hw*[]) { + &video_cc_iris_clk_src.clkr.hw, + }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch video_cc_mvsc_core_clk = { + .halt_reg = 0x2014, + .halt_check = BRANCH_HALT, + .clkr = { + .enable_reg = 0x2014, + .enable_mask = BIT(0), + .hw.init = &(const struct clk_init_data) { + .name = "video_cc_mvsc_core_clk", + .parent_hws = (const struct clk_hw*[]) { + &video_cc_iris_clk_src.clkr.hw, + }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch video_cc_mvsc_ctl_axi_clk = { + .halt_reg = 0x8004, + .halt_check = BRANCH_HALT, + .clkr = { + .enable_reg = 0x8004, + .enable_mask = BIT(0), + .hw.init = &(const struct clk_init_data) { + .name = "video_cc_mvsc_ctl_axi_clk", + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch video_cc_sleep_clk = { + .halt_reg = 0x7034, + .halt_check = BRANCH_HALT, + .clkr = { + .enable_reg = 0x7034, + .enable_mask = BIT(0), + .hw.init = &(const struct clk_init_data) { + .name = "video_cc_sleep_clk", + .parent_hws = (const struct clk_hw*[]) { + &video_cc_sleep_clk_src.clkr.hw, + }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch video_cc_venus_ahb_clk = { + .halt_reg = 0x801c, + .halt_check = BRANCH_HALT, + .clkr = { + .enable_reg = 0x801c, + .enable_mask = BIT(0), + .hw.init = &(const struct clk_init_data) { + .name = "video_cc_venus_ahb_clk", + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct gdsc mvsc_gdsc = { + .gdscr = 0x2004, + .en_rest_wait_val = 0x2, + .en_few_wait_val = 0x2, + .clk_dis_wait_val = 0x6, + .pd = { + .name = "mvsc_gdsc", + }, + .pwrsts = PWRSTS_OFF_ON, +}; + +static struct gdsc mvs0_gdsc = { + .gdscr = 0x3004, + .en_rest_wait_val = 0x2, + .en_few_wait_val = 0x2, + .clk_dis_wait_val = 0x6, + .pd = { + .name = "mvs0_gdsc", + }, + .pwrsts = PWRSTS_OFF_ON, + .flags = HW_CTRL_TRIGGER, +}; + +static struct gdsc *video_cc_sm6350_gdscs[] = { + [MVSC_GDSC] = &mvsc_gdsc, + [MVS0_GDSC] = &mvs0_gdsc, +}; + +static struct clk_regmap *video_cc_sm6350_clocks[] = { + [VIDEO_CC_IRIS_AHB_CLK] = &video_cc_iris_ahb_clk.clkr, + [VIDEO_CC_IRIS_CLK_SRC] = &video_cc_iris_clk_src.clkr, + [VIDEO_CC_MVS0_AXI_CLK] = &video_cc_mvs0_axi_clk.clkr, + [VIDEO_CC_MVS0_CORE_CLK] = &video_cc_mvs0_core_clk.clkr, + [VIDEO_CC_MVSC_CORE_CLK] = &video_cc_mvsc_core_clk.clkr, + [VIDEO_CC_MVSC_CTL_AXI_CLK] = &video_cc_mvsc_ctl_axi_clk.clkr, + [VIDEO_CC_SLEEP_CLK] = &video_cc_sleep_clk.clkr, + [VIDEO_CC_SLEEP_CLK_SRC] = &video_cc_sleep_clk_src.clkr, + [VIDEO_CC_VENUS_AHB_CLK] = &video_cc_venus_ahb_clk.clkr, + [VIDEO_PLL0] = &video_pll0.clkr, + [VIDEO_PLL0_OUT_EVEN] = &video_pll0_out_even.clkr, +}; + +static const struct regmap_config video_cc_sm6350_regmap_config = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .max_register = 0xb000, + .fast_io = true, +}; + +static const struct qcom_cc_desc video_cc_sm6350_desc = { + .config = &video_cc_sm6350_regmap_config, + .clks = video_cc_sm6350_clocks, + .num_clks = ARRAY_SIZE(video_cc_sm6350_clocks), + .gdscs = video_cc_sm6350_gdscs, + .num_gdscs = ARRAY_SIZE(video_cc_sm6350_gdscs), +}; + +static const struct of_device_id video_cc_sm6350_match_table[] = { + { .compatible = "qcom,sm6350-videocc" }, + { } +}; +MODULE_DEVICE_TABLE(of, video_cc_sm6350_match_table); + +static int video_cc_sm6350_probe(struct platform_device *pdev) +{ + struct regmap *regmap; + + regmap = qcom_cc_map(pdev, &video_cc_sm6350_desc); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + clk_fabia_pll_configure(&video_pll0, regmap, &video_pll0_config); + + /* Keep some clocks always-on */ + qcom_branch_set_clk_en(regmap, 0x7018); /* VIDEO_CC_XO_CLK */ + + return qcom_cc_really_probe(&pdev->dev, &video_cc_sm6350_desc, regmap); +} + +static struct platform_driver video_cc_sm6350_driver = { + .probe = video_cc_sm6350_probe, + .driver = { + .name = "video_cc-sm6350", + .of_match_table = video_cc_sm6350_match_table, + }, +}; + +module_platform_driver(video_cc_sm6350_driver); + +MODULE_DESCRIPTION("QTI VIDEO_CC SM6350 Driver"); +MODULE_LICENSE("GPL"); -- 2.49.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] clk: qcom: Add video clock controller driver for SM6350 2025-03-21 14:45 ` [PATCH 2/3] clk: qcom: Add video clock controller driver for SM6350 Luca Weiss @ 2025-03-21 15:55 ` Dmitry Baryshkov 2025-03-21 16:16 ` Luca Weiss 0 siblings, 1 reply; 10+ messages in thread From: Dmitry Baryshkov @ 2025-03-21 15:55 UTC (permalink / raw) To: Luca Weiss Cc: Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Taniya Das, Konrad Dybcio, ~postmarketos/upstreaming, phone-devel, linux-arm-msm, linux-clk, devicetree, linux-kernel On Fri, Mar 21, 2025 at 03:45:00PM +0100, Luca Weiss wrote: > From: Konrad Dybcio <konradybcio@kernel.org> > > Add support for the video clock controller found on SM6350 based > devices. > > Signed-off-by: Konrad Dybcio <konradybcio@kernel.org> > Co-developed-by: Luca Weiss <luca.weiss@fairphone.com> > Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> > --- > drivers/clk/qcom/Kconfig | 9 + > drivers/clk/qcom/Makefile | 1 + > drivers/clk/qcom/videocc-sm6350.c | 355 ++++++++++++++++++++++++++++++++++++++ > 3 files changed, 365 insertions(+) > > + > +/* 600 MHz */ > +static const struct alpha_pll_config video_pll0_config = { > + .l = 0x1F, Nit: lowercase hex please. No need to repost just for the sake of this single line. Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> > + .alpha = 0x4000, > + .config_ctl_val = 0x20485699, > + .config_ctl_hi_val = 0x00002067, > + .test_ctl_val = 0x40000000, > + .test_ctl_hi_val = 0x00000002, > + .user_ctl_val = 0x00000101, > + .user_ctl_hi_val = 0x00004005, > +}; > + > -- With best wishes Dmitry ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] clk: qcom: Add video clock controller driver for SM6350 2025-03-21 15:55 ` Dmitry Baryshkov @ 2025-03-21 16:16 ` Luca Weiss 0 siblings, 0 replies; 10+ messages in thread From: Luca Weiss @ 2025-03-21 16:16 UTC (permalink / raw) To: Dmitry Baryshkov Cc: Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Taniya Das, Konrad Dybcio, ~postmarketos/upstreaming, phone-devel, linux-arm-msm, linux-clk, devicetree, linux-kernel On Fri Mar 21, 2025 at 4:55 PM CET, Dmitry Baryshkov wrote: > On Fri, Mar 21, 2025 at 03:45:00PM +0100, Luca Weiss wrote: >> From: Konrad Dybcio <konradybcio@kernel.org> >> >> Add support for the video clock controller found on SM6350 based >> devices. >> >> Signed-off-by: Konrad Dybcio <konradybcio@kernel.org> >> Co-developed-by: Luca Weiss <luca.weiss@fairphone.com> >> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> >> --- >> drivers/clk/qcom/Kconfig | 9 + >> drivers/clk/qcom/Makefile | 1 + >> drivers/clk/qcom/videocc-sm6350.c | 355 ++++++++++++++++++++++++++++++++++++++ >> 3 files changed, 365 insertions(+) >> >> + >> +/* 600 MHz */ >> +static const struct alpha_pll_config video_pll0_config = { >> + .l = 0x1F, > > Nit: lowercase hex please. No need to repost just for the sake of this > single line. Sounds like there'll be a v2 anyways with dts changes, so I'll fix it! Regards Luca > > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> > > >> + .alpha = 0x4000, >> + .config_ctl_val = 0x20485699, >> + .config_ctl_hi_val = 0x00002067, >> + .test_ctl_val = 0x40000000, >> + .test_ctl_hi_val = 0x00000002, >> + .user_ctl_val = 0x00000101, >> + .user_ctl_hi_val = 0x00004005, >> +}; >> + >> ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] arm64: dts: qcom: sm6350: Add video clock controller 2025-03-21 14:44 [PATCH 0/3] Add video clock controller for SM6350 Luca Weiss 2025-03-21 14:44 ` [PATCH 1/3] dt-bindings: clock: add SM6350 QCOM video clock bindings Luca Weiss 2025-03-21 14:45 ` [PATCH 2/3] clk: qcom: Add video clock controller driver for SM6350 Luca Weiss @ 2025-03-21 14:45 ` Luca Weiss 2025-03-21 15:56 ` Dmitry Baryshkov 2 siblings, 1 reply; 10+ messages in thread From: Luca Weiss @ 2025-03-21 14:45 UTC (permalink / raw) To: Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Taniya Das, Konrad Dybcio Cc: ~postmarketos/upstreaming, phone-devel, linux-arm-msm, linux-clk, devicetree, linux-kernel, Luca Weiss Add a node for the videocc found on the SM6350 SoC. Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> --- arch/arm64/boot/dts/qcom/sm6350.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi index 00ad1d09a19558d9e2bc61f1a81a36d466adc88e..ab7118b4f8f8cea56a3957e9df67ee1cd74820a6 100644 --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi @@ -1952,6 +1952,20 @@ usb_1_dwc3_ss_out: endpoint { }; }; + videocc: clock-controller@aaf0000 { + compatible = "qcom,sm6350-videocc"; + reg = <0 0x0aaf0000 0 0x10000>; + clocks = <&gcc GCC_VIDEO_AHB_CLK>, + <&rpmhcc RPMH_CXO_CLK>, + <&sleep_clk>; + clock-names = "iface", + "bi_tcxo", + "sleep_clk"; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; + cci0: cci@ac4a000 { compatible = "qcom,sm6350-cci", "qcom,msm8996-cci"; reg = <0 0x0ac4a000 0 0x1000>; -- 2.49.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] arm64: dts: qcom: sm6350: Add video clock controller 2025-03-21 14:45 ` [PATCH 3/3] arm64: dts: qcom: sm6350: Add video clock controller Luca Weiss @ 2025-03-21 15:56 ` Dmitry Baryshkov 2025-03-21 16:15 ` Luca Weiss 0 siblings, 1 reply; 10+ messages in thread From: Dmitry Baryshkov @ 2025-03-21 15:56 UTC (permalink / raw) To: Luca Weiss Cc: Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Taniya Das, Konrad Dybcio, ~postmarketos/upstreaming, phone-devel, linux-arm-msm, linux-clk, devicetree, linux-kernel On Fri, Mar 21, 2025 at 03:45:01PM +0100, Luca Weiss wrote: > Add a node for the videocc found on the SM6350 SoC. > > Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> > --- > arch/arm64/boot/dts/qcom/sm6350.dtsi | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi > index 00ad1d09a19558d9e2bc61f1a81a36d466adc88e..ab7118b4f8f8cea56a3957e9df67ee1cd74820a6 100644 > --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi > @@ -1952,6 +1952,20 @@ usb_1_dwc3_ss_out: endpoint { > }; > }; > > + videocc: clock-controller@aaf0000 { > + compatible = "qcom,sm6350-videocc"; > + reg = <0 0x0aaf0000 0 0x10000>; 0x0, please. > + clocks = <&gcc GCC_VIDEO_AHB_CLK>, > + <&rpmhcc RPMH_CXO_CLK>, > + <&sleep_clk>; > + clock-names = "iface", > + "bi_tcxo", > + "sleep_clk"; > + #clock-cells = <1>; > + #reset-cells = <1>; > + #power-domain-cells = <1>; > + }; > + > cci0: cci@ac4a000 { > compatible = "qcom,sm6350-cci", "qcom,msm8996-cci"; > reg = <0 0x0ac4a000 0 0x1000>; > > -- > 2.49.0 > -- With best wishes Dmitry ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] arm64: dts: qcom: sm6350: Add video clock controller 2025-03-21 15:56 ` Dmitry Baryshkov @ 2025-03-21 16:15 ` Luca Weiss 2025-03-21 16:23 ` Dmitry Baryshkov 0 siblings, 1 reply; 10+ messages in thread From: Luca Weiss @ 2025-03-21 16:15 UTC (permalink / raw) To: Dmitry Baryshkov Cc: Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Taniya Das, Konrad Dybcio, ~postmarketos/upstreaming, phone-devel, linux-arm-msm, linux-clk, devicetree, linux-kernel Hi Dmitry, On Fri Mar 21, 2025 at 4:56 PM CET, Dmitry Baryshkov wrote: > On Fri, Mar 21, 2025 at 03:45:01PM +0100, Luca Weiss wrote: >> Add a node for the videocc found on the SM6350 SoC. >> >> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> >> --- >> arch/arm64/boot/dts/qcom/sm6350.dtsi | 14 ++++++++++++++ >> 1 file changed, 14 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi >> index 00ad1d09a19558d9e2bc61f1a81a36d466adc88e..ab7118b4f8f8cea56a3957e9df67ee1cd74820a6 100644 >> --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi >> +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi >> @@ -1952,6 +1952,20 @@ usb_1_dwc3_ss_out: endpoint { >> }; >> }; >> >> + videocc: clock-controller@aaf0000 { >> + compatible = "qcom,sm6350-videocc"; >> + reg = <0 0x0aaf0000 0 0x10000>; > > 0x0, please. There's currently 80 cases of 0 and 20 of 0x0 in this file, is 0x0 the preferred way nowadays? If so, shall I also change 0 to 0x0 for reg in a separate patch? Regards Luca > >> + clocks = <&gcc GCC_VIDEO_AHB_CLK>, >> + <&rpmhcc RPMH_CXO_CLK>, >> + <&sleep_clk>; >> + clock-names = "iface", >> + "bi_tcxo", >> + "sleep_clk"; >> + #clock-cells = <1>; >> + #reset-cells = <1>; >> + #power-domain-cells = <1>; >> + }; >> + >> cci0: cci@ac4a000 { >> compatible = "qcom,sm6350-cci", "qcom,msm8996-cci"; >> reg = <0 0x0ac4a000 0 0x1000>; >> >> -- >> 2.49.0 >> ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] arm64: dts: qcom: sm6350: Add video clock controller 2025-03-21 16:15 ` Luca Weiss @ 2025-03-21 16:23 ` Dmitry Baryshkov 2025-03-24 8:35 ` Luca Weiss 0 siblings, 1 reply; 10+ messages in thread From: Dmitry Baryshkov @ 2025-03-21 16:23 UTC (permalink / raw) To: Luca Weiss Cc: Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Taniya Das, Konrad Dybcio, ~postmarketos/upstreaming, phone-devel, linux-arm-msm, linux-clk, devicetree, linux-kernel On 21/03/2025 18:15, Luca Weiss wrote: > Hi Dmitry, > > On Fri Mar 21, 2025 at 4:56 PM CET, Dmitry Baryshkov wrote: >> On Fri, Mar 21, 2025 at 03:45:01PM +0100, Luca Weiss wrote: >>> Add a node for the videocc found on the SM6350 SoC. >>> >>> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> >>> --- >>> arch/arm64/boot/dts/qcom/sm6350.dtsi | 14 ++++++++++++++ >>> 1 file changed, 14 insertions(+) >>> >>> diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi >>> index 00ad1d09a19558d9e2bc61f1a81a36d466adc88e..ab7118b4f8f8cea56a3957e9df67ee1cd74820a6 100644 >>> --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi >>> +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi >>> @@ -1952,6 +1952,20 @@ usb_1_dwc3_ss_out: endpoint { >>> }; >>> }; >>> >>> + videocc: clock-controller@aaf0000 { >>> + compatible = "qcom,sm6350-videocc"; >>> + reg = <0 0x0aaf0000 0 0x10000>; >> >> 0x0, please. > > There's currently 80 cases of 0 and 20 of 0x0 in this file, is 0x0 > the preferred way nowadays? > > If so, shall I also change 0 to 0x0 for reg in a separate patch? I'd say, yes, please, if Bjorn / Konrad do not object. > > Regards > Luca > >> >>> + clocks = <&gcc GCC_VIDEO_AHB_CLK>, >>> + <&rpmhcc RPMH_CXO_CLK>, >>> + <&sleep_clk>; >>> + clock-names = "iface", >>> + "bi_tcxo", >>> + "sleep_clk"; >>> + #clock-cells = <1>; >>> + #reset-cells = <1>; >>> + #power-domain-cells = <1>; >>> + }; >>> + >>> cci0: cci@ac4a000 { >>> compatible = "qcom,sm6350-cci", "qcom,msm8996-cci"; >>> reg = <0 0x0ac4a000 0 0x1000>; >>> >>> -- >>> 2.49.0 >>> > -- With best wishes Dmitry ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] arm64: dts: qcom: sm6350: Add video clock controller 2025-03-21 16:23 ` Dmitry Baryshkov @ 2025-03-24 8:35 ` Luca Weiss 0 siblings, 0 replies; 10+ messages in thread From: Luca Weiss @ 2025-03-24 8:35 UTC (permalink / raw) To: Dmitry Baryshkov Cc: Bjorn Andersson, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Taniya Das, Konrad Dybcio, ~postmarketos/upstreaming, phone-devel, linux-arm-msm, linux-clk, devicetree, linux-kernel On Fri Mar 21, 2025 at 5:23 PM CET, Dmitry Baryshkov wrote: > On 21/03/2025 18:15, Luca Weiss wrote: >> Hi Dmitry, >> >> On Fri Mar 21, 2025 at 4:56 PM CET, Dmitry Baryshkov wrote: >>> On Fri, Mar 21, 2025 at 03:45:01PM +0100, Luca Weiss wrote: >>>> Add a node for the videocc found on the SM6350 SoC. >>>> >>>> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> >>>> --- >>>> arch/arm64/boot/dts/qcom/sm6350.dtsi | 14 ++++++++++++++ >>>> 1 file changed, 14 insertions(+) >>>> >>>> diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi >>>> index 00ad1d09a19558d9e2bc61f1a81a36d466adc88e..ab7118b4f8f8cea56a3957e9df67ee1cd74820a6 100644 >>>> --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi >>>> +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi >>>> @@ -1952,6 +1952,20 @@ usb_1_dwc3_ss_out: endpoint { >>>> }; >>>> }; >>>> >>>> + videocc: clock-controller@aaf0000 { >>>> + compatible = "qcom,sm6350-videocc"; >>>> + reg = <0 0x0aaf0000 0 0x10000>; >>> >>> 0x0, please. >> >> There's currently 80 cases of 0 and 20 of 0x0 in this file, is 0x0 >> the preferred way nowadays? >> >> If so, shall I also change 0 to 0x0 for reg in a separate patch? > > I'd say, yes, please, if Bjorn / Konrad do not object. Sure, I'll just send a patch as part of v2, there's no explicit dependency of the series on it, so it can also just be NACKed and ignored if so desired. Regards Luca > >> >> Regards >> Luca >> >>> >>>> + clocks = <&gcc GCC_VIDEO_AHB_CLK>, >>>> + <&rpmhcc RPMH_CXO_CLK>, >>>> + <&sleep_clk>; >>>> + clock-names = "iface", >>>> + "bi_tcxo", >>>> + "sleep_clk"; >>>> + #clock-cells = <1>; >>>> + #reset-cells = <1>; >>>> + #power-domain-cells = <1>; >>>> + }; >>>> + >>>> cci0: cci@ac4a000 { >>>> compatible = "qcom,sm6350-cci", "qcom,msm8996-cci"; >>>> reg = <0 0x0ac4a000 0 0x1000>; >>>> >>>> -- >>>> 2.49.0 >>>> >> ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2025-03-24 8:35 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2025-03-21 14:44 [PATCH 0/3] Add video clock controller for SM6350 Luca Weiss 2025-03-21 14:44 ` [PATCH 1/3] dt-bindings: clock: add SM6350 QCOM video clock bindings Luca Weiss 2025-03-21 14:45 ` [PATCH 2/3] clk: qcom: Add video clock controller driver for SM6350 Luca Weiss 2025-03-21 15:55 ` Dmitry Baryshkov 2025-03-21 16:16 ` Luca Weiss 2025-03-21 14:45 ` [PATCH 3/3] arm64: dts: qcom: sm6350: Add video clock controller Luca Weiss 2025-03-21 15:56 ` Dmitry Baryshkov 2025-03-21 16:15 ` Luca Weiss 2025-03-21 16:23 ` Dmitry Baryshkov 2025-03-24 8:35 ` Luca Weiss
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox