Add support to the SM8350 display clock controller by extending the SM8250
display clock controller, which is almost identical but has some minor
differences.
Signed-off-by: Jonathan Marek <[email protected]>
---
v3:
- added const to vco tables
- moved clk rcgs/div list to global scope
- patching clks on module init instead of probe
- lowercase hex
- update configure comment
- rebased on added edp clocks
drivers/clk/qcom/Kconfig | 4 +-
drivers/clk/qcom/dispcc-sm8250.c | 103 ++++++++++++++++++++++++++-----
2 files changed, 90 insertions(+), 17 deletions(-)
diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig
index 45646b867cdb..cc60e6ee1654 100644
--- a/drivers/clk/qcom/Kconfig
+++ b/drivers/clk/qcom/Kconfig
@@ -484,11 +484,11 @@ config SDX_GCC_55
SPI, I2C, USB, SD/UFS, PCIe etc.
config SM_DISPCC_8250
- tristate "SM8150 and SM8250 Display Clock Controller"
+ tristate "SM8150/SM8250/SM8350 Display Clock Controller"
depends on SM_GCC_8150 || SM_GCC_8250
help
Support for the display clock controller on Qualcomm Technologies, Inc
- SM8150 and SM8250 devices.
+ SM8150/SM8250/SM8350 devices.
Say Y if you want to support display devices and functionality such as
splash screen.
diff --git a/drivers/clk/qcom/dispcc-sm8250.c b/drivers/clk/qcom/dispcc-sm8250.c
index 601c7c0ba483..86c474a51cd2 100644
--- a/drivers/clk/qcom/dispcc-sm8250.c
+++ b/drivers/clk/qcom/dispcc-sm8250.c
@@ -34,10 +34,14 @@ enum {
P_DSI1_PHY_PLL_OUT_DSICLK,
};
-static struct pll_vco vco_table[] = {
+static const struct pll_vco vco_table[] = {
{ 249600000, 2000000000, 0 },
};
+static const struct pll_vco lucid_5lpe_vco[] = {
+ { 249600000, 1750000000, 0 },
+};
+
static struct alpha_pll_config disp_cc_pll0_config = {
.l = 0x47,
.alpha = 0xE000,
@@ -1222,6 +1226,7 @@ static const struct of_device_id disp_cc_sm8250_match_table[] = {
{ .compatible = "qcom,sc8180x-dispcc" },
{ .compatible = "qcom,sm8150-dispcc" },
{ .compatible = "qcom,sm8250-dispcc" },
+ { .compatible = "qcom,sm8350-dispcc" },
{ }
};
MODULE_DEVICE_TABLE(of, disp_cc_sm8250_match_table);
@@ -1234,20 +1239,10 @@ static int disp_cc_sm8250_probe(struct platform_device *pdev)
if (IS_ERR(regmap))
return PTR_ERR(regmap);
- /* note: trion == lucid, except for the prepare() op */
- BUILD_BUG_ON(CLK_ALPHA_PLL_TYPE_TRION != CLK_ALPHA_PLL_TYPE_LUCID);
- if (of_device_is_compatible(pdev->dev.of_node, "qcom,sc8180x-dispcc") ||
- of_device_is_compatible(pdev->dev.of_node, "qcom,sm8150-dispcc")) {
- disp_cc_pll0_config.config_ctl_hi_val = 0x00002267;
- disp_cc_pll0_config.config_ctl_hi1_val = 0x00000024;
- disp_cc_pll0_config.user_ctl_hi1_val = 0x000000D0;
- disp_cc_pll0_init.ops = &clk_alpha_pll_trion_ops;
- disp_cc_pll1_config.config_ctl_hi_val = 0x00002267;
- disp_cc_pll1_config.config_ctl_hi1_val = 0x00000024;
- disp_cc_pll1_config.user_ctl_hi1_val = 0x000000D0;
- disp_cc_pll1_init.ops = &clk_alpha_pll_trion_ops;
- }
-
+ /* sm8350 note: downstream has a clk_lucid_5lpe_pll_configure, which
+ * does not write the PLL_UPDATE_BYPASS bit in PLL_MODE.
+ * It should not hurt sm8350 to have this extra write.
+ */
clk_lucid_pll_configure(&disp_cc_pll0, regmap, &disp_cc_pll0_config);
clk_lucid_pll_configure(&disp_cc_pll1, regmap, &disp_cc_pll1_config);
@@ -1268,8 +1263,86 @@ static struct platform_driver disp_cc_sm8250_driver = {
},
};
+static struct clk_rcg2 * const __initconst disp_cc_sm8250_rcgs[] = {
+ &disp_cc_mdss_byte0_clk_src,
+ &disp_cc_mdss_byte1_clk_src,
+ &disp_cc_mdss_dp_aux1_clk_src,
+ &disp_cc_mdss_dp_aux_clk_src,
+ &disp_cc_mdss_dp_link1_clk_src,
+ &disp_cc_mdss_dp_link_clk_src,
+ &disp_cc_mdss_dp_pixel1_clk_src,
+ &disp_cc_mdss_dp_pixel2_clk_src,
+ &disp_cc_mdss_dp_pixel_clk_src,
+ &disp_cc_mdss_edp_aux_clk_src,
+ &disp_cc_mdss_edp_gtc_clk_src,
+ &disp_cc_mdss_edp_link_clk_src,
+ &disp_cc_mdss_edp_pixel_clk_src,
+ &disp_cc_mdss_esc0_clk_src,
+ &disp_cc_mdss_mdp_clk_src,
+ &disp_cc_mdss_pclk0_clk_src,
+ &disp_cc_mdss_pclk1_clk_src,
+ &disp_cc_mdss_rot_clk_src,
+ &disp_cc_mdss_vsync_clk_src,
+ &disp_cc_mdss_ahb_clk_src,
+};
+
+static struct clk_regmap_div * const __initconst disp_cc_sm8250_divs[] = {
+ &disp_cc_mdss_byte0_div_clk_src,
+ &disp_cc_mdss_byte1_div_clk_src,
+ &disp_cc_mdss_dp_link1_div_clk_src,
+ &disp_cc_mdss_dp_link_div_clk_src,
+};
+
+static bool __init disp_cc_is_compatible(const char *compatible)
+{
+ struct device_node *node = of_find_compatible_node(NULL, NULL, compatible);
+
+ of_node_put(node);
+ return node != NULL;
+}
+
static int __init disp_cc_sm8250_init(void)
{
+ if (disp_cc_is_compatible("qcom,sm8150-dispcc") ||
+ disp_cc_is_compatible("qcom,sc8180x-dispcc")) {
+ BUILD_BUG_ON(CLK_ALPHA_PLL_TYPE_TRION != CLK_ALPHA_PLL_TYPE_LUCID);
+ disp_cc_pll0_config.config_ctl_hi_val = 0x00002267;
+ disp_cc_pll0_config.config_ctl_hi1_val = 0x00000024;
+ disp_cc_pll0_config.user_ctl_hi1_val = 0x000000d0;
+ disp_cc_pll0_init.ops = &clk_alpha_pll_trion_ops;
+ disp_cc_pll1_config.config_ctl_hi_val = 0x00002267;
+ disp_cc_pll1_config.config_ctl_hi1_val = 0x00000024;
+ disp_cc_pll1_config.user_ctl_hi1_val = 0x000000d0;
+ disp_cc_pll1_init.ops = &clk_alpha_pll_trion_ops;
+ } else if (disp_cc_is_compatible("qcom,sm8350-dispcc")) {
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(disp_cc_sm8250_rcgs); i++)
+ disp_cc_sm8250_rcgs[i]->cmd_rcgr -= 4;
+
+ for (i = 0; i < ARRAY_SIZE(disp_cc_sm8250_divs); i++) {
+ disp_cc_sm8250_divs[i]->reg -= 4;
+ disp_cc_sm8250_divs[i]->width = 4;
+ }
+
+ disp_cc_mdss_ahb_clk.halt_reg -= 4;
+ disp_cc_mdss_ahb_clk.clkr.enable_reg -= 4;
+
+ disp_cc_mdss_ahb_clk_src.cmd_rcgr = 0x22a0;
+
+ disp_cc_pll0_config.config_ctl_hi1_val = 0x2a9a699c;
+ disp_cc_pll0_config.test_ctl_hi1_val = 0x01800000;
+ disp_cc_pll0_init.ops = &clk_alpha_pll_lucid_5lpe_ops;
+ disp_cc_pll0.vco_table = lucid_5lpe_vco;
+ disp_cc_pll1_config.config_ctl_hi1_val = 0x2a9a699c;
+ disp_cc_pll1_config.test_ctl_hi1_val = 0x01800000;
+ disp_cc_pll1_init.ops = &clk_alpha_pll_lucid_5lpe_ops;
+ disp_cc_pll1.vco_table = lucid_5lpe_vco;
+
+ disp_cc_sm8250_clocks[DISP_CC_MDSS_EDP_GTC_CLK] = NULL;
+ disp_cc_sm8250_clocks[DISP_CC_MDSS_EDP_GTC_CLK_SRC] = NULL;
+ }
+
return platform_driver_register(&disp_cc_sm8250_driver);
}
subsys_initcall(disp_cc_sm8250_init);
--
2.26.1
Add sm8350 DISPCC bindings, which are simply a symlink to the sm8250
bindings. Update the documentation with the new compatible.
Signed-off-by: Jonathan Marek <[email protected]>
Reviewed-by: Rob Herring <[email protected]>
---
.../devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml | 6 ++++--
include/dt-bindings/clock/qcom,dispcc-sm8350.h | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
create mode 120000 include/dt-bindings/clock/qcom,dispcc-sm8350.h
diff --git a/Documentation/devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml b/Documentation/devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml
index 0cdf53f41f84..8f414642445e 100644
--- a/Documentation/devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml
+++ b/Documentation/devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml
@@ -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/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:
diff --git a/include/dt-bindings/clock/qcom,dispcc-sm8350.h b/include/dt-bindings/clock/qcom,dispcc-sm8350.h
new file mode 120000
index 000000000000..0312b4544acb
--- /dev/null
+++ b/include/dt-bindings/clock/qcom,dispcc-sm8350.h
@@ -0,0 +1 @@
+qcom,dispcc-sm8250.h
\ No newline at end of file
--
2.26.1
Hey Jonathan,
On Tue, 8 Jun 2021 at 16:29, Jonathan Marek <[email protected]> wrote:
>
> Add support to the SM8350 display clock controller by extending the SM8250
> display clock controller, which is almost identical but has some minor
> differences.
>
> Signed-off-by: Jonathan Marek <[email protected]>
> ---
> v3:
> - added const to vco tables
> - moved clk rcgs/div list to global scope
> - patching clks on module init instead of probe
> - lowercase hex
> - update configure comment
> - rebased on added edp clocks
>
> drivers/clk/qcom/Kconfig | 4 +-
> drivers/clk/qcom/dispcc-sm8250.c | 103 ++++++++++++++++++++++++++-----
> 2 files changed, 90 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig
> index 45646b867cdb..cc60e6ee1654 100644
> --- a/drivers/clk/qcom/Kconfig
> +++ b/drivers/clk/qcom/Kconfig
> @@ -484,11 +484,11 @@ config SDX_GCC_55
> SPI, I2C, USB, SD/UFS, PCIe etc.
>
> config SM_DISPCC_8250
> - tristate "SM8150 and SM8250 Display Clock Controller"
> + tristate "SM8150/SM8250/SM8350 Display Clock Controller"
> depends on SM_GCC_8150 || SM_GCC_8250
> help
> Support for the display clock controller on Qualcomm Technologies, Inc
> - SM8150 and SM8250 devices.
> + SM8150/SM8250/SM8350 devices.
> Say Y if you want to support display devices and functionality such as
> splash screen.
>
> diff --git a/drivers/clk/qcom/dispcc-sm8250.c b/drivers/clk/qcom/dispcc-sm8250.c
> index 601c7c0ba483..86c474a51cd2 100644
> --- a/drivers/clk/qcom/dispcc-sm8250.c
> +++ b/drivers/clk/qcom/dispcc-sm8250.c
> @@ -34,10 +34,14 @@ enum {
> P_DSI1_PHY_PLL_OUT_DSICLK,
> };
>
> -static struct pll_vco vco_table[] = {
> +static const struct pll_vco vco_table[] = {
> { 249600000, 2000000000, 0 },
> };
>
> +static const struct pll_vco lucid_5lpe_vco[] = {
> + { 249600000, 1750000000, 0 },
> +};
> +
> static struct alpha_pll_config disp_cc_pll0_config = {
> .l = 0x47,
> .alpha = 0xE000,
> @@ -1222,6 +1226,7 @@ static const struct of_device_id disp_cc_sm8250_match_table[] = {
> { .compatible = "qcom,sc8180x-dispcc" },
> { .compatible = "qcom,sm8150-dispcc" },
> { .compatible = "qcom,sm8250-dispcc" },
> + { .compatible = "qcom,sm8350-dispcc" },
> { }
> };
> MODULE_DEVICE_TABLE(of, disp_cc_sm8250_match_table);
> @@ -1234,20 +1239,10 @@ static int disp_cc_sm8250_probe(struct platform_device *pdev)
> if (IS_ERR(regmap))
> return PTR_ERR(regmap);
>
> - /* note: trion == lucid, except for the prepare() op */
> - BUILD_BUG_ON(CLK_ALPHA_PLL_TYPE_TRION != CLK_ALPHA_PLL_TYPE_LUCID);
> - if (of_device_is_compatible(pdev->dev.of_node, "qcom,sc8180x-dispcc") ||
> - of_device_is_compatible(pdev->dev.of_node, "qcom,sm8150-dispcc")) {
> - disp_cc_pll0_config.config_ctl_hi_val = 0x00002267;
> - disp_cc_pll0_config.config_ctl_hi1_val = 0x00000024;
> - disp_cc_pll0_config.user_ctl_hi1_val = 0x000000D0;
> - disp_cc_pll0_init.ops = &clk_alpha_pll_trion_ops;
> - disp_cc_pll1_config.config_ctl_hi_val = 0x00002267;
> - disp_cc_pll1_config.config_ctl_hi1_val = 0x00000024;
> - disp_cc_pll1_config.user_ctl_hi1_val = 0x000000D0;
> - disp_cc_pll1_init.ops = &clk_alpha_pll_trion_ops;
> - }
> -
> + /* sm8350 note: downstream has a clk_lucid_5lpe_pll_configure, which
> + * does not write the PLL_UPDATE_BYPASS bit in PLL_MODE.
> + * It should not hurt sm8350 to have this extra write.
> + */
> clk_lucid_pll_configure(&disp_cc_pll0, regmap, &disp_cc_pll0_config);
> clk_lucid_pll_configure(&disp_cc_pll1, regmap, &disp_cc_pll1_config);
>
> @@ -1268,8 +1263,86 @@ static struct platform_driver disp_cc_sm8250_driver = {
> },
> };
>
> +static struct clk_rcg2 * const __initconst disp_cc_sm8250_rcgs[] = {
> + &disp_cc_mdss_byte0_clk_src,
> + &disp_cc_mdss_byte1_clk_src,
> + &disp_cc_mdss_dp_aux1_clk_src,
> + &disp_cc_mdss_dp_aux_clk_src,
> + &disp_cc_mdss_dp_link1_clk_src,
> + &disp_cc_mdss_dp_link_clk_src,
> + &disp_cc_mdss_dp_pixel1_clk_src,
> + &disp_cc_mdss_dp_pixel2_clk_src,
> + &disp_cc_mdss_dp_pixel_clk_src,
> + &disp_cc_mdss_edp_aux_clk_src,
> + &disp_cc_mdss_edp_gtc_clk_src,
> + &disp_cc_mdss_edp_link_clk_src,
> + &disp_cc_mdss_edp_pixel_clk_src,
> + &disp_cc_mdss_esc0_clk_src,
> + &disp_cc_mdss_mdp_clk_src,
> + &disp_cc_mdss_pclk0_clk_src,
> + &disp_cc_mdss_pclk1_clk_src,
> + &disp_cc_mdss_rot_clk_src,
> + &disp_cc_mdss_vsync_clk_src,
> + &disp_cc_mdss_ahb_clk_src,
> +};
> +
> +static struct clk_regmap_div * const __initconst disp_cc_sm8250_divs[] = {
> + &disp_cc_mdss_byte0_div_clk_src,
> + &disp_cc_mdss_byte1_div_clk_src,
> + &disp_cc_mdss_dp_link1_div_clk_src,
> + &disp_cc_mdss_dp_link_div_clk_src,
> +};
> +
> +static bool __init disp_cc_is_compatible(const char *compatible)
> +{
> + struct device_node *node = of_find_compatible_node(NULL, NULL, compatible);
> +
> + of_node_put(node);
> + return node != NULL;
> +}
checkpatch --struct is unhappy with the above comparison. I think it
can be removed.
> +
> static int __init disp_cc_sm8250_init(void)
> {
> + if (disp_cc_is_compatible("qcom,sm8150-dispcc") ||
> + disp_cc_is_compatible("qcom,sc8180x-dispcc")) {
> + BUILD_BUG_ON(CLK_ALPHA_PLL_TYPE_TRION != CLK_ALPHA_PLL_TYPE_LUCID);
> + disp_cc_pll0_config.config_ctl_hi_val = 0x00002267;
> + disp_cc_pll0_config.config_ctl_hi1_val = 0x00000024;
> + disp_cc_pll0_config.user_ctl_hi1_val = 0x000000d0;
> + disp_cc_pll0_init.ops = &clk_alpha_pll_trion_ops;
> + disp_cc_pll1_config.config_ctl_hi_val = 0x00002267;
> + disp_cc_pll1_config.config_ctl_hi1_val = 0x00000024;
> + disp_cc_pll1_config.user_ctl_hi1_val = 0x000000d0;
> + disp_cc_pll1_init.ops = &clk_alpha_pll_trion_ops;
> + } else if (disp_cc_is_compatible("qcom,sm8350-dispcc")) {
> + unsigned int i;
> +
> + for (i = 0; i < ARRAY_SIZE(disp_cc_sm8250_rcgs); i++)
> + disp_cc_sm8250_rcgs[i]->cmd_rcgr -= 4;
> +
> + for (i = 0; i < ARRAY_SIZE(disp_cc_sm8250_divs); i++) {
> + disp_cc_sm8250_divs[i]->reg -= 4;
> + disp_cc_sm8250_divs[i]->width = 4;
> + }
> +
> + disp_cc_mdss_ahb_clk.halt_reg -= 4;
> + disp_cc_mdss_ahb_clk.clkr.enable_reg -= 4;
> +
> + disp_cc_mdss_ahb_clk_src.cmd_rcgr = 0x22a0;
> +
> + disp_cc_pll0_config.config_ctl_hi1_val = 0x2a9a699c;
> + disp_cc_pll0_config.test_ctl_hi1_val = 0x01800000;
> + disp_cc_pll0_init.ops = &clk_alpha_pll_lucid_5lpe_ops;
> + disp_cc_pll0.vco_table = lucid_5lpe_vco;
> + disp_cc_pll1_config.config_ctl_hi1_val = 0x2a9a699c;
> + disp_cc_pll1_config.test_ctl_hi1_val = 0x01800000;
> + disp_cc_pll1_init.ops = &clk_alpha_pll_lucid_5lpe_ops;
> + disp_cc_pll1.vco_table = lucid_5lpe_vco;
> +
> + disp_cc_sm8250_clocks[DISP_CC_MDSS_EDP_GTC_CLK] = NULL;
> + disp_cc_sm8250_clocks[DISP_CC_MDSS_EDP_GTC_CLK_SRC] = NULL;
> + }
> +
> return platform_driver_register(&disp_cc_sm8250_driver);
> }
> subsys_initcall(disp_cc_sm8250_init);
With the above issue addressed, lgtm.
Reviewed-by: Robert Foss <[email protected]>