| Message ID | 20210511041719.591969-1-bjorn.andersson@linaro.org |
|---|---|
| State | Accepted |
| Commit | 8ff48c82df66bf8864070922b9d7ddcfd8ab2918 |
| Headers | show |
| Series | [1/2] clk: qcom: dispcc-sm8250: Add sc8180x support | expand |
On Mon, 10 May 2021 23:17:18 -0500, Bjorn Andersson wrote: > The display clock controller in SC8180x is reused from SM8150, so add > the necessary compatible and wire up the driver to enable this. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > --- > .../devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml | 1 + > drivers/clk/qcom/dispcc-sm8250.c | 4 +++- > 2 files changed, 4 insertions(+), 1 deletion(-) > Acked-by: Rob Herring <robh@kernel.org>
Quoting Bjorn Andersson (2021-05-10 21:17:18) > The display clock controller in SC8180x is reused from SM8150, so add > the necessary compatible and wire up the driver to enable this. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > --- Applied to clk-next
diff --git a/Documentation/devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml b/Documentation/devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml index 0cdf53f41f84..6667261dc665 100644 --- a/Documentation/devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml @@ -20,6 +20,7 @@ description: | properties: compatible: enum: + - qcom,sc8180x-dispcc - qcom,sm8150-dispcc - qcom,sm8250-dispcc diff --git a/drivers/clk/qcom/dispcc-sm8250.c b/drivers/clk/qcom/dispcc-sm8250.c index de09cd5c209f..12ef6f1d5c62 100644 --- a/drivers/clk/qcom/dispcc-sm8250.c +++ b/drivers/clk/qcom/dispcc-sm8250.c @@ -1037,6 +1037,7 @@ static const struct qcom_cc_desc disp_cc_sm8250_desc = { }; static const struct of_device_id disp_cc_sm8250_match_table[] = { + { .compatible = "qcom,sc8180x-dispcc" }, { .compatible = "qcom,sm8150-dispcc" }, { .compatible = "qcom,sm8250-dispcc" }, { } @@ -1053,7 +1054,8 @@ static int disp_cc_sm8250_probe(struct platform_device *pdev) /* 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,sm8150-dispcc")) { + 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;
The display clock controller in SC8180x is reused from SM8150, so add the necessary compatible and wire up the driver to enable this. Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> --- .../devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml | 1 + drivers/clk/qcom/dispcc-sm8250.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- 2.29.2