Qcom SM8350 DispCC & VideoCC
Subsystems (5)
cover Qcom SM8350 DispCC & VideoCC
Do not merge, this series has yet to be properly tested. Work is in progress for sm8350 display driver support, which will test this series properly.
This series implements display clock controller (dispcc) & video clock controller (videocc) support for the Qcom SM8350 SOC.
In order to support these new clock controllers, some changes to the alpha plls are required. These changes add support to the Lucid 5LPE PLLs.
Robert Foss (11):
clk: qcom: common: Add runtime init/suspend/resume
clk: qcom: rcg2: Add support for flags
clk: qcom: clk-alpha-pll: Fix typo in comment
clk: qcom: clk-alpha-pll: Add configuration support for LUCID 5LPE
dt-bindings: clock: Add QCOM SM8350 display clock bindings
clk: qcom: Add display clock controller driver for SM8350
dt-bindings: clock: Add SM8350 QCOM video clock bindings
clk: qcom: Add video clock controller driver for SM8350
arm64: dts: qcom: sm8350: Power up dispcc & videocc on sm8350 by MMCX
regulator
arm64: dts: qcom: sm8350: Add videocc DT node
arm64: dts: qcom: sm8350: Add dispcc DT node
.../bindings/clock/qcom,dispcc-sm8x50.yaml | 6 +- .../bindings/clock/qcom,videocc.yaml | 2 + arch/arm64/boot/dts/qcom/sm8350.dtsi | 46 + drivers/clk/qcom/Kconfig | 18 + drivers/clk/qcom/Makefile | 2 + drivers/clk/qcom/clk-alpha-pll.c | 5 +- drivers/clk/qcom/clk-alpha-pll.h | 5 + drivers/clk/qcom/clk-rcg.h | 4 + drivers/clk/qcom/clk-rcg2.c | 3 + drivers/clk/qcom/common.c | 92 ++ drivers/clk/qcom/common.h | 6 + drivers/clk/qcom/dispcc-sm8350.c | 1402 +++++++++++++++++ drivers/clk/qcom/videocc-sm8350.c | 593 +++++++ .../dt-bindings/clock/qcom,dispcc-sm8350.h | 77 + .../dt-bindings/clock/qcom,videocc-sm8350.h | 44 + 15 files changed, 2302 insertions(+), 3 deletions(-) create mode 100644 drivers/clk/qcom/dispcc-sm8350.c create mode 100644 drivers/clk/qcom/videocc-sm8350.c create mode 100644 include/dt-bindings/clock/qcom,dispcc-sm8350.h create mode 100644 include/dt-bindings/clock/qcom,videocc-sm8350.h
Signature · 1 line
2.30.2
RFC 1/11 clk: qcom: common: Add runtime init/suspend/resume
Ported over from the downstream driver. Is used by SM8350 DISPCC & VIDEOCC.
This patch includes support for initializing interconnect bandwidth voting.
--- drivers/clk/qcom/common.c | 92 +++++++++++++++++++++++++++++++++++++++ drivers/clk/qcom/common.h | 6 +++ 2 files changed, 98 insertions(+)
drivers/clk/qcom/common.c +92 -0
@@ -3,13 +3,17 @@* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. */ +#include <linux/clk.h> #include <linux/export.h> +#include <linux/interconnect.h> #include <linux/module.h> #include <linux/regmap.h> #include <linux/platform_device.h> #include <linux/clk-provider.h> #include <linux/reset-controller.h> #include <linux/of.h> +#include <linux/pm_clock.h> +#include <linux/pm_runtime.h> #include "common.h" #include "clk-rcg.h"
@@ -329,4 +333,92 @@ int qcom_cc_probe_by_index(struct platform_device *pdev, int index, }EXPORT_SYMBOL_GPL (qcom_cc_probe_by_index); +int qcom_cc_runtime_init (struct platform_device *pdev, +struct qcom_cc_desc *desc) +{ +struct device *dev = &pdev->dev; +struct clk *clk; +int ret; + + clk =clk_get_optional (dev,"iface" ); +if (IS_ERR (clk)) { +if (PTR_ERR (clk) != -EPROBE_DEFER ) +dev_err (dev,"unable to get iface clock\n" ); +return PTR_ERR (clk); + } +clk_put (clk); + + desc->path =of_icc_get (dev,NULL ); +if (IS_ERR (desc->path)) { +if (PTR_ERR (desc->path) != -EPROBE_DEFER ) +dev_err (dev,"error getting path\n" ); +return PTR_ERR (desc->path); + } + +platform_set_drvdata (pdev, desc); +pm_runtime_enable (dev); + + ret =pm_clk_create (dev); +if (ret) + goto disable_pm_runtime; + + ret =pm_clk_add (dev,"iface" ); +if (ret <0 ) { +dev_err (dev,"failed to acquire iface clock\n" ); + goto destroy_pm_clk; + } + +return 0 ; + +destroy_pm_clk: +pm_clk_destroy (dev); + +disable_pm_runtime: +pm_runtime_disable (dev); +icc_put (desc->path); + +return ret; +} +EXPORT_SYMBOL (qcom_cc_runtime_init); + +int qcom_cc_runtime_resume (struct device *dev) +{ +struct qcom_cc_desc *desc =dev_get_drvdata (dev); +int ret; + +if (desc->path) { + ret =icc_set_bw (desc->path,0 ,1 ); +if (ret) { +dev_warn (dev,"%s: failed to vote bw\n" , __func__); +return ret; + } + } + + ret =pm_clk_resume (dev); +if (ret) +dev_warn (dev,"%s: failed to enable clocks\n" , __func__); + +return ret; +} +EXPORT_SYMBOL (qcom_cc_runtime_resume); + +int qcom_cc_runtime_suspend (struct device *dev) +{ +struct qcom_cc_desc *desc =dev_get_drvdata (dev); +int ret; + + ret =pm_clk_suspend (dev); +if (ret) +dev_warn (dev,"%s: failed to disable clocks\n" , __func__); + +if (desc->path) { + ret =icc_set_bw (desc->path,0 ,0 ); +if (ret) +dev_warn (dev,"%s: failed to unvote bw\n" , __func__); + } + +return 0 ; +} +EXPORT_SYMBOL (qcom_cc_runtime_suspend); +MODULE_LICENSE ("GPL v2" );
drivers/clk/qcom/common.h +6 -0
@@ -29,6 +29,7 @@ struct qcom_cc_desc {size_t num_gdscs;struct clk_hw **clk_hws;size_t num_clk_hws; +struct icc_path *path; };/**
@@ -64,4 +65,9 @@ extern int qcom_cc_probe(struct platform_device *pdev,extern int qcom_cc_probe_by_index (struct platform_device *pdev,int index,const struct qcom_cc_desc *desc); +int qcom_cc_runtime_init (struct platform_device *pdev, +struct qcom_cc_desc *desc); +int qcom_cc_runtime_suspend (struct device *dev); +int qcom_cc_runtime_resume (struct device *dev); +#endif
Signature · 1 line
2.30.2
kernel test robot
build botRe: [RFC v1 01/11] clk: qcom: common: Add runtime init/suspend/resume
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch]
Hi Robert,
[FYI, it's a private test report for your RFC patch.]
[auto build test ERROR on robh/for-next]
[also build test ERROR on v5.13-rc6 next-20210616]
[cannot apply to clk/clk-next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Robert-Foss/Qcom-SM8350-DispCC-VideoCC/20210617-000803 base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next config: h8300-randconfig-p001-20210615 (attached as .config) compiler: h8300-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/dec0377e64d6caab3b75a8b7325689af258652eb
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Robert-Foss/Qcom-SM8350-DispCC-VideoCC/20210617-000803 git checkout dec0377e64d6caab3b75a8b7325689af258652eb
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=h8300
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
In file included from include/uapi/linux/posix_types.h:5,
from include/uapi/linux/types.h:14,
from include/linux/types.h:6,
from include/linux/kasan-checks.h:5,
from include/asm-generic/rwonce.h:26,
from ./arch/h8300/include/generated/asm/rwonce.h:1,
from include/linux/compiler.h:248,
from include/linux/err.h:5,
from include/linux/clk.h:12,
from drivers/clk/qcom/common.c:6:
drivers/clk/qcom/common.c: In function 'qcom_cc_runtime_resume':
>> include/linux/stddef.h:8:14: error: called object is not a function or function pointer
8 | #define NULL ((void *)0)
| ^
include/linux/pm_clock.h:82:23: note: in expansion of macro 'NULL'
82 | #define pm_clk_resume NULL
| ^~~~
drivers/clk/qcom/common.c:397:8: note: in expansion of macro 'pm_clk_resume'
397 | ret = pm_clk_resume(dev);
| ^~~~~~~~~~~~~
drivers/clk/qcom/common.c: In function 'qcom_cc_runtime_suspend':
>> include/linux/stddef.h:8:14: error: called object is not a function or function pointer
8 | #define NULL ((void *)0)
| ^
include/linux/pm_clock.h:81:24: note: in expansion of macro 'NULL'
81 | #define pm_clk_suspend NULL
| ^~~~
drivers/clk/qcom/common.c:410:8: note: in expansion of macro 'pm_clk_suspend'
410 | ret = pm_clk_suspend(dev);
| ^~~~~~~~~~~~~~vim +8 include/linux/stddef.h
^1da177e4c3f41 Linus Torvalds 2005-04-16 6 ^1da177e4c3f41 Linus Torvalds 2005-04-16 7 #undef NULL ^1da177e4c3f41 Linus Torvalds 2005-04-16 @8 #define NULL ((void *)0)
6e218287432472 Richard Knutsson 2006-09-30 9
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
RFC 2/11 clk: qcom: rcg2: Add support for flags
In reply to Robert FossThese changes are ported from the downstream driver, and are used on SM8350 for CAMCC, DISPCC, GCC, GPUCC & VIDEOCC.
--- drivers/clk/qcom/clk-rcg.h | 4 ++++ drivers/clk/qcom/clk-rcg2.c | 3 +++ 2 files changed, 7 insertions(+)
drivers/clk/qcom/clk-rcg.h +4 -0
@@ -149,6 +149,10 @@ struct clk_rcg2 {const struct freq_tbl *freq_tbl;struct clk_regmap clkr;u8 cfg_off; +u8 flags; +#define FORCE_ENABLE_RCG BIT(0) +#define HW_CLK_CTRL_MODE BIT(1) +#define DFS_SUPPORT BIT(2) };#define to_clk_rcg2 (_hw) container_of(to_clk_regmap(_hw), struct clk_rcg2, clkr)
drivers/clk/qcom/clk-rcg2.c +3 -0
@@ -295,6 +295,9 @@ static int __clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f) cfg |= rcg->parent_map[index].cfg <<CFG_SRC_SEL_SHIFT ;if (rcg->mnd_width && f->n && (f->m != f->n)) cfg |=CFG_MODE_DUAL_EDGE ; +if (rcg->flags &HW_CLK_CTRL_MODE ) + cfg |=CFG_HW_CLK_CTRL_MASK ; +return regmap_update_bits (rcg->clkr.regmap,RCG_CFG_OFFSET (rcg), mask, cfg); }
Signature · 1 line
2.30.2
Re: [RFC v1 02/11] clk: qcom: rcg2: Add support for flags
Quoted 29 lines · Robert Foss
These changes are ported from the downstream driver, and are used on SM8350 for CAMCC, DISPCC, GCC, GPUCC & VIDEOCC.
Signed-off-by Robert Foss <[email protected]>--- drivers/clk/qcom/clk-rcg.h | 4 ++++ drivers/clk/qcom/clk-rcg2.c | 3 +++ 2 files changed, 7 insertions(+)drivers/clk/qcom/clk-rcg.h +4
-0@@ -149,6 +149,10 @@ struct clk_rcg2 {const struct freq_tbl *freq_tbl;struct clk_regmap clkr;u8 cfg_off; +u8 flags; +#define FORCE_ENABLE_RCG BIT(0) +#define HW_CLK_CTRL_MODE BIT(1) +#define DFS_SUPPORT BIT(2) };#define to_clk_rcg2 (_hw) container_of(to_clk_regmap(_hw), struct clk_rcg2, clkr)drivers/clk/qcom/clk-rcg2.c +0
-0
drivers/clk/qcom/clk-rcg2.c static int __clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f) · line 303
Quoted 9 lines
drivers/clk/qcom/clk-rcg2.c +3
-0@@ -295,6 +295,9 @@ static int __clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f) cfg |= rcg->parent_map[index].cfg <<CFG_SRC_SEL_SHIFT ;if (rcg->mnd_width && f->n && (f->m != f->n)) cfg |=CFG_MODE_DUAL_EDGE ; +if (rcg->flags &HW_CLK_CTRL_MODE ) + cfg |=CFG_HW_CLK_CTRL_MASK ; +return regmap_update_bits (rcg->clkr.regmap,RCG_CFG_OFFSET (rcg), mask, cfg); }
What about code for handling other flags? If it's not a part of the series,
I don't think it makes sense to define them. Or perhaps you sent the
wrong revision?
Konrad
Re: [RFC v1 02/11] clk: qcom: rcg2: Add support for flags
Quoted 44 lines · Konrad Dybcio
Quoted 29 lines · Robert Foss
These changes are ported from the downstream driver, and are used on SM8350 for CAMCC, DISPCC, GCC, GPUCC & VIDEOCC.
Signed-off-by Robert Foss <[email protected]>--- drivers/clk/qcom/clk-rcg.h | 4 ++++ drivers/clk/qcom/clk-rcg2.c | 3 +++ 2 files changed, 7 insertions(+)drivers/clk/qcom/clk-rcg.h +4
-0@@ -149,6 +149,10 @@ struct clk_rcg2 {const struct freq_tbl *freq_tbl;struct clk_regmap clkr;u8 cfg_off; +u8 flags; +#define FORCE_ENABLE_RCG BIT(0) +#define HW_CLK_CTRL_MODE BIT(1) +#define DFS_SUPPORT BIT(2) };#define to_clk_rcg2 (_hw) container_of(to_clk_regmap(_hw), struct clk_rcg2, clkr)drivers/clk/qcom/clk-rcg2.c +0
-0drivers/clk/qcom/clk-rcg2.c static int __clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f) · line 303
Quoted 9 lines
drivers/clk/qcom/clk-rcg2.c +3
-0@@ -295,6 +295,9 @@ static int __clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f) cfg |= rcg->parent_map[index].cfg <<CFG_SRC_SEL_SHIFT ;if (rcg->mnd_width && f->n && (f->m != f->n)) cfg |=CFG_MODE_DUAL_EDGE ; +if (rcg->flags &HW_CLK_CTRL_MODE ) + cfg |=CFG_HW_CLK_CTRL_MASK ; +return regmap_update_bits (rcg->clkr.regmap,RCG_CFG_OFFSET (rcg), mask, cfg); }What about code for handling other flags? If it's not a part of the series,
Quoted 3 lines
I don't think it makes sense to define them. Or perhaps you sent the
wrong revision?
I opted to add all of the flags just to document them existing, but only introducing the ones that will immediately be used is the better way to go.
Re: [RFC v1 02/11] clk: qcom: rcg2: Add support for flags
In reply to Robert FossQuoted 14 lines · Robert Foss
These changes are ported from the downstream driver, and are used on SM8350 for CAMCC, DISPCC, GCC, GPUCC & VIDEOCC.
Signed-off-by Robert Foss <[email protected]>--- drivers/clk/qcom/clk-rcg.h | 4 ++++ drivers/clk/qcom/clk-rcg2.c | 3 +++ 2 files changed, 7 insertions(+)drivers/clk/qcom/clk-rcg.h +0
-0
drivers/clk/qcom/clk-rcg.h struct clk_rcg2 { · line 154
Quoted 6 lines
drivers/clk/qcom/clk-rcg.h +3
-0@@ -149,6 +149,10 @@ struct clk_rcg2 {const struct freq_tbl *freq_tbl;struct clk_regmap clkr;u8 cfg_off; +u8 flags; +#define FORCE_ENABLE_RCG BIT(0) +#define HW_CLK_CTRL_MODE BIT(1)
Downstream also has these flags for 8250, but the upstream driver ended up not using them for the dispcc clocks. Could you please check that you realy need HW_CLK_CTRL for dispcc clocks?
Quoted 19 lines
drivers/clk/qcom/clk-rcg.h +1
-0+#define DFS_SUPPORT BIT(2) };#define to_clk_rcg2 (_hw) container_of(to_clk_regmap(_hw), struct clk_rcg2, clkr)drivers/clk/qcom/clk-rcg2.c +3
-0@@ -295,6 +295,9 @@ static int __clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f) cfg |= rcg->parent_map[index].cfg <<CFG_SRC_SEL_SHIFT ;if (rcg->mnd_width && f->n && (f->m != f->n)) cfg |=CFG_MODE_DUAL_EDGE ; +if (rcg->flags &HW_CLK_CTRL_MODE ) + cfg |=CFG_HW_CLK_CTRL_MASK ; +return regmap_update_bits (rcg->clkr.regmap,RCG_CFG_OFFSET (rcg), mask, cfg); }
Signature · 2 lines
With best wishes Dmitry
Re: [RFC v1 02/11] clk: qcom: rcg2: Add support for flags
Quoted 7 lines · Dmitry Baryshkov
Quoted 7 lines
drivers/clk/qcom/clk-rcg.h +0
-0@@ -149,6 +149,10 @@ struct clk_rcg2 {const struct freq_tbl *freq_tbl;struct clk_regmap clkr;
Quoted 8 lines
drivers/clk/qcom/clk-rcg.h struct clk_rcg2 { · line 154
Quoted 4 lines
drivers/clk/qcom/clk-rcg.h +3
-0u8 cfg_off; +u8 flags; +#define FORCE_ENABLE_RCG BIT(0) +#define HW_CLK_CTRL_MODE BIT(1)Downstream also has these flags for 8250, but the upstream driver ended up not using them for the dispcc clocks. Could you please check that you realy need
HW_CLK_CTRLfor dispcc clocks?
HW_CLK_CTRL being flagged in dispcc causes the CFG_HW_CLK_CTRL flag to be set in the RCG_CFG registers of dispcc.
This flag simply marks the clock as having hardware control enabled or disabled.
As for the question if it is really needed, I can't answer that since no documentation or downstream comments explain the exact behaviour. As far as I know the only way to figure out if it is required is disabling the flag and checking for bugs. I did find this[1] patch, which enabled HW_CLK_CTRL_MODE.
Should I err on the side of the downstream implementation, or try to create a minimum functional driver based on the downstream driver?
[1] https://patchwork.kernel.org/project/linux-arm-msm/patch/[email protected]/
RFC 3/11 clk: qcom: clk-alpha-pll: Fix typo in comment
In reply to Robert FossSubstiture lucid for trion in comment, in order to conform to the function name.
--- drivers/clk/qcom/clk-alpha-pll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/clk-alpha-pll.c +1 -1
@@ -1399,7 +1399,7 @@ const struct clk_ops clk_alpha_pll_postdiv_fabia_ops = {EXPORT_SYMBOL_GPL (clk_alpha_pll_postdiv_fabia_ops);/** -* clk_lucid_pll_configure - configure the lucid pll +* clk_trion_pll_configure - configure the trion pll * * @pll: clk alpha pll * @regmap: register map
Signature · 1 line
2.30.2
RFC 4/11 clk: qcom: clk-alpha-pll: Add configuration support for LUCID 5LPE
In reply to Robert FossPorted from the downstream driver. Used on SM8350 for DISPCC & VIDEOCC.
--- drivers/clk/qcom/clk-alpha-pll.c | 3 +++ drivers/clk/qcom/clk-alpha-pll.h | 5 +++++ 2 files changed, 8 insertions(+)
drivers/clk/qcom/clk-alpha-pll.c +3 -0
@@ -115,6 +115,9 @@ const u8 clk_alpha_pll_regs[][PLL_OFF_MAX_REGS] = { [PLL_OFF_STATUS] = 0x30, [PLL_OFF_OPMODE] = 0x38, [PLL_OFF_ALPHA_VAL] = 0x40, + [PLL_OFF_SSC_DELTA_ALPHA] = 0x48, + [PLL_OFF_SSC_NUM_STEPS] = 0x4c, + [PLL_OFF_SSC_UPDATE_RATE ] =0x50 , }, [CLK_ALPHA_PLL_TYPE_AGERA] = { [PLL_OFF_L_VAL ] =0x04 ,
drivers/clk/qcom/clk-alpha-pll.h +5 -0
@@ -37,6 +37,9 @@ enum {PLL_OFF_OPMODE ,PLL_OFF_FRAC ,PLL_OFF_CAL_VAL , +PLL_OFF_SSC_DELTA_ALPHA , +PLL_OFF_SSC_NUM_STEPS , +PLL_OFF_SSC_UPDATE_RATE , PLL_OFF_MAX_REGS };
@@ -158,6 +161,8 @@ void clk_agera_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap, const struct alpha_pll_config *config);#define clk_lucid_pll_configure (pll, regmap, config) \ clk_trion_pll_configure(pll, regmap, config) +#define clk_lucid_5lpe_pll_configure (pll, regmap, config) \ + clk_trion_pll_configure(pll, regmap, config)
Signature · 1 line
2.30.2
RFC 5/11 dt-bindings: clock: Add QCOM SM8350 display clock bindings
In reply to Robert FossAdd device tree bindings for display clock controller for Qualcomm Technology Inc's SM8350 SoC.
--- .../bindings/clock/qcom,dispcc-sm8x50.yaml | 6 +- .../dt-bindings/clock/qcom,dispcc-sm8350.h | 77 +++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 include/dt-bindings/clock/qcom,dispcc-sm8350.h
Documentation/devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml +4 -2
@@ -4,24 +4,26 @@ $id: http://devicetree.org/schemas/clock/qcom,dispcc-sm8x50.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Qualcomm Display Clock & Reset Controller Binding for SM8150/SM8250 +title: Qualcomm Display Clock & Reset Controller Binding for SM8150/SM8250/SM8350 maintainers: - Jonathan Marek <[email protected]> description: | Qualcomm display clock control module which supports the clocks, resets and - power domains on SM8150 and SM8250. + power domains on SM8150, SM8250 and SM8350. See also: dt-bindings/clock/qcom,dispcc-sm8150.h dt-bindings/clock/qcom,dispcc-sm8250.h + dt-bindings/clock/qcom,dispcc-sm8350.h properties: compatible: enum: - qcom,sm8150-dispcc - qcom,sm8250-dispcc + - qcom,sm8350-dispcc clocks: items:
include/dt-bindings/clock/qcom,dispcc-sm8350.h new file +77 -0
77 lines not on this page · raw message
Signature · 1 line
2.30.2
Rob Herring
maintainerRe: [RFC v1 05/11] dt-bindings: clock: Add QCOM SM8350 display clock bindings
Quoted 49 lines · Robert Foss
Add device tree bindings for display clock controller for Qualcomm Technology Inc's SM8350 SoC.
Signed-off-by Robert Foss <[email protected]>--- .../bindings/clock/qcom,dispcc-sm8x50.yaml | 6 +- .../dt-bindings/clock/qcom,dispcc-sm8350.h | 77 +++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 include/dt-bindings/clock/qcom,dispcc-sm8350.hDocumentation/devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml +4
-2@@ -4,24 +4,26 @@ $id: http://devicetree.org/schemas/clock/qcom,dispcc-sm8x50.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Qualcomm Display Clock & Reset Controller Binding for SM8150/SM8250 +title: Qualcomm Display Clock & Reset Controller Binding for SM8150/SM8250/SM8350 maintainers: - Jonathan Marek <[email protected]> description: | Qualcomm display clock control module which supports the clocks, resets and - power domains on SM8150 and SM8250. + power domains on SM8150, SM8250 and SM8350. See also: dt-bindings/clock/qcom,dispcc-sm8150.h dt-bindings/clock/qcom,dispcc-sm8250.h + dt-bindings/clock/qcom,dispcc-sm8350.h properties: compatible: enum: - qcom,sm8150-dispcc - qcom,sm8250-dispcc + - qcom,sm8350-dispcc clocks: items:include/dt-bindings/clock/qcom,dispcc-sm8350.h new file +0
-0
include/dt-bindings/clock/qcom,dispcc-sm8350.h line 1
Quoted 1 line
include/dt-bindings/clock/qcom,dispcc-sm8350.h new file +1
-0@@ -0,0 +1,77 @@ +/* SPDX-License-Identifier: GPL-2.0 */
I'm tired of saying this for QCom bindings given it's been QCom I've gotten complaints on DT licensing, but dual license please. Spread the word.
I'm sure if someone audited licenses of headers and dts files they'd find a mess.
Rob
Re: [RFC v1 05/11] dt-bindings: clock: Add QCOM SM8350 display clock bindings
Quoted 57 lines · Rob Herring
Quoted 49 lines · Robert Foss
Add device tree bindings for display clock controller for Qualcomm Technology Inc's SM8350 SoC.
Signed-off-by Robert Foss <[email protected]>--- .../bindings/clock/qcom,dispcc-sm8x50.yaml | 6 +- .../dt-bindings/clock/qcom,dispcc-sm8350.h | 77 +++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 include/dt-bindings/clock/qcom,dispcc-sm8350.hDocumentation/devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml +4
-2@@ -4,24 +4,26 @@ $id: http://devicetree.org/schemas/clock/qcom,dispcc-sm8x50.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Qualcomm Display Clock & Reset Controller Binding for SM8150/SM8250 +title: Qualcomm Display Clock & Reset Controller Binding for SM8150/SM8250/SM8350 maintainers: - Jonathan Marek <[email protected]> description: | Qualcomm display clock control module which supports the clocks, resets and - power domains on SM8150 and SM8250. + power domains on SM8150, SM8250 and SM8350. See also: dt-bindings/clock/qcom,dispcc-sm8150.h dt-bindings/clock/qcom,dispcc-sm8250.h + dt-bindings/clock/qcom,dispcc-sm8350.h properties: compatible: enum: - qcom,sm8150-dispcc - qcom,sm8250-dispcc + - qcom,sm8350-dispcc clocks: items:include/dt-bindings/clock/qcom,dispcc-sm8350.h new file +0
-0include/dt-bindings/clock/qcom,dispcc-sm8350.h line 1
Quoted 1 line
include/dt-bindings/clock/qcom,dispcc-sm8350.h new file +1
-0@@ -0,0 +1,77 @@ +/* SPDX-License-Identifier: GPL-2.0 */ I'm tired of saying this for QCom bindings given it's been QCom I've gotten complaints on DT licensing, but dual license please. Spread the word.
Quoted 2 lines
I'm sure if someone audited licenses of headers and dts files they'd find a mess.
Thanks for pointing this out. I'll keep an eye out and change it to (GPL-2.0-only OR BSD-2-Clause).
RFC 6/11 clk: qcom: Add display clock controller driver for SM8350
In reply to Robert FossAdd support for the display clock controller found on SM8350.
--- drivers/clk/qcom/Kconfig | 9 + drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/dispcc-sm8350.c | 1402 ++++++++++++++++++++++++++++++ 3 files changed, 1412 insertions(+) create mode 100644 drivers/clk/qcom/dispcc-sm8350.c
drivers/clk/qcom/Kconfig +9 -0
@@ -492,6 +492,15 @@ config SM_DISPCC_8250 Say Y if you want to support display devices and functionality such as splash screen. +config SM_DISPCC_8350 + tristate "SM8350 Display Clock Controller" + depends on SM_GCC_8350 + help + Support for the display clock controller on Qualcomm Technologies, Inc + SM8350 devices. + Say Y if you want to support display devices and functionality such as + splash screen. + config SM_GCC_8150 tristate "SM8150 Global Clock Controller" help
drivers/clk/qcom/Makefile +1 -0
@@ -74,6 +74,7 @@ obj-$(CONFIG_SDM_LPASSCC_845) += lpasscc-sdm845.o obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o obj-$(CONFIG_SDX_GCC_55) += gcc-sdx55.o obj-$(CONFIG_SM_DISPCC_8250) += dispcc-sm8250.o +obj-$(CONFIG_SM_DISPCC_8350) += dispcc-sm8350.o obj-$(CONFIG_SM_GCC_8150) += gcc-sm8150.o obj-$(CONFIG_SM_GCC_8250) += gcc-sm8250.o obj-$(CONFIG_SM_GCC_8350) += gcc-sm8350.o
drivers/clk/qcom/dispcc-sm8350.c new file +1402 -0
1,402 lines not on this page · raw message
Signature · 1 line
2.30.2
Re: [RFC v1 06/11] clk: qcom: Add display clock controller driver for SM8350
Quoted 65 lines · Robert Foss
Add support for the display clock controller found on SM8350.
Signed-off-by Robert Foss <[email protected]>--- drivers/clk/qcom/Kconfig | 9 + drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/dispcc-sm8350.c | 1402 ++++++++++++++++++++++++++++++ 3 files changed, 1412 insertions(+) create mode 100644 drivers/clk/qcom/dispcc-sm8350.cdrivers/clk/qcom/Kconfig +9
-0@@ -492,6 +492,15 @@ config SM_DISPCC_8250 Say Y if you want to support display devices and functionality such as splash screen. +config SM_DISPCC_8350 + tristate "SM8350 Display Clock Controller" + depends on SM_GCC_8350 + help + Support for the display clock controller on Qualcomm Technologies, Inc + SM8350 devices. + Say Y if you want to support display devices and functionality such as + splash screen. + config SM_GCC_8150 tristate "SM8150 Global Clock Controller" helpdrivers/clk/qcom/Makefile +1
-0@@ -74,6 +74,7 @@ obj-$(CONFIG_SDM_LPASSCC_845) += lpasscc-sdm845.o obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o obj-$(CONFIG_SDX_GCC_55) += gcc-sdx55.o obj-$(CONFIG_SM_DISPCC_8250) += dispcc-sm8250.o +obj-$(CONFIG_SM_DISPCC_8350) += dispcc-sm8350.o obj-$(CONFIG_SM_GCC_8150) += gcc-sm8150.o obj-$(CONFIG_SM_GCC_8250) += gcc-sm8250.o obj-$(CONFIG_SM_GCC_8350) += gcc-sm8350.odrivers/clk/qcom/dispcc-sm8350.c new file +17
-0@@ -0,0 +1,1402 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved. +*/ + +#include <linux/clk-provider.h> +#include <linux/err.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/regmap.h> +#include <linux/pm_runtime.h> + +#include <dt-bindings/clock/qcom,dispcc-sm8350.h> + +#include "clk-alpha-pll.h"
drivers/clk/qcom/dispcc-sm8350.c line 27
Quoted 10 lines
drivers/clk/qcom/dispcc-sm8350.c new file +10
-0+#include "clk-branch.h" +#include "clk-rcg.h" +#include "clk-regmap-divider.h" +#include "common.h" +#include "gdsc.h" +#include "reset.h" + +enum { +P_BI_TCXO , +P_CORE_BI_PLL_TEST_SE ,
Is the test clock any useful in practice? Many drivers don't include it.
Quoted 14 lines
drivers/clk/qcom/dispcc-sm8350.c new file +14
-0+P_DISP_CC_PLL0_OUT_MAIN , +P_DISP_CC_PLL1_OUT_EVEN , +P_DISP_CC_PLL1_OUT_MAIN , +P_DP_PHY_PLL_LINK_CLK , +P_DP_PHY_PLL_VCO_DIV_CLK , +P_DPTX1_PHY_PLL_LINK_CLK , +P_DPTX1_PHY_PLL_VCO_DIV_CLK , +P_DPTX2_PHY_PLL_LINK_CLK , +P_DPTX2_PHY_PLL_VCO_DIV_CLK , +P_DSI0_PHY_PLL_OUT_BYTECLK , +P_DSI0_PHY_PLL_OUT_DSICLK , +P_DSI1_PHY_PLL_OUT_BYTECLK , +P_DSI1_PHY_PLL_OUT_DSICLK , + P_EDP_PHY_PLL_LINK_CLK,
drivers/clk/qcom/dispcc-sm8350.c line 51
Quoted 10 lines
drivers/clk/qcom/dispcc-sm8350.c new file +10
-0+P_EDP_PHY_PLL_VCO_DIV_CLK , + P_SLEEP_CLK, +}; + +static struct pll_vco vco_table[] = { + {249600000 ,1750000000 ,0 }, +}; + +static const struct alpha_pll_config disp_cc_pll0_config = { + .l = 0x47,
Is the ".cal_l = 0x44," part from downstream not necessary?
Quoted 21 lines
drivers/clk/qcom/dispcc-sm8350.c new file +21
-0+ .alpha = 0xE000, + .config_ctl_val = 0x20485699, + .config_ctl_hi_val = 0x00002261, + .config_ctl_hi1_val = 0x2A9A699C, + .test_ctl_val = 0x00000000, + .test_ctl_hi_val = 0x00000000, + .test_ctl_hi1_val = 0x01800000, + .user_ctl_val = 0x00000000, + .user_ctl_hi_val = 0x00000805, + .user_ctl_hi1_val = 0x00000000, +}; + +static struct clk_init_data disp_cc_pll0_init = { + .name ="disp_cc_pll0" , + .parent_data = &(const struct clk_parent_data ){ + .fw_name ="bi_tcxo" , + }, + .num_parents =1 , + .ops = &clk_alpha_pll_lucid_5lpe_ops, +}; +
drivers/clk/qcom/dispcc-sm8350.c line 82
Quoted 10 lines
drivers/clk/qcom/dispcc-sm8350.c new file +10
-0+static struct clk_alpha_pll disp_cc_pll0 = { + .offset =0x0 , + .vco_table = vco_table, + .num_vco =ARRAY_SIZE (vco_table), + .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_LUCID ], + .clkr.hw.init = &disp_cc_pll0_init +}; + +static const struct alpha_pll_config disp_cc_pll1_config = { + .l =0x1F ,
Ditto
Quoted 781 lines
drivers/clk/qcom/dispcc-sm8350.c new file +781
-0+ .alpha = 0x4000, + .config_ctl_val = 0x20485699, + .config_ctl_hi_val = 0x00002261, + .config_ctl_hi1_val = 0x2A9A699C, + .test_ctl_val = 0x00000000, + .test_ctl_hi_val = 0x00000000, + .test_ctl_hi1_val = 0x01800000, + .user_ctl_val = 0x00000000, + .user_ctl_hi_val = 0x00000805, + .user_ctl_hi1_val = 0x00000000, +}; + +static struct clk_init_data disp_cc_pll1_init = { + .name ="disp_cc_pll1" , + .parent_data = &(const struct clk_parent_data ){ + .fw_name ="bi_tcxo" , + }, + .num_parents =1 , + .ops = &clk_alpha_pll_lucid_5lpe_ops, +}; + +static struct clk_alpha_pll disp_cc_pll1 = { + .offset =0x1000 , + .vco_table = vco_table, + .num_vco =ARRAY_SIZE (vco_table), + .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_LUCID ], + .clkr.hw.init = &disp_cc_pll1_init +}; + +static const struct parent_map disp_cc_parent_map_0[] = { + {P_BI_TCXO ,0 }, + {P_DP_PHY_PLL_LINK_CLK ,1 }, + {P_DP_PHY_PLL_VCO_DIV_CLK ,2 }, + {P_DPTX1_PHY_PLL_LINK_CLK ,3 }, + {P_DPTX1_PHY_PLL_VCO_DIV_CLK ,4 }, + {P_DPTX2_PHY_PLL_LINK_CLK ,5 }, + {P_DPTX2_PHY_PLL_VCO_DIV_CLK ,6 }, + {P_CORE_BI_PLL_TEST_SE ,7 }, +}; + +static const struct clk_parent_data disp_cc_parent_data_0[] = { + { .fw_name ="bi_tcxo" }, + { .fw_name ="dp_phy_pll_link_clk" }, + { .fw_name ="dp_phy_pll_vco_div_clk" }, + { .fw_name ="dptx1_phy_pll_link_clk" }, + { .fw_name ="dptx1_phy_pll_vco_div_clk" }, + { .fw_name ="dptx2_phy_pll_link_clk" }, + { .fw_name ="dptx2_phy_pll_vco_div_clk" }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct parent_map disp_cc_parent_map_1[] = { + {P_BI_TCXO ,0 }, + {P_CORE_BI_PLL_TEST_SE ,7 }, +}; + +static const struct clk_parent_data disp_cc_parent_data_1[] = { + { .fw_name ="bi_tcxo" }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct clk_parent_data disp_cc_parent_data_1_ao[] = { + { .fw_name ="bi_tcxo_ao" }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct parent_map disp_cc_parent_map_2[] = { + {P_BI_TCXO ,0 }, + {P_DSI0_PHY_PLL_OUT_BYTECLK ,1 }, + {P_DSI1_PHY_PLL_OUT_BYTECLK ,2 }, + {P_CORE_BI_PLL_TEST_SE ,7 }, +}; + +static const struct clk_parent_data disp_cc_parent_data_2[] = { + { .fw_name ="bi_tcxo" }, + { .fw_name ="dsi0_phy_pll_out_byteclk" }, + { .fw_name ="dsi1_phy_pll_out_byteclk" , }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct parent_map disp_cc_parent_map_3[] = { + {P_BI_TCXO ,0 }, + {P_EDP_PHY_PLL_LINK_CLK ,1 }, + {P_EDP_PHY_PLL_VCO_DIV_CLK ,2 }, + {P_CORE_BI_PLL_TEST_SE ,7 }, +}; + +static const struct clk_parent_data disp_cc_parent_data_3[] = { + { .fw_name ="bi_tcxo" }, + { .fw_name ="edp_phy_pll_link_clk" }, + { .fw_name ="edp_phy_pll_vco_div_clk" }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct parent_map disp_cc_parent_map_4[] = { + {P_BI_TCXO ,0 }, + {P_DISP_CC_PLL0_OUT_MAIN ,1 }, + {P_DISP_CC_PLL1_OUT_MAIN ,4 }, + {P_DISP_CC_PLL1_OUT_EVEN ,5 }, + {P_CORE_BI_PLL_TEST_SE ,7 }, +}; + +static const struct clk_parent_data disp_cc_parent_data_4[] = { + { .fw_name ="bi_tcxo" }, + { .hw = &disp_cc_pll0.clkr.hw }, + { .hw = &disp_cc_pll1.clkr.hw }, + { .hw = &disp_cc_pll1.clkr.hw }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct parent_map disp_cc_parent_map_5[] = { + {P_BI_TCXO ,0 }, + {P_DSI0_PHY_PLL_OUT_DSICLK ,1 }, + {P_DSI1_PHY_PLL_OUT_DSICLK ,2 }, + {P_CORE_BI_PLL_TEST_SE ,7 }, +}; + +static const struct clk_parent_data disp_cc_parent_data_5[] = { + { .fw_name ="bi_tcxo" }, + { .fw_name ="dsi0_phy_pll_out_dsiclk" }, + { .fw_name ="dsi1_phy_pll_out_dsiclk" }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct parent_map disp_cc_parent_map_6[] = { + {P_BI_TCXO ,0 }, + {P_DISP_CC_PLL1_OUT_MAIN ,4 }, + {P_DISP_CC_PLL1_OUT_EVEN ,5 }, + {P_CORE_BI_PLL_TEST_SE ,7 }, +}; + +static const struct clk_parent_data disp_cc_parent_data_6[] = { + { .fw_name ="bi_tcxo" }, + { .hw = &disp_cc_pll1.clkr.hw }, + { .hw = &disp_cc_pll1.clkr.hw }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct parent_map disp_cc_parent_map_7[] = { + {P_SLEEP_CLK ,0 }, + {P_CORE_BI_PLL_TEST_SE ,7 }, +}; + +static const struct clk_parent_data disp_cc_parent_data_7[] = { + { .fw_name ="sleep_clk" }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct freq_tbl ftbl_disp_cc_mdss_ahb_clk_src[] = { +F (19200000 ,P_BI_TCXO ,1 ,0 ,0 ), +F (37500000 ,P_DISP_CC_PLL1_OUT_MAIN ,16 ,0 ,0 ), +F (75000000 ,P_DISP_CC_PLL1_OUT_MAIN ,8 ,0 ,0 ), + { } +}; + +static struct clk_rcg2 disp_cc_mdss_ahb_clk_src = { + .cmd_rcgr =0x22a0 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_6, + .freq_tbl = ftbl_disp_cc_mdss_ahb_clk_src, + .flags =HW_CLK_CTRL_MODE , + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_ahb_clk_src" , + .parent_data = disp_cc_parent_data_6, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_6), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static const struct freq_tbl ftbl_disp_cc_mdss_byte0_clk_src[] = { +F (19200000 ,P_BI_TCXO ,1 ,0 ,0 ), + { } +}; + +static struct clk_rcg2 disp_cc_mdss_byte0_clk_src = { + .cmd_rcgr =0x210c , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_2, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_byte0_clk_src" , + .parent_data = disp_cc_parent_data_2, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_2), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_byte2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_byte1_clk_src = { + .cmd_rcgr =0x2128 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_2, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_byte1_clk_src" , + .parent_data = disp_cc_parent_data_2, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_2), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_byte2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_dp_aux1_clk_src = { + .cmd_rcgr =0x223c , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_1, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_aux1_clk_src" , + .parent_data = disp_cc_parent_data_1, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_1), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_dp_aux_clk_src = { + .cmd_rcgr =0x21d8 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_1, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_aux_clk_src" , + .parent_data = disp_cc_parent_data_1, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_1), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static const struct freq_tbl ftbl_disp_cc_mdss_dp_link1_clk_src[] = { +F (162000 ,P_DP_PHY_PLL_LINK_CLK ,1 ,0 ,0 ), +F (270000 ,P_DP_PHY_PLL_LINK_CLK ,1 ,0 ,0 ), +F (540000 ,P_DP_PHY_PLL_LINK_CLK ,1 ,0 ,0 ), +F (810000 ,P_DP_PHY_PLL_LINK_CLK ,1 ,0 ,0 ), + { } +}; + +static struct clk_rcg2 disp_cc_mdss_dp_link1_clk_src = { + .cmd_rcgr =0x2208 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_0, + .freq_tbl = ftbl_disp_cc_mdss_dp_link1_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_link1_clk_src" , + .parent_data = disp_cc_parent_data_0, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_0), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_dp_link_clk_src = { + .cmd_rcgr =0x2174 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_0, + .freq_tbl = ftbl_disp_cc_mdss_dp_link1_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_link_clk_src" , + .parent_data = disp_cc_parent_data_0, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_0), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_dp_pixel1_clk_src = { + .cmd_rcgr =0x21c0 , + .mnd_width =16 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_0, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_pixel1_clk_src" , + .parent_data = disp_cc_parent_data_0, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_0), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_dp_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_dp_pixel2_clk_src = { + .cmd_rcgr =0x21f0 , + .mnd_width =16 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_0, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_pixel2_clk_src" , + .parent_data = disp_cc_parent_data_0, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_0), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_dp_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_dp_pixel_clk_src = { + .cmd_rcgr =0x21a8 , + .mnd_width =16 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_0, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_pixel_clk_src" , + .parent_data = disp_cc_parent_data_0, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_0), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_dp_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_edp_aux_clk_src = { + .cmd_rcgr =0x2288 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_1, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_edp_aux_clk_src" , + .parent_data = disp_cc_parent_data_1, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_1), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_edp_link_clk_src = { + .cmd_rcgr =0x226c , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_3, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_edp_link_clk_src" , + .parent_data = disp_cc_parent_data_3, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_3), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_edp_pixel_clk_src = { + .cmd_rcgr =0x2254 , + .mnd_width =16 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_3, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_edp_pixel_clk_src" , + .parent_data = disp_cc_parent_data_3, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_3), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_dp_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_esc0_clk_src = { + .cmd_rcgr =0x2144 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_2, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_esc0_clk_src" , + .parent_data = disp_cc_parent_data_2, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_2), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_esc1_clk_src = { + .cmd_rcgr =0x215c , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_2, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_esc1_clk_src" , + .parent_data = disp_cc_parent_data_2, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_2), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static const struct freq_tbl ftbl_disp_cc_mdss_mdp_clk_src[] = { +F (19200000 ,P_BI_TCXO ,1 ,0 ,0 ), +F (85714286 ,P_DISP_CC_PLL1_OUT_MAIN ,7 ,0 ,0 ), +F (100000000 ,P_DISP_CC_PLL1_OUT_MAIN ,6 ,0 ,0 ), +F (150000000 ,P_DISP_CC_PLL1_OUT_MAIN ,4 ,0 ,0 ), +F (200000000 ,P_DISP_CC_PLL1_OUT_MAIN ,3 ,0 ,0 ), +F (300000000 ,P_DISP_CC_PLL1_OUT_MAIN ,2 ,0 ,0 ), +F (345000000 ,P_DISP_CC_PLL0_OUT_MAIN ,4 ,0 ,0 ), +F (460000000 ,P_DISP_CC_PLL0_OUT_MAIN ,3 ,0 ,0 ), + { } +}; + +static struct clk_rcg2 disp_cc_mdss_mdp_clk_src = { + .cmd_rcgr =0x20c4 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_4, + .freq_tbl = ftbl_disp_cc_mdss_mdp_clk_src, + .flags =HW_CLK_CTRL_MODE , + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_mdp_clk_src" , + .parent_data = disp_cc_parent_data_4, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_4), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_pclk0_clk_src = { + .cmd_rcgr =0x2094 , + .mnd_width =8 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_5, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_pclk0_clk_src" , + .parent_data = disp_cc_parent_data_5, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_5), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_pixel_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_pclk1_clk_src = { + .cmd_rcgr =0x20ac , + .mnd_width =8 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_5, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_pclk1_clk_src" , + .parent_data = disp_cc_parent_data_5, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_5), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_pixel_ops, + }, +}; + +static const struct freq_tbl ftbl_disp_cc_mdss_rot_clk_src[] = { +F (19200000 ,P_BI_TCXO ,1 ,0 ,0 ), +F (200000000 ,P_DISP_CC_PLL1_OUT_MAIN ,3 ,0 ,0 ), +F (300000000 ,P_DISP_CC_PLL1_OUT_MAIN ,2 ,0 ,0 ), +F (345000000 ,P_DISP_CC_PLL0_OUT_MAIN ,4 ,0 ,0 ), +F (460000000 ,P_DISP_CC_PLL0_OUT_MAIN ,3 ,0 ,0 ), + { } +}; + +static struct clk_rcg2 disp_cc_mdss_rot_clk_src = { + .cmd_rcgr =0x20dc , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_4, + .freq_tbl = ftbl_disp_cc_mdss_rot_clk_src, + .flags =HW_CLK_CTRL_MODE , + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_rot_clk_src" , + .parent_data = disp_cc_parent_data_4, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_4), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_vsync_clk_src = { + .cmd_rcgr =0x20f4 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_1, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_vsync_clk_src" , + .parent_data = disp_cc_parent_data_1, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_1), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static const struct freq_tbl ftbl_disp_cc_sleep_clk_src[] = { +F (32000 ,P_SLEEP_CLK ,1 ,0 ,0 ), + { } +}; + +static struct clk_rcg2 disp_cc_sleep_clk_src = { + .cmd_rcgr =0x6060 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_7, + .freq_tbl = ftbl_disp_cc_sleep_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_sleep_clk_src" , + .parent_data = disp_cc_parent_data_7, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_7), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_xo_clk_src = { + .cmd_rcgr =0x6044 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_1, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_xo_clk_src" , + .parent_data = disp_cc_parent_data_1_ao, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_1_ao), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_regmap_div disp_cc_mdss_byte0_div_clk_src = { + .reg =0x2124 , + .shift =0 , + .width =4 , + .clkr.hw.init = &(struct clk_init_data ) { + .name ="disp_cc_mdss_byte0_div_clk_src" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_byte0_clk_src.clkr.hw, + }, + .num_parents =1 , + .ops = &clk_regmap_div_ops, + }, +}; + +static struct clk_regmap_div disp_cc_mdss_byte1_div_clk_src = { + .reg =0x2140 , + .shift =0 , + .width =4 , + .clkr.hw.init = &(struct clk_init_data ) { + .name ="disp_cc_mdss_byte1_div_clk_src" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_byte1_clk_src.clkr.hw, + }, + .num_parents =1 , + .ops = &clk_regmap_div_ops, + }, +}; + +static struct clk_regmap_div disp_cc_mdss_dp_link1_div_clk_src = { + .reg =0x2220 , + .shift =0 , + .width =4 , + .clkr.hw.init = &(struct clk_init_data ) { + .name ="disp_cc_mdss_dp_link1_div_clk_src" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_link1_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_regmap_div_ro_ops, + }, +}; + +static struct clk_regmap_div disp_cc_mdss_dp_link_div_clk_src = { + .reg =0x218c , + .shift =0 , + .width =4 , + .clkr.hw.init = &(struct clk_init_data ) { + .name ="disp_cc_mdss_dp_link_div_clk_src" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_link_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_regmap_div_ro_ops, + }, +}; + +static struct clk_regmap_div disp_cc_mdss_edp_link_div_clk_src = { + .reg =0x2284 , + .shift =0 , + .width =4 , + .clkr.hw.init = &(struct clk_init_data ) { + .name ="disp_cc_mdss_edp_link_div_clk_src" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_edp_link_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_regmap_div_ro_ops, + }, +}; + +static struct clk_branch disp_cc_mdss_ahb_clk = { + .halt_reg =0x207c , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x207c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_ahb_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_ahb_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_byte0_clk = { + .halt_reg =0x2028 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2028 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_byte0_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_byte0_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_byte0_intf_clk = { + .halt_reg =0x202c , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x202c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_byte0_intf_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_byte0_div_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_byte1_clk = { + .halt_reg =0x2030 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2030 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_byte1_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_byte1_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_byte1_intf_clk = { + .halt_reg =0x2034 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2034 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_byte1_intf_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_byte1_div_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_aux1_clk = { + .halt_reg =0x2068 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2068 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_aux1_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_aux1_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_aux_clk = { + .halt_reg =0x2054 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2054 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_aux_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_aux_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_link1_clk = { + .halt_reg =0x205c , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x205c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_link1_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_link1_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_link1_intf_clk = { + .halt_reg =0x2060 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2060 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_link1_intf_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_link1_div_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_link_clk = { + .halt_reg =0x2040 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2040 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_link_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_link_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_link_intf_clk = {
drivers/clk/qcom/dispcc-sm8350.c line 873
Quoted 10 lines
drivers/clk/qcom/dispcc-sm8350.c new file +10
-0+ .halt_reg = 0x2044, + .halt_check = BRANCH_HALT, + .clkr = { + .enable_reg = 0x2044, + .enable_mask = BIT(0), + .hw.init = &(struct clk_init_data){ + .name = "disp_cc_mdss_dp_link_intf_clk", + .parent_data = &(const struct clk_parent_data){ + .hw = &disp_cc_mdss_dp_link_div_clk_src.clkr.hw, + },
I think using parent_hws for single-parent clocks is the way to go now.
Quoted 346 lines
drivers/clk/qcom/dispcc-sm8350.c new file +346
-0+ .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_pixel1_clk = { + .halt_reg =0x2050 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2050 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_pixel1_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_pixel1_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_pixel2_clk = { + .halt_reg =0x2058 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2058 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_pixel2_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_pixel2_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_pixel_clk = { + .halt_reg =0x204c , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x204c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_pixel_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_pixel_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_edp_aux_clk = { + .halt_reg =0x2078 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2078 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_edp_aux_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_edp_aux_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_edp_link_clk = { + .halt_reg =0x2070 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2070 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_edp_link_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_edp_link_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_edp_link_intf_clk = { + .halt_reg =0x2074 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2074 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_edp_link_intf_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_edp_link_div_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_edp_pixel_clk = { + .halt_reg =0x206c , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x206c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_edp_pixel_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_edp_pixel_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_esc0_clk = { + .halt_reg =0x2038 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2038 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_esc0_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_esc0_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_esc1_clk = { + .halt_reg =0x203c , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x203c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_esc1_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_esc1_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_mdp_clk = { + .halt_reg =0x200c , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x200c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_mdp_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_mdp_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_mdp_lut_clk = { + .halt_reg =0x201c , + .halt_check =BRANCH_HALT_VOTED , + .clkr = { + .enable_reg =0x201c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_mdp_lut_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_mdp_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_non_gdsc_ahb_clk = { + .halt_reg =0x4004 , + .halt_check =BRANCH_HALT_VOTED , + .clkr = { + .enable_reg =0x4004 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_non_gdsc_ahb_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_ahb_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_pclk0_clk = { + .halt_reg =0x2004 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2004 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_pclk0_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_pclk0_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_pclk1_clk = { + .halt_reg =0x2008 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2008 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_pclk1_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_pclk1_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_rot_clk = { + .halt_reg =0x2014 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2014 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_rot_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_rot_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_rscc_ahb_clk = { + .halt_reg =0x400c , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x400c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_rscc_ahb_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_ahb_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_rscc_vsync_clk = { + .halt_reg =0x4008 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x4008 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_rscc_vsync_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_vsync_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_vsync_clk = { + .halt_reg =0x2024 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2024 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_vsync_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_vsync_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_sleep_clk = { + .halt_reg =0x6078 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x6078 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_sleep_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_sleep_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + },
drivers/clk/qcom/dispcc-sm8350.c line 1229
Quoted 10 lines
drivers/clk/qcom/dispcc-sm8350.c new file +10
-0+ }, +}; + +static struct gdsc mdss_gdsc = { + .gdscr =0x3000 , + .pd = { + .name ="mdss_gdsc" , + }, + .pwrsts =PWRSTS_OFF_ON , + .flags =HW_CTRL ,
Downstream source [1] has "qcom,retain-regs;" here, doesn't that
imply need for RETAIN_FF_ENABLE?
Quoted 120 lines
drivers/clk/qcom/dispcc-sm8350.c new file +120
-0+ .supply = "mmcx", +}; + +static struct clk_regmap *disp_cc_sm8350_clocks[] = { + [DISP_CC_MDSS_AHB_CLK ] = &disp_cc_mdss_ahb_clk.clkr, + [DISP_CC_MDSS_AHB_CLK_SRC ] = &disp_cc_mdss_ahb_clk_src.clkr, + [DISP_CC_MDSS_BYTE0_CLK ] = &disp_cc_mdss_byte0_clk.clkr, + [DISP_CC_MDSS_BYTE0_CLK_SRC ] = &disp_cc_mdss_byte0_clk_src.clkr, + [DISP_CC_MDSS_BYTE0_DIV_CLK_SRC ] = &disp_cc_mdss_byte0_div_clk_src.clkr, + [DISP_CC_MDSS_BYTE0_INTF_CLK ] = &disp_cc_mdss_byte0_intf_clk.clkr, + [DISP_CC_MDSS_BYTE1_CLK ] = &disp_cc_mdss_byte1_clk.clkr, + [DISP_CC_MDSS_BYTE1_CLK_SRC ] = &disp_cc_mdss_byte1_clk_src.clkr, + [DISP_CC_MDSS_BYTE1_DIV_CLK_SRC ] = &disp_cc_mdss_byte1_div_clk_src.clkr, + [DISP_CC_MDSS_BYTE1_INTF_CLK ] = &disp_cc_mdss_byte1_intf_clk.clkr, + [DISP_CC_MDSS_DP_AUX1_CLK ] = &disp_cc_mdss_dp_aux1_clk.clkr, + [DISP_CC_MDSS_DP_AUX1_CLK_SRC ] = &disp_cc_mdss_dp_aux1_clk_src.clkr, + [DISP_CC_MDSS_DP_AUX_CLK ] = &disp_cc_mdss_dp_aux_clk.clkr, + [DISP_CC_MDSS_DP_AUX_CLK_SRC ] = &disp_cc_mdss_dp_aux_clk_src.clkr, + [DISP_CC_MDSS_DP_LINK1_CLK ] = &disp_cc_mdss_dp_link1_clk.clkr, + [DISP_CC_MDSS_DP_LINK1_CLK_SRC ] = &disp_cc_mdss_dp_link1_clk_src.clkr, + [DISP_CC_MDSS_DP_LINK1_DIV_CLK_SRC ] = &disp_cc_mdss_dp_link1_div_clk_src.clkr, + [DISP_CC_MDSS_DP_LINK1_INTF_CLK ] = &disp_cc_mdss_dp_link1_intf_clk.clkr, + [DISP_CC_MDSS_DP_LINK_CLK ] = &disp_cc_mdss_dp_link_clk.clkr, + [DISP_CC_MDSS_DP_LINK_CLK_SRC ] = &disp_cc_mdss_dp_link_clk_src.clkr, + [DISP_CC_MDSS_DP_LINK_DIV_CLK_SRC ] = &disp_cc_mdss_dp_link_div_clk_src.clkr, + [DISP_CC_MDSS_DP_LINK_INTF_CLK ] = &disp_cc_mdss_dp_link_intf_clk.clkr, + [DISP_CC_MDSS_DP_PIXEL1_CLK ] = &disp_cc_mdss_dp_pixel1_clk.clkr, + [DISP_CC_MDSS_DP_PIXEL1_CLK_SRC ] = &disp_cc_mdss_dp_pixel1_clk_src.clkr, + [DISP_CC_MDSS_DP_PIXEL2_CLK ] = &disp_cc_mdss_dp_pixel2_clk.clkr, + [DISP_CC_MDSS_DP_PIXEL2_CLK_SRC ] = &disp_cc_mdss_dp_pixel2_clk_src.clkr, + [DISP_CC_MDSS_DP_PIXEL_CLK ] = &disp_cc_mdss_dp_pixel_clk.clkr, + [DISP_CC_MDSS_DP_PIXEL_CLK_SRC ] = &disp_cc_mdss_dp_pixel_clk_src.clkr, + [DISP_CC_MDSS_EDP_AUX_CLK ] = &disp_cc_mdss_edp_aux_clk.clkr, + [DISP_CC_MDSS_EDP_AUX_CLK_SRC ] = &disp_cc_mdss_edp_aux_clk_src.clkr, + [DISP_CC_MDSS_EDP_LINK_CLK ] = &disp_cc_mdss_edp_link_clk.clkr, + [DISP_CC_MDSS_EDP_LINK_CLK_SRC ] = &disp_cc_mdss_edp_link_clk_src.clkr, + [DISP_CC_MDSS_EDP_LINK_DIV_CLK_SRC ] = &disp_cc_mdss_edp_link_div_clk_src.clkr, + [DISP_CC_MDSS_EDP_LINK_INTF_CLK ] = &disp_cc_mdss_edp_link_intf_clk.clkr, + [DISP_CC_MDSS_EDP_PIXEL_CLK ] = &disp_cc_mdss_edp_pixel_clk.clkr, + [DISP_CC_MDSS_EDP_PIXEL_CLK_SRC ] = &disp_cc_mdss_edp_pixel_clk_src.clkr, + [DISP_CC_MDSS_ESC0_CLK ] = &disp_cc_mdss_esc0_clk.clkr, + [DISP_CC_MDSS_ESC0_CLK_SRC ] = &disp_cc_mdss_esc0_clk_src.clkr, + [DISP_CC_MDSS_ESC1_CLK ] = &disp_cc_mdss_esc1_clk.clkr, + [DISP_CC_MDSS_ESC1_CLK_SRC ] = &disp_cc_mdss_esc1_clk_src.clkr, + [DISP_CC_MDSS_MDP_CLK ] = &disp_cc_mdss_mdp_clk.clkr, + [DISP_CC_MDSS_MDP_CLK_SRC ] = &disp_cc_mdss_mdp_clk_src.clkr, + [DISP_CC_MDSS_MDP_LUT_CLK ] = &disp_cc_mdss_mdp_lut_clk.clkr, + [DISP_CC_MDSS_NON_GDSC_AHB_CLK ] = &disp_cc_mdss_non_gdsc_ahb_clk.clkr, + [DISP_CC_MDSS_PCLK0_CLK ] = &disp_cc_mdss_pclk0_clk.clkr, + [DISP_CC_MDSS_PCLK0_CLK_SRC ] = &disp_cc_mdss_pclk0_clk_src.clkr, + [DISP_CC_MDSS_PCLK1_CLK ] = &disp_cc_mdss_pclk1_clk.clkr, + [DISP_CC_MDSS_PCLK1_CLK_SRC ] = &disp_cc_mdss_pclk1_clk_src.clkr, + [DISP_CC_MDSS_ROT_CLK ] = &disp_cc_mdss_rot_clk.clkr, + [DISP_CC_MDSS_ROT_CLK_SRC ] = &disp_cc_mdss_rot_clk_src.clkr, + [DISP_CC_MDSS_RSCC_AHB_CLK ] = &disp_cc_mdss_rscc_ahb_clk.clkr, + [DISP_CC_MDSS_RSCC_VSYNC_CLK ] = &disp_cc_mdss_rscc_vsync_clk.clkr, + [DISP_CC_MDSS_VSYNC_CLK ] = &disp_cc_mdss_vsync_clk.clkr, + [DISP_CC_MDSS_VSYNC_CLK_SRC ] = &disp_cc_mdss_vsync_clk_src.clkr, + [DISP_CC_PLL0 ] = &disp_cc_pll0.clkr, + [DISP_CC_PLL1 ] = &disp_cc_pll1.clkr, + [DISP_CC_SLEEP_CLK ] = &disp_cc_sleep_clk.clkr, + [DISP_CC_SLEEP_CLK_SRC ] = &disp_cc_sleep_clk_src.clkr, + [DISP_CC_XO_CLK_SRC ] = &disp_cc_xo_clk_src.clkr, +}; + +static const struct qcom_reset_map disp_cc_sm8350_resets[] = { + [DISP_CC_MDSS_CORE_BCR ] = {0x2000 }, + [DISP_CC_MDSS_RSCC_BCR ] = {0x4000 }, +}; + +static struct gdsc *disp_cc_sm8350_gdscs[] = { + [MDSS_GDSC ] = &mdss_gdsc, +}; + +static const struct regmap_config disp_cc_sm8350_regmap_config = { + .reg_bits =32 , + .reg_stride =4 , + .val_bits =32 , + .max_register =0x10000 , + .fast_io = true, +}; + +static struct qcom_cc_desc disp_cc_sm8350_desc = { + .config = &disp_cc_sm8350_regmap_config, + .clks = disp_cc_sm8350_clocks, + .num_clks =ARRAY_SIZE (disp_cc_sm8350_clocks), + .resets = disp_cc_sm8350_resets, + .num_resets =ARRAY_SIZE (disp_cc_sm8350_resets), + .gdscs = disp_cc_sm8350_gdscs, + .num_gdscs =ARRAY_SIZE (disp_cc_sm8350_gdscs), +}; + +static const struct of_device_id disp_cc_sm8350_match_table[] = { + { .compatible ="qcom,sm8350-dispcc" }, + { } +}; +MODULE_DEVICE_TABLE (of, disp_cc_sm8350_match_table); + +static int disp_cc_sm8350_probe (struct platform_device *pdev) +{ +struct regmap *regmap; +int ret; + + regmap =qcom_cc_map (pdev, &disp_cc_sm8350_desc); +if (IS_ERR (regmap)) +return PTR_ERR (regmap); + + ret =qcom_cc_runtime_init (pdev, &disp_cc_sm8350_desc); +if (ret) +return ret; + + ret =pm_runtime_resume_and_get (&pdev->dev); +if (ret) + goto err_pm; + +clk_lucid_5lpe_pll_configure (&disp_cc_pll0, regmap, &disp_cc_pll0_config); +clk_lucid_5lpe_pll_configure (&disp_cc_pll1, regmap, &disp_cc_pll1_config); + +/* Enable clock gating for MDP clocks */ +regmap_update_bits (regmap,0x8000 ,0x10 ,0x10 );
drivers/clk/qcom/dispcc-sm8350.c line 1359
Quoted 10 lines
drivers/clk/qcom/dispcc-sm8350.c new file +10
-0+ +/* +* Keep clocks always enabled: +* disp_cc_xo_clk +*/ +regmap_update_bits (regmap,0x605c ,BIT (0 ),BIT (0 )); + + ret =qcom_cc_really_probe (pdev, &disp_cc_sm8350_desc, regmap); +if (ret) { +dev_err (&pdev->dev,"Failed to register DISPCC clocks\n" );
qcom_cc_really_probe already has a fail message I think.
drivers/clk/qcom/dispcc-sm8350.c line 1363
Quoted 4 lines
drivers/clk/qcom/dispcc-sm8350.c new file +4
-0+ goto err_pm; + } + +pm_runtime_put_sync (&pdev->dev);
What's up with all that pm_ stuff on 8350 specifically? Does it apply
to other SoCs too?
drivers/clk/qcom/dispcc-sm8350.c line 1364
Quoted 1 line
drivers/clk/qcom/dispcc-sm8350.c new file +1
-0+dev_info (&pdev->dev,"Registered DISPCC clocks\n" );
That's redundant.
[1] https://github.com/MiCode/kernel_devicetree/blob/venus-r-oss/qcom/lahaina.dtsi#L2369
Konrad
Quoted 39 lines
drivers/clk/qcom/dispcc-sm8350.c new file +38
-0+ +return ret; + +err_pm: +pm_runtime_disable (&pdev->dev); + +return ret; +} + +static const struct dev_pm_ops disp_cc_sm8350_pm_ops = { + SET_RUNTIME_PM_OPS(qcom_cc_runtime_suspend, qcom_cc_runtime_resume, NULL) +SET_LATE_SYSTEM_SLEEP_PM_OPS (pm_runtime_force_suspend, + pm_runtime_force_resume) +}; + +static struct platform_driver disp_cc_sm8350_driver = { + .probe = disp_cc_sm8350_probe, + .driver = { + .name ="dispcc-sm8350" , + .of_match_table = disp_cc_sm8350_match_table, + .pm = &disp_cc_sm8350_pm_ops, + }, +}; + +static int __init disp_cc_sm8350_init (void ) +{ +return platform_driver_register (&disp_cc_sm8350_driver); +} +subsys_initcall (disp_cc_sm8350_init); + +static void __exit disp_cc_sm8350_exit(void) +{ +platform_driver_unregister (&disp_cc_sm8350_driver); +} +module_exit (disp_cc_sm8350_exit); + +MODULE_DESCRIPTION ("QTI DISP_CC SM8350 Driver" ); +MODULE_LICENSE ("GPL v2" );
Re: [RFC v1 06/11] clk: qcom: Add display clock controller driver for SM8350
H ey Konrad,
Quoted 72 lines · Konrad Dybcio
Quoted 69 lines · Robert Foss
Add support for the display clock controller found on SM8350.
Signed-off-by Robert Foss <[email protected]>--- drivers/clk/qcom/Kconfig | 9 + drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/dispcc-sm8350.c | 1402 ++++++++++++++++++++++++++++++ 3 files changed, 1412 insertions(+) create mode 100644 drivers/clk/qcom/dispcc-sm8350.cdrivers/clk/qcom/Kconfig +9
-0@@ -492,6 +492,15 @@ config SM_DISPCC_8250 Say Y if you want to support display devices and functionality such as splash screen. +config SM_DISPCC_8350 + tristate "SM8350 Display Clock Controller" + depends on SM_GCC_8350 + help + Support for the display clock controller on Qualcomm Technologies, Inc + SM8350 devices. + Say Y if you want to support display devices and functionality such as + splash screen. + config SM_GCC_8150 tristate "SM8150 Global Clock Controller" helpdrivers/clk/qcom/Makefile +1
-0@@ -74,6 +74,7 @@ obj-$(CONFIG_SDM_LPASSCC_845) += lpasscc-sdm845.o obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o obj-$(CONFIG_SDX_GCC_55) += gcc-sdx55.o obj-$(CONFIG_SM_DISPCC_8250) += dispcc-sm8250.o +obj-$(CONFIG_SM_DISPCC_8350) += dispcc-sm8350.o obj-$(CONFIG_SM_GCC_8150) += gcc-sm8150.o obj-$(CONFIG_SM_GCC_8250) += gcc-sm8250.o obj-$(CONFIG_SM_GCC_8350) += gcc-sm8350.odrivers/clk/qcom/dispcc-sm8350.c new file +21
-0@@ -0,0 +1,1402 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved. +*/ + +#include <linux/clk-provider.h> +#include <linux/err.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/regmap.h> +#include <linux/pm_runtime.h> + +#include <dt-bindings/clock/qcom,dispcc-sm8350.h> + +#include "clk-alpha-pll.h" +#include "clk-branch.h" +#include "clk-rcg.h" +#include "clk-regmap-divider.h" +#include "common.h"
Quoted 9 lines
drivers/clk/qcom/dispcc-sm8350.c line 27
Quoted 6 lines
drivers/clk/qcom/dispcc-sm8350.c new file +6
-0+#include "gdsc.h" +#include "reset.h" + +enum { +P_BI_TCXO , +P_CORE_BI_PLL_TEST_SE ,Is the test clock any useful in practice? Many drivers don't include it.
Possibly not, I'm not familiar with this specific clock. I'll remove it.
Quoted 20 lines
Quoted 20 lines
drivers/clk/qcom/dispcc-sm8350.c new file +18
-0+P_DISP_CC_PLL0_OUT_MAIN , +P_DISP_CC_PLL1_OUT_EVEN , +P_DISP_CC_PLL1_OUT_MAIN , +P_DP_PHY_PLL_LINK_CLK , +P_DP_PHY_PLL_VCO_DIV_CLK , +P_DPTX1_PHY_PLL_LINK_CLK , +P_DPTX1_PHY_PLL_VCO_DIV_CLK , +P_DPTX2_PHY_PLL_LINK_CLK , +P_DPTX2_PHY_PLL_VCO_DIV_CLK , +P_DSI0_PHY_PLL_OUT_BYTECLK , +P_DSI0_PHY_PLL_OUT_DSICLK , +P_DSI1_PHY_PLL_OUT_BYTECLK , +P_DSI1_PHY_PLL_OUT_DSICLK , +P_EDP_PHY_PLL_LINK_CLK , +P_EDP_PHY_PLL_VCO_DIV_CLK , + P_SLEEP_CLK, +}; +
Quoted 8 lines
drivers/clk/qcom/dispcc-sm8350.c line 51
Quoted 6 lines
drivers/clk/qcom/dispcc-sm8350.c new file +6
-0+static struct pll_vco vco_table[] = { + {249600000 ,1750000000 ,0 }, +}; + +static const struct alpha_pll_config disp_cc_pll0_config = { + .l =0x47 ,Is the ".cal_l =
0x44," part from downstream not necessary?
Yes it is. I went back and forth about 'cal_l', but in the end the only value it is ever set to is 0x44, which is also what the default value is. So there is no need for representing it explicitly at the moment.
Quoted 27 lines
Quoted 27 lines
drivers/clk/qcom/dispcc-sm8350.c new file +25
-0+ .alpha = 0xE000, + .config_ctl_val = 0x20485699, + .config_ctl_hi_val = 0x00002261, + .config_ctl_hi1_val = 0x2A9A699C, + .test_ctl_val = 0x00000000, + .test_ctl_hi_val = 0x00000000, + .test_ctl_hi1_val = 0x01800000, + .user_ctl_val = 0x00000000, + .user_ctl_hi_val = 0x00000805, + .user_ctl_hi1_val = 0x00000000, +}; + +static struct clk_init_data disp_cc_pll0_init = { + .name ="disp_cc_pll0" , + .parent_data = &(const struct clk_parent_data ){ + .fw_name ="bi_tcxo" , + }, + .num_parents =1 , + .ops = &clk_alpha_pll_lucid_5lpe_ops, +}; + +static struct clk_alpha_pll disp_cc_pll0 = { + .offset =0x0 , + .vco_table = vco_table, + .num_vco =ARRAY_SIZE (vco_table),
Quoted 8 lines
drivers/clk/qcom/dispcc-sm8350.c line 82
Quoted 6 lines
drivers/clk/qcom/dispcc-sm8350.c new file +6
-0+ .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_LUCID], + .clkr.hw.init = &disp_cc_pll0_init +}; + +static const struct alpha_pll_config disp_cc_pll1_config = { + .l =0x1F ,Ditto
Sorry, ditto what?
Quoted 788 lines
Quoted 788 lines
drivers/clk/qcom/dispcc-sm8350.c new file +785
-0+ .alpha = 0x4000, + .config_ctl_val = 0x20485699, + .config_ctl_hi_val = 0x00002261, + .config_ctl_hi1_val = 0x2A9A699C, + .test_ctl_val = 0x00000000, + .test_ctl_hi_val = 0x00000000, + .test_ctl_hi1_val = 0x01800000, + .user_ctl_val = 0x00000000, + .user_ctl_hi_val = 0x00000805, + .user_ctl_hi1_val = 0x00000000, +}; + +static struct clk_init_data disp_cc_pll1_init = { + .name ="disp_cc_pll1" , + .parent_data = &(const struct clk_parent_data ){ + .fw_name ="bi_tcxo" , + }, + .num_parents =1 , + .ops = &clk_alpha_pll_lucid_5lpe_ops, +}; + +static struct clk_alpha_pll disp_cc_pll1 = { + .offset =0x1000 , + .vco_table = vco_table, + .num_vco =ARRAY_SIZE (vco_table), + .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_LUCID ], + .clkr.hw.init = &disp_cc_pll1_init +}; + +static const struct parent_map disp_cc_parent_map_0[] = { + {P_BI_TCXO ,0 }, + {P_DP_PHY_PLL_LINK_CLK ,1 }, + {P_DP_PHY_PLL_VCO_DIV_CLK ,2 }, + {P_DPTX1_PHY_PLL_LINK_CLK ,3 }, + {P_DPTX1_PHY_PLL_VCO_DIV_CLK ,4 }, + {P_DPTX2_PHY_PLL_LINK_CLK ,5 }, + {P_DPTX2_PHY_PLL_VCO_DIV_CLK ,6 }, + {P_CORE_BI_PLL_TEST_SE ,7 }, +}; + +static const struct clk_parent_data disp_cc_parent_data_0[] = { + { .fw_name ="bi_tcxo" }, + { .fw_name ="dp_phy_pll_link_clk" }, + { .fw_name ="dp_phy_pll_vco_div_clk" }, + { .fw_name ="dptx1_phy_pll_link_clk" }, + { .fw_name ="dptx1_phy_pll_vco_div_clk" }, + { .fw_name ="dptx2_phy_pll_link_clk" }, + { .fw_name ="dptx2_phy_pll_vco_div_clk" }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct parent_map disp_cc_parent_map_1[] = { + {P_BI_TCXO ,0 }, + {P_CORE_BI_PLL_TEST_SE ,7 }, +}; + +static const struct clk_parent_data disp_cc_parent_data_1[] = { + { .fw_name ="bi_tcxo" }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct clk_parent_data disp_cc_parent_data_1_ao[] = { + { .fw_name ="bi_tcxo_ao" }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct parent_map disp_cc_parent_map_2[] = { + {P_BI_TCXO ,0 }, + {P_DSI0_PHY_PLL_OUT_BYTECLK ,1 }, + {P_DSI1_PHY_PLL_OUT_BYTECLK ,2 }, + {P_CORE_BI_PLL_TEST_SE ,7 }, +}; + +static const struct clk_parent_data disp_cc_parent_data_2[] = { + { .fw_name ="bi_tcxo" }, + { .fw_name ="dsi0_phy_pll_out_byteclk" }, + { .fw_name ="dsi1_phy_pll_out_byteclk" , }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct parent_map disp_cc_parent_map_3[] = { + {P_BI_TCXO ,0 }, + {P_EDP_PHY_PLL_LINK_CLK ,1 }, + {P_EDP_PHY_PLL_VCO_DIV_CLK ,2 }, + {P_CORE_BI_PLL_TEST_SE ,7 }, +}; + +static const struct clk_parent_data disp_cc_parent_data_3[] = { + { .fw_name ="bi_tcxo" }, + { .fw_name ="edp_phy_pll_link_clk" }, + { .fw_name ="edp_phy_pll_vco_div_clk" }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct parent_map disp_cc_parent_map_4[] = { + {P_BI_TCXO ,0 }, + {P_DISP_CC_PLL0_OUT_MAIN ,1 }, + {P_DISP_CC_PLL1_OUT_MAIN ,4 }, + {P_DISP_CC_PLL1_OUT_EVEN ,5 }, + {P_CORE_BI_PLL_TEST_SE ,7 }, +}; + +static const struct clk_parent_data disp_cc_parent_data_4[] = { + { .fw_name ="bi_tcxo" }, + { .hw = &disp_cc_pll0.clkr.hw }, + { .hw = &disp_cc_pll1.clkr.hw }, + { .hw = &disp_cc_pll1.clkr.hw }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct parent_map disp_cc_parent_map_5[] = { + {P_BI_TCXO ,0 }, + {P_DSI0_PHY_PLL_OUT_DSICLK ,1 }, + {P_DSI1_PHY_PLL_OUT_DSICLK ,2 }, + {P_CORE_BI_PLL_TEST_SE ,7 }, +}; + +static const struct clk_parent_data disp_cc_parent_data_5[] = { + { .fw_name ="bi_tcxo" }, + { .fw_name ="dsi0_phy_pll_out_dsiclk" }, + { .fw_name ="dsi1_phy_pll_out_dsiclk" }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct parent_map disp_cc_parent_map_6[] = { + {P_BI_TCXO ,0 }, + {P_DISP_CC_PLL1_OUT_MAIN ,4 }, + {P_DISP_CC_PLL1_OUT_EVEN ,5 }, + {P_CORE_BI_PLL_TEST_SE ,7 }, +}; + +static const struct clk_parent_data disp_cc_parent_data_6[] = { + { .fw_name ="bi_tcxo" }, + { .hw = &disp_cc_pll1.clkr.hw }, + { .hw = &disp_cc_pll1.clkr.hw }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct parent_map disp_cc_parent_map_7[] = { + {P_SLEEP_CLK ,0 }, + {P_CORE_BI_PLL_TEST_SE ,7 }, +}; + +static const struct clk_parent_data disp_cc_parent_data_7[] = { + { .fw_name ="sleep_clk" }, + { .fw_name ="core_bi_pll_test_se" }, +}; + +static const struct freq_tbl ftbl_disp_cc_mdss_ahb_clk_src[] = { +F (19200000 ,P_BI_TCXO ,1 ,0 ,0 ), +F (37500000 ,P_DISP_CC_PLL1_OUT_MAIN ,16 ,0 ,0 ), +F (75000000 ,P_DISP_CC_PLL1_OUT_MAIN ,8 ,0 ,0 ), + { } +}; + +static struct clk_rcg2 disp_cc_mdss_ahb_clk_src = { + .cmd_rcgr =0x22a0 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_6, + .freq_tbl = ftbl_disp_cc_mdss_ahb_clk_src, + .flags =HW_CLK_CTRL_MODE , + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_ahb_clk_src" , + .parent_data = disp_cc_parent_data_6, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_6), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static const struct freq_tbl ftbl_disp_cc_mdss_byte0_clk_src[] = { +F (19200000 ,P_BI_TCXO ,1 ,0 ,0 ), + { } +}; + +static struct clk_rcg2 disp_cc_mdss_byte0_clk_src = { + .cmd_rcgr =0x210c , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_2, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_byte0_clk_src" , + .parent_data = disp_cc_parent_data_2, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_2), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_byte2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_byte1_clk_src = { + .cmd_rcgr =0x2128 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_2, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_byte1_clk_src" , + .parent_data = disp_cc_parent_data_2, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_2), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_byte2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_dp_aux1_clk_src = { + .cmd_rcgr =0x223c , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_1, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_aux1_clk_src" , + .parent_data = disp_cc_parent_data_1, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_1), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_dp_aux_clk_src = { + .cmd_rcgr =0x21d8 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_1, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_aux_clk_src" , + .parent_data = disp_cc_parent_data_1, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_1), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static const struct freq_tbl ftbl_disp_cc_mdss_dp_link1_clk_src[] = { +F (162000 ,P_DP_PHY_PLL_LINK_CLK ,1 ,0 ,0 ), +F (270000 ,P_DP_PHY_PLL_LINK_CLK ,1 ,0 ,0 ), +F (540000 ,P_DP_PHY_PLL_LINK_CLK ,1 ,0 ,0 ), +F (810000 ,P_DP_PHY_PLL_LINK_CLK ,1 ,0 ,0 ), + { } +}; + +static struct clk_rcg2 disp_cc_mdss_dp_link1_clk_src = { + .cmd_rcgr =0x2208 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_0, + .freq_tbl = ftbl_disp_cc_mdss_dp_link1_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_link1_clk_src" , + .parent_data = disp_cc_parent_data_0, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_0), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_dp_link_clk_src = { + .cmd_rcgr =0x2174 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_0, + .freq_tbl = ftbl_disp_cc_mdss_dp_link1_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_link_clk_src" , + .parent_data = disp_cc_parent_data_0, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_0), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_dp_pixel1_clk_src = { + .cmd_rcgr =0x21c0 , + .mnd_width =16 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_0, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_pixel1_clk_src" , + .parent_data = disp_cc_parent_data_0, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_0), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_dp_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_dp_pixel2_clk_src = { + .cmd_rcgr =0x21f0 , + .mnd_width =16 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_0, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_pixel2_clk_src" , + .parent_data = disp_cc_parent_data_0, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_0), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_dp_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_dp_pixel_clk_src = { + .cmd_rcgr =0x21a8 , + .mnd_width =16 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_0, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_pixel_clk_src" , + .parent_data = disp_cc_parent_data_0, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_0), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_dp_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_edp_aux_clk_src = { + .cmd_rcgr =0x2288 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_1, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_edp_aux_clk_src" , + .parent_data = disp_cc_parent_data_1, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_1), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_edp_link_clk_src = { + .cmd_rcgr =0x226c , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_3, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_edp_link_clk_src" , + .parent_data = disp_cc_parent_data_3, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_3), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_edp_pixel_clk_src = { + .cmd_rcgr =0x2254 , + .mnd_width =16 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_3, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_edp_pixel_clk_src" , + .parent_data = disp_cc_parent_data_3, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_3), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_dp_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_esc0_clk_src = { + .cmd_rcgr =0x2144 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_2, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_esc0_clk_src" , + .parent_data = disp_cc_parent_data_2, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_2), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_esc1_clk_src = { + .cmd_rcgr =0x215c , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_2, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_esc1_clk_src" , + .parent_data = disp_cc_parent_data_2, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_2), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static const struct freq_tbl ftbl_disp_cc_mdss_mdp_clk_src[] = { +F (19200000 ,P_BI_TCXO ,1 ,0 ,0 ), +F (85714286 ,P_DISP_CC_PLL1_OUT_MAIN ,7 ,0 ,0 ), +F (100000000 ,P_DISP_CC_PLL1_OUT_MAIN ,6 ,0 ,0 ), +F (150000000 ,P_DISP_CC_PLL1_OUT_MAIN ,4 ,0 ,0 ), +F (200000000 ,P_DISP_CC_PLL1_OUT_MAIN ,3 ,0 ,0 ), +F (300000000 ,P_DISP_CC_PLL1_OUT_MAIN ,2 ,0 ,0 ), +F (345000000 ,P_DISP_CC_PLL0_OUT_MAIN ,4 ,0 ,0 ), +F (460000000 ,P_DISP_CC_PLL0_OUT_MAIN ,3 ,0 ,0 ), + { } +}; + +static struct clk_rcg2 disp_cc_mdss_mdp_clk_src = { + .cmd_rcgr =0x20c4 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_4, + .freq_tbl = ftbl_disp_cc_mdss_mdp_clk_src, + .flags =HW_CLK_CTRL_MODE , + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_mdp_clk_src" , + .parent_data = disp_cc_parent_data_4, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_4), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_pclk0_clk_src = { + .cmd_rcgr =0x2094 , + .mnd_width =8 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_5, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_pclk0_clk_src" , + .parent_data = disp_cc_parent_data_5, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_5), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_pixel_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_pclk1_clk_src = { + .cmd_rcgr =0x20ac , + .mnd_width =8 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_5, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_pclk1_clk_src" , + .parent_data = disp_cc_parent_data_5, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_5), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_pixel_ops, + }, +}; + +static const struct freq_tbl ftbl_disp_cc_mdss_rot_clk_src[] = { +F (19200000 ,P_BI_TCXO ,1 ,0 ,0 ), +F (200000000 ,P_DISP_CC_PLL1_OUT_MAIN ,3 ,0 ,0 ), +F (300000000 ,P_DISP_CC_PLL1_OUT_MAIN ,2 ,0 ,0 ), +F (345000000 ,P_DISP_CC_PLL0_OUT_MAIN ,4 ,0 ,0 ), +F (460000000 ,P_DISP_CC_PLL0_OUT_MAIN ,3 ,0 ,0 ), + { } +}; + +static struct clk_rcg2 disp_cc_mdss_rot_clk_src = { + .cmd_rcgr =0x20dc , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_4, + .freq_tbl = ftbl_disp_cc_mdss_rot_clk_src, + .flags =HW_CLK_CTRL_MODE , + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_rot_clk_src" , + .parent_data = disp_cc_parent_data_4, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_4), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_mdss_vsync_clk_src = { + .cmd_rcgr =0x20f4 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_1, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_vsync_clk_src" , + .parent_data = disp_cc_parent_data_1, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_1), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static const struct freq_tbl ftbl_disp_cc_sleep_clk_src[] = { +F (32000 ,P_SLEEP_CLK ,1 ,0 ,0 ), + { } +}; + +static struct clk_rcg2 disp_cc_sleep_clk_src = { + .cmd_rcgr =0x6060 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_7, + .freq_tbl = ftbl_disp_cc_sleep_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_sleep_clk_src" , + .parent_data = disp_cc_parent_data_7, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_7), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_rcg2 disp_cc_xo_clk_src = { + .cmd_rcgr =0x6044 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = disp_cc_parent_map_1, + .freq_tbl = ftbl_disp_cc_mdss_byte0_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="disp_cc_xo_clk_src" , + .parent_data = disp_cc_parent_data_1_ao, + .num_parents =ARRAY_SIZE (disp_cc_parent_data_1_ao), + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_rcg2_ops, + }, +}; + +static struct clk_regmap_div disp_cc_mdss_byte0_div_clk_src = { + .reg =0x2124 , + .shift =0 , + .width =4 , + .clkr.hw.init = &(struct clk_init_data ) { + .name ="disp_cc_mdss_byte0_div_clk_src" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_byte0_clk_src.clkr.hw, + }, + .num_parents =1 , + .ops = &clk_regmap_div_ops, + }, +}; + +static struct clk_regmap_div disp_cc_mdss_byte1_div_clk_src = { + .reg =0x2140 , + .shift =0 , + .width =4 , + .clkr.hw.init = &(struct clk_init_data ) { + .name ="disp_cc_mdss_byte1_div_clk_src" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_byte1_clk_src.clkr.hw, + }, + .num_parents =1 , + .ops = &clk_regmap_div_ops, + }, +}; + +static struct clk_regmap_div disp_cc_mdss_dp_link1_div_clk_src = { + .reg =0x2220 , + .shift =0 , + .width =4 , + .clkr.hw.init = &(struct clk_init_data ) { + .name ="disp_cc_mdss_dp_link1_div_clk_src" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_link1_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_regmap_div_ro_ops, + }, +}; + +static struct clk_regmap_div disp_cc_mdss_dp_link_div_clk_src = { + .reg =0x218c , + .shift =0 , + .width =4 , + .clkr.hw.init = &(struct clk_init_data ) { + .name ="disp_cc_mdss_dp_link_div_clk_src" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_link_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_regmap_div_ro_ops, + }, +}; + +static struct clk_regmap_div disp_cc_mdss_edp_link_div_clk_src = { + .reg =0x2284 , + .shift =0 , + .width =4 , + .clkr.hw.init = &(struct clk_init_data ) { + .name ="disp_cc_mdss_edp_link_div_clk_src" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_edp_link_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_regmap_div_ro_ops, + }, +}; + +static struct clk_branch disp_cc_mdss_ahb_clk = { + .halt_reg =0x207c , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x207c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_ahb_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_ahb_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_byte0_clk = { + .halt_reg =0x2028 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2028 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_byte0_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_byte0_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_byte0_intf_clk = { + .halt_reg =0x202c , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x202c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_byte0_intf_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_byte0_div_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_byte1_clk = { + .halt_reg =0x2030 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2030 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_byte1_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_byte1_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_byte1_intf_clk = { + .halt_reg =0x2034 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2034 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_byte1_intf_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_byte1_div_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_aux1_clk = { + .halt_reg =0x2068 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2068 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_aux1_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_aux1_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_aux_clk = { + .halt_reg =0x2054 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2054 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_aux_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_aux_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_link1_clk = { + .halt_reg =0x205c , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x205c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_link1_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_link1_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_link1_intf_clk = { + .halt_reg =0x2060 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2060 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_link1_intf_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_link1_div_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_link_clk = { + .halt_reg =0x2040 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2040 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_link_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_link_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_link_intf_clk = { + .halt_reg =0x2044 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2044 ,
Quoted 11 lines
drivers/clk/qcom/dispcc-sm8350.c line 873
Quoted 6 lines
drivers/clk/qcom/dispcc-sm8350.c new file +6
-0+ .enable_mask = BIT(0), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_link_intf_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_link_div_clk_src.clkr.hw, + },I think using
parent_hwsfor single-parent clocks is the way to go now.
Ack.
Quoted 359 lines
Quoted 346 lines
drivers/clk/qcom/dispcc-sm8350.c new file +346
-0+ .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_pixel1_clk = { + .halt_reg =0x2050 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2050 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_pixel1_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_pixel1_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_pixel2_clk = { + .halt_reg =0x2058 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2058 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_pixel2_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_pixel2_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_dp_pixel_clk = { + .halt_reg =0x204c , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x204c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_dp_pixel_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_dp_pixel_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_edp_aux_clk = { + .halt_reg =0x2078 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2078 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_edp_aux_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_edp_aux_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_edp_link_clk = { + .halt_reg =0x2070 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2070 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_edp_link_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_edp_link_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_edp_link_intf_clk = { + .halt_reg =0x2074 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2074 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_edp_link_intf_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_edp_link_div_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_edp_pixel_clk = { + .halt_reg =0x206c , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x206c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_edp_pixel_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_edp_pixel_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_esc0_clk = { + .halt_reg =0x2038 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2038 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_esc0_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_esc0_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_esc1_clk = { + .halt_reg =0x203c , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x203c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_esc1_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_esc1_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_mdp_clk = { + .halt_reg =0x200c , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x200c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_mdp_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_mdp_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_mdp_lut_clk = { + .halt_reg =0x201c , + .halt_check =BRANCH_HALT_VOTED , + .clkr = { + .enable_reg =0x201c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_mdp_lut_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_mdp_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_non_gdsc_ahb_clk = { + .halt_reg =0x4004 , + .halt_check =BRANCH_HALT_VOTED , + .clkr = { + .enable_reg =0x4004 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_non_gdsc_ahb_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_ahb_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_pclk0_clk = { + .halt_reg =0x2004 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2004 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_pclk0_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_pclk0_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_pclk1_clk = { + .halt_reg =0x2008 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2008 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_pclk1_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_pclk1_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_rot_clk = { + .halt_reg =0x2014 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2014 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_rot_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_rot_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_rscc_ahb_clk = { + .halt_reg =0x400c , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x400c , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_rscc_ahb_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_ahb_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_mdss_rscc_vsync_clk = { + .halt_reg =0x4008 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x4008 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_rscc_vsync_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_vsync_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, & +}; + +static struct clk_branch disp_cc_mdss_vsync_clk = { + .halt_reg =0x2024 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2024 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_mdss_vsync_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_mdss_vsync_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch disp_cc_sleep_clk = { + .halt_reg =0x6078 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x6078 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="disp_cc_sleep_clk" , + .parent_data = &(const struct clk_parent_data ){ + .hw = &disp_cc_sleep_clk_src.clkr.hw, + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + .ops = &clk_branch2_ops, + },drivers/clk/qcom/dispcc-sm8350.c line 1229
Quoted 10 lines
drivers/clk/qcom/dispcc-sm8350.c new file +10
-0+ }, +}; + +static struct gdsc mdss_gdsc = { + .gdscr =0x3000 , + .pd = { + .name ="mdss_gdsc" , + }, + .pwrsts =PWRSTS_OFF_ON , + .flags =HW_CTRL ,Downstream source [1] has "qcom,retain-regs;" here, doesn't that
Quoted 3 lines
imply need for
RETAIN_FF_ENABLE?
I don't actually know how "qcom,retain-regs;" & RETAIN_FF_ENABLE are related.
I looked at dispcc-sm8250 for inspiration, but upon further investigation I'm not finding the corresponding gdsc (disp_cc_mdss_core_gdsc) for sm8250.
Either way, I'm happy to add this flag, but I don't know if it would be correct to add.
Quoted 125 lines
Quoted 125 lines
drivers/clk/qcom/dispcc-sm8350.c new file +124
-0+ .supply = "mmcx", +}; + +static struct clk_regmap *disp_cc_sm8350_clocks[] = { + [DISP_CC_MDSS_AHB_CLK ] = &disp_cc_mdss_ahb_clk.clkr, + [DISP_CC_MDSS_AHB_CLK_SRC ] = &disp_cc_mdss_ahb_clk_src.clkr, + [DISP_CC_MDSS_BYTE0_CLK ] = &disp_cc_mdss_byte0_clk.clkr, + [DISP_CC_MDSS_BYTE0_CLK_SRC ] = &disp_cc_mdss_byte0_clk_src.clkr, + [DISP_CC_MDSS_BYTE0_DIV_CLK_SRC ] = &disp_cc_mdss_byte0_div_clk_src.clkr, + [DISP_CC_MDSS_BYTE0_INTF_CLK ] = &disp_cc_mdss_byte0_intf_clk.clkr, + [DISP_CC_MDSS_BYTE1_CLK ] = &disp_cc_mdss_byte1_clk.clkr, + [DISP_CC_MDSS_BYTE1_CLK_SRC ] = &disp_cc_mdss_byte1_clk_src.clkr, + [DISP_CC_MDSS_BYTE1_DIV_CLK_SRC ] = &disp_cc_mdss_byte1_div_clk_src.clkr, + [DISP_CC_MDSS_BYTE1_INTF_CLK ] = &disp_cc_mdss_byte1_intf_clk.clkr, + [DISP_CC_MDSS_DP_AUX1_CLK ] = &disp_cc_mdss_dp_aux1_clk.clkr, + [DISP_CC_MDSS_DP_AUX1_CLK_SRC ] = &disp_cc_mdss_dp_aux1_clk_src.clkr, + [DISP_CC_MDSS_DP_AUX_CLK ] = &disp_cc_mdss_dp_aux_clk.clkr, + [DISP_CC_MDSS_DP_AUX_CLK_SRC ] = &disp_cc_mdss_dp_aux_clk_src.clkr, + [DISP_CC_MDSS_DP_LINK1_CLK ] = &disp_cc_mdss_dp_link1_clk.clkr, + [DISP_CC_MDSS_DP_LINK1_CLK_SRC ] = &disp_cc_mdss_dp_link1_clk_src.clkr, + [DISP_CC_MDSS_DP_LINK1_DIV_CLK_SRC ] = &disp_cc_mdss_dp_link1_div_clk_src.clkr, + [DISP_CC_MDSS_DP_LINK1_INTF_CLK ] = &disp_cc_mdss_dp_link1_intf_clk.clkr, + [DISP_CC_MDSS_DP_LINK_CLK ] = &disp_cc_mdss_dp_link_clk.clkr, + [DISP_CC_MDSS_DP_LINK_CLK_SRC ] = &disp_cc_mdss_dp_link_clk_src.clkr, + [DISP_CC_MDSS_DP_LINK_DIV_CLK_SRC ] = &disp_cc_mdss_dp_link_div_clk_src.clkr, + [DISP_CC_MDSS_DP_LINK_INTF_CLK ] = &disp_cc_mdss_dp_link_intf_clk.clkr, + [DISP_CC_MDSS_DP_PIXEL1_CLK ] = &disp_cc_mdss_dp_pixel1_clk.clkr, + [DISP_CC_MDSS_DP_PIXEL1_CLK_SRC ] = &disp_cc_mdss_dp_pixel1_clk_src.clkr, + [DISP_CC_MDSS_DP_PIXEL2_CLK ] = &disp_cc_mdss_dp_pixel2_clk.clkr, + [DISP_CC_MDSS_DP_PIXEL2_CLK_SRC ] = &disp_cc_mdss_dp_pixel2_clk_src.clkr, + [DISP_CC_MDSS_DP_PIXEL_CLK ] = &disp_cc_mdss_dp_pixel_clk.clkr, + [DISP_CC_MDSS_DP_PIXEL_CLK_SRC ] = &disp_cc_mdss_dp_pixel_clk_src.clkr, + [DISP_CC_MDSS_EDP_AUX_CLK ] = &disp_cc_mdss_edp_aux_clk.clkr, + [DISP_CC_MDSS_EDP_AUX_CLK_SRC ] = &disp_cc_mdss_edp_aux_clk_src.clkr, + [DISP_CC_MDSS_EDP_LINK_CLK ] = &disp_cc_mdss_edp_link_clk.clkr, + [DISP_CC_MDSS_EDP_LINK_CLK_SRC ] = &disp_cc_mdss_edp_link_clk_src.clkr, + [DISP_CC_MDSS_EDP_LINK_DIV_CLK_SRC ] = &disp_cc_mdss_edp_link_div_clk_src.clkr, + [DISP_CC_MDSS_EDP_LINK_INTF_CLK ] = &disp_cc_mdss_edp_link_intf_clk.clkr, + [DISP_CC_MDSS_EDP_PIXEL_CLK ] = &disp_cc_mdss_edp_pixel_clk.clkr, + [DISP_CC_MDSS_EDP_PIXEL_CLK_SRC ] = &disp_cc_mdss_edp_pixel_clk_src.clkr, + [DISP_CC_MDSS_ESC0_CLK ] = &disp_cc_mdss_esc0_clk.clkr, + [DISP_CC_MDSS_ESC0_CLK_SRC ] = &disp_cc_mdss_esc0_clk_src.clkr, + [DISP_CC_MDSS_ESC1_CLK ] = &disp_cc_mdss_esc1_clk.clkr, + [DISP_CC_MDSS_ESC1_CLK_SRC ] = &disp_cc_mdss_esc1_clk_src.clkr, + [DISP_CC_MDSS_MDP_CLK ] = &disp_cc_mdss_mdp_clk.clkr, + [DISP_CC_MDSS_MDP_CLK_SRC ] = &disp_cc_mdss_mdp_clk_src.clkr, + [DISP_CC_MDSS_MDP_LUT_CLK ] = &disp_cc_mdss_mdp_lut_clk.clkr, + [DISP_CC_MDSS_NON_GDSC_AHB_CLK ] = &disp_cc_mdss_non_gdsc_ahb_clk.clkr, + [DISP_CC_MDSS_PCLK0_CLK ] = &disp_cc_mdss_pclk0_clk.clkr, + [DISP_CC_MDSS_PCLK0_CLK_SRC ] = &disp_cc_mdss_pclk0_clk_src.clkr, + [DISP_CC_MDSS_PCLK1_CLK ] = &disp_cc_mdss_pclk1_clk.clkr, + [DISP_CC_MDSS_PCLK1_CLK_SRC ] = &disp_cc_mdss_pclk1_clk_src.clkr, + [DISP_CC_MDSS_ROT_CLK ] = &disp_cc_mdss_rot_clk.clkr, + [DISP_CC_MDSS_ROT_CLK_SRC ] = &disp_cc_mdss_rot_clk_src.clkr, + [DISP_CC_MDSS_RSCC_AHB_CLK ] = &disp_cc_mdss_rscc_ahb_clk.clkr, + [DISP_CC_MDSS_RSCC_VSYNC_CLK ] = &disp_cc_mdss_rscc_vsync_clk.clkr, + [DISP_CC_MDSS_VSYNC_CLK ] = &disp_cc_mdss_vsync_clk.clkr, + [DISP_CC_MDSS_VSYNC_CLK_SRC ] = &disp_cc_mdss_vsync_clk_src.clkr, + [DISP_CC_PLL0 ] = &disp_cc_pll0.clkr, + [DISP_CC_PLL1 ] = &disp_cc_pll1.clkr, + [DISP_CC_SLEEP_CLK ] = &disp_cc_sleep_clk.clkr, + [DISP_CC_SLEEP_CLK_SRC ] = &disp_cc_sleep_clk_src.clkr, + [DISP_CC_XO_CLK_SRC ] = &disp_cc_xo_clk_src.clkr, +}; + +static const struct qcom_reset_map disp_cc_sm8350_resets[] = { + [DISP_CC_MDSS_CORE_BCR ] = {0x2000 }, + [DISP_CC_MDSS_RSCC_BCR ] = {0x4000 }, +}; + +static struct gdsc *disp_cc_sm8350_gdscs[] = { + [MDSS_GDSC ] = &mdss_gdsc, +}; + +static const struct regmap_config disp_cc_sm8350_regmap_config = { + .reg_bits =32 , + .reg_stride =4 , + .val_bits =32 , + .max_register =0x10000 , + .fast_io = true, +};at + +static struct qcom_cc_desc disp_cc_sm8350_desc = { + .config = &disp_cc_sm8350_regmap_config, + .clks = disp_cc_sm8350_clocks, + .num_clks =ARRAY_SIZE (disp_cc_sm8350_clocks), + .resets = disp_cc_sm8350_resets, + .num_resets =ARRAY_SIZE (disp_cc_sm8350_resets), + .gdscs = disp_cc_sm8350_gdscs, + .num_gdscs =ARRAY_SIZE (disp_cc_sm8350_gdscs), +}; + +static const struct of_device_id disp_cc_sm8350_match_table[] = { + { .compatible ="qcom,sm8350-dispcc" }, + { } +}; +MODULE_DEVICE_TABLE (of, disp_cc_sm8350_match_table); + +static int disp_cc_sm8350_probe (struct platform_device *pdev) +{ +struct regmap *regmap; +int ret; + + regmap =qcom_cc_map (pdev, &disp_cc_sm8350_desc); +if (IS_ERR (regmap)) +return PTR_ERR (regmap); + + ret =qcom_cc_runtime_init (pdev, &disp_cc_sm8350_desc); +if (ret) +return ret; + + ret =pm_runtime_resume_and_get (&pdev->dev); +if (ret) + goto err_pm; + +clk_lucid_5lpe_pll_configure (&disp_cc_pll0, regmap, &disp_cc_pll0_config); +clk_lucid_5lpe_pll_configure (&disp_cc_pll1, regmap, &disp_cc_pll1_config); + +/* Enable clock gating for MDP clocks */ +regmap_update_bits (regmap,0x8000 ,0x10 ,0x10 ); + +/* +* Keep clocks always enabled: +* disp_cc_xo_clk
Quoted 8 lines
drivers/clk/qcom/dispcc-sm8350.c line 1359
Quoted 6 lines
drivers/clk/qcom/dispcc-sm8350.c new file +6
-0+*/ +regmap_update_bits (regmap,0x605c ,BIT (0 ),BIT (0 )); + + ret =qcom_cc_really_probe (pdev, &disp_cc_sm8350_desc, regmap); +if (ret) { +dev_err (&pdev->dev,"Failed to register DISPCC clocks\n" );
qcom_cc_really_probealready has a fail message I think.
I'm not finding any prints in qcom_cc_really_probe()
Quoted 10 lines
drivers/clk/qcom/dispcc-sm8350.c line 1363
Quoted 6 lines
drivers/clk/qcom/dispcc-sm8350.c new file +4
-0+ goto err_pm; + } + +pm_runtime_put_sync (&pdev->dev);What's up with all that
pm_stuff on 8350 specifically? Does it applyto other SoCs too?
I think it could be implemented for other SOCs, I opted to keep it in since it that's what downstream does.
Quoted 6 lines
drivers/clk/qcom/dispcc-sm8350.c line 1364
Quoted 4 lines
drivers/clk/qcom/dispcc-sm8350.c new file +1
-0+dev_info (&pdev->dev,"Registered DISPCC clocks\n" );That's redundant.
Ack.
Quoted 6 lines
[1] https://github.com/MiCode/kernel_devicetree/blob/venus-r-oss/qcom/lahaina.dtsi#L2369
Konrad
After sending this series out Jonathan pointed me to his series implementing dispcc support for sm8350, which is a lot more minimal. His series does not implement videocc support, so that remains to be done.
Re: [RFC v1 06/11] clk: qcom: Add display clock controller driver for SM8350
Quoted 8 lines
Quoted 8 lines
drivers/clk/qcom/dispcc-sm8350.c line 51
Quoted 7 lines
drivers/clk/qcom/dispcc-sm8350.c new file +7
-0+ +static struct pll_vco vco_table[] = { + {249600000 ,1750000000 ,0 }, +}; + +static const struct alpha_pll_config disp_cc_pll0_config = { + .l =0x47 ,Is the ".cal_l =
0x44," part from downstream not necessary?
Quoted 4 lines
Yes it is. I went back and forth about '
cal_l', but in the end the only value it is ever set to is0x44, which is also what the default value is. So there is no need for representing it explicitly at the moment.
Interesting, maybe it'll be required for next SoCs..
Quoted 6 lines
Quoted 5 lines
drivers/clk/qcom/dispcc-sm8350.c line 82
Quoted 4 lines
drivers/clk/qcom/dispcc-sm8350.c new file +4
-0+}; + +static const struct alpha_pll_config disp_cc_pll1_config = { + .l =0x1F ,Ditto
Sorry, ditto what?
Aah, sorry I cut out a ".cal_l = 0x44" line while adding my comments..
Konrad
RFC 7/11 dt-bindings: clock: Add SM8350 QCOM video clock bindings
In reply to Robert FossAdd device tree bindings for video clock controller for SM8350 SoCs.
--- .../bindings/clock/qcom,videocc.yaml | 2 + .../dt-bindings/clock/qcom,videocc-sm8350.h | 44 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 include/dt-bindings/clock/qcom,videocc-sm8350.h
Documentation/devicetree/bindings/clock/qcom,videocc.yaml +2 -0
@@ -18,6 +18,7 @@ description: | dt-bindings/clock/qcom,videocc-sdm845.h dt-bindings/clock/qcom,videocc-sm8150.h dt-bindings/clock/qcom,videocc-sm8250.h + dt-bindings/clock/qcom,videocc-sm8350.h properties: compatible:
@@ -26,6 +27,7 @@ properties: - qcom,sdm845-videocc - qcom,sm8150-videocc - qcom,sm8250-videocc + - qcom,sm8350-videocc clocks: items:
include/dt-bindings/clock/qcom,videocc-sm8350.h new file +44 -0
44 lines not on this page · raw message
Signature · 1 line
2.30.2
RFC 8/11 clk: qcom: Add video clock controller driver for SM8350
In reply to Robert FossAdd support for the video clock controller found on SM8350 based devices.
Derived from the downstream driver.
--- drivers/clk/qcom/Kconfig | 9 + drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/videocc-sm8350.c | 593 ++++++++++++++++++++++++++++++ 3 files changed, 603 insertions(+) create mode 100644 drivers/clk/qcom/videocc-sm8350.c
drivers/clk/qcom/Kconfig +9 -0
@@ -558,6 +558,15 @@ config SM_VIDEOCC_8250 Say Y if you want to support video devices and functionality such as video encode and decode. +config SM_VIDEOCC_8350 + tristate "SM8350 Video Clock Controller" + select SDM_GCC_8350 + select QCOM_GDSC + help + Support for the video clock controller on SM8350 devices. + Say Y if you want to support video devices and functionality such as + video encode and decode. + config SPMI_PMIC_CLKDIV tristate "SPMI PMIC clkdiv Support" depends on SPMI || COMPILE_TEST
drivers/clk/qcom/Makefile +1 -0
@@ -82,6 +82,7 @@ obj-$(CONFIG_SM_GPUCC_8150) += gpucc-sm8150.o obj-$(CONFIG_SM_GPUCC_8250) += gpucc-sm8250.o obj-$(CONFIG_SM_VIDEOCC_8150) += videocc-sm8150.o obj-$(CONFIG_SM_VIDEOCC_8250) += videocc-sm8250.o +obj-$(CONFIG_SM_VIDEOCC_8350) += videocc-sm8350.o obj-$(CONFIG_SPMI_PMIC_CLKDIV) += clk-spmi-pmic-div.o obj-$(CONFIG_KPSS_XCC) += kpss-xcc.o obj-$(CONFIG_QCOM_HFPLL) += hfpll.o
drivers/clk/qcom/videocc-sm8350.c new file +593 -0
593 lines not on this page · raw message
Signature · 1 line
2.30.2
RFC 9/11 arm64: dts: qcom: sm8350: Power up dispcc & videocc on sm8350 by MMCX regulator
In reply to Robert FossAdd regulator controlling MMCX power domain to be used by display clock controller and video clock controller on SM8350.
--- arch/arm64/boot/dts/qcom/sm8350.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/qcom/sm8350.dtsi +8 -0
@@ -169,6 +169,14 @@ memory@80000000 { reg = <0x0 0x80000000 0x0 0x0>; }; + mmcx_reg: mmcx-reg { + compatible = "regulator-fixed-domain"; + power-domains = <&rpmhpd SM8350_MMCX>; + required-opps = <&rpmhpd_opp_nom>; + regulator-name = "MMCX"; + regulator-always-on; + }; + pmu { compatible = "arm,armv8-pmuv3"; interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW>;
Signature · 1 line
2.30.2
RFC 10/11 arm64: dts: qcom: sm8350: Add videocc DT node
In reply to Robert FossThis commit adds the videocc DTS node for sm8350.
--- arch/arm64/boot/dts/qcom/sm8350.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/arm64/boot/dts/qcom/sm8350.dtsi +13 -0
@@ -11,6 +11,7 @@ #include <dt-bindings/power/qcom-rpmpd.h> #include <dt-bindings/soc/qcom,rpmh-rsc.h> #include <dt-bindings/thermal/thermal.h> +#include <dt-bindings/clock/qcom,videocc-sm8350.h> / { interrupt-parent = <&intc>;
@@ -1285,6 +1286,18 @@ usb_2_dwc3: dwc3@a800000 { }; }; + videocc: qcom,videocc@abf0000 { + compatible = "qcom,sm8350-videocc"; + reg = <0 0x0abf0000 0 0x10000>; + clocks = <&rpmhcc RPMH_CXO_CLK>, + <&rpmhcc RPMH_CXO_CLK_A>; + mmcx-supply = <&mmcx_reg>; + clock-names = "bi_tcxo", "bi_tcxo_ao"; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; + adsp: remoteproc@17300000 { compatible = "qcom,sm8350-adsp-pas"; reg = <0 0x17300000 0 0x100>;
Signature · 1 line
2.30.2
RFC 11/11 arm64: dts: qcom: sm8350: Add dispcc DT node
In reply to Robert FossThis commit adds the dispcc DTS node for sm8350.
--- arch/arm64/boot/dts/qcom/sm8350.dtsi | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
arch/arm64/boot/dts/qcom/sm8350.dtsi +25 -0
@@ -3,7 +3,9 @@ * Copyright (c) 2020, Linaro Limited */ +#include <dt-bindings/interconnect/qcom,sm8350.h> #include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/clock/qcom,dispcc-sm8350.h> #include <dt-bindings/clock/qcom,gcc-sm8350.h> #include <dt-bindings/clock/qcom,rpmh.h> #include <dt-bindings/mailbox/qcom-ipcc.h>
@@ -1298,6 +1300,29 @@ videocc: qcom,videocc@abf0000 { #power-domain-cells = <1>; }; + dispcc: clock-controller@af00000 { + compatible = "qcom,sm8350-dispcc"; + reg = <0 0x0af00000 0 0x10000>; + mmcx-supply = <&mmcx_reg>; + clocks = <&rpmhcc RPMH_CXO_CLK>, + <0>, + <0>, + <0>, + <0>, + <0>, + <0>; + clock-names = "bi_tcxo", + "dsi0_phy_pll_out_byteclk", + "dsi0_phy_pll_out_dsiclk", + "dsi1_phy_pll_out_byteclk", + "dsi1_phy_pll_out_dsiclk", + "dp_phy_pll_link_clk", + "dp_phy_pll_vco_div_clk"; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; + adsp: remoteproc@17300000 { compatible = "qcom,sm8350-adsp-pas"; reg = <0 0x17300000 0 0x100>;
Signature · 1 line
2.30.2