clk: qcom: Fix parenting for dispcc/gpucc/videocc
Subsystems (6)
v3 cover clk: qcom: Fix parenting for dispcc/gpucc/videocc
The aim of this series is to get the dispcc and gpucc in a workable shape upstream for sc7180. I personally wasn't focusing on (and didn't test much) videocc but pulled it along for the ride.
Most of the work in this series deals with the fact that the parenting info for these clock controllers was in a bad shape. It looks like it was half transitioned from the old way of doing things (relying on global names) to the new way of doing things (putting the linkage in the device tree). This should fully transition us.
As part of this transition I update the sdm845.dtsi file to specify the info as per the new way of doing things. Although I've now put the linkage info in the sdm845.dtsi file, though, I haven't updated the sdm845 clock drivers in Linux so they still work via the global name matching. It's left as an exercise to the reader to update the sdm845 clock drivers in Linux.
This series passes these things for me on linux-next (next-20200129) after picking the recent gcc fix I posted [1]:
for f in \
Documentation/devicetree/bindings/clock/qcom,msm8998-gpucc.yaml \
Documentation/devicetree/bindings/clock/qcom,sc7180-dispcc.yaml \
Documentation/devicetree/bindings/clock/qcom,sc7180-gpucc.yaml \
Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml \
Documentation/devicetree/bindings/clock/qcom,sdm845-dispcc.yaml \
Documentation/devicetree/bindings/clock/qcom,sdm845-gpucc.yaml \
Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml; do \
ARCH=arm64 make dtbs_check DT_SCHEMA_FILES=$f; \
done I also tried this:
# Delete broken yaml:
rm Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml ARCH=arm64 make dt_binding_check | grep 'clock/qcom'
...and that didn't seem to indicate problems.
I also tried this (make sure you don't run w/ -j64 or diff is hard):
# Delete broken yaml:
rm Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml git checkout beforeMyCode
ARCH=arm64 make dt_binding_check > old.txt 2>&1
git checkout myCode
ARCH=arm64 make dt_binding_check > new.txt 2>&1
diff old.txt new.txt
...and that didn't seem to indicate problems.
I have confirmed that (with extra patches) the display/gpu come up on sc7180 and sdm845-cheza. You can find the top of my downstream tree at:
https://crrev.com/c/2017976/4
I have confirmed that sdm845-cheza display / GPU come up atop next-20200129, which is what this series is posted against.
Compared to v2, this series has quite a few changes. Mostly it's:
- Always split into multiple files (Stephen).
- Use internal names, not purist names (Taniya).
- I realized that I forgot to update the sc7180 video clock controller driver in v2.
- A few other misc cleanups / fixes, see each patch for details.
It feels like with this many patches there's very little chance I didn't do something stupid like make a tpyo or a paste-o paste-o, though I tried to cross-check as much as I could. I apologize in advance for the stupid things I did that I should have known better about.
[1] https://lore.kernel.org/r/20200129152458.v2.1.I4452dc951d7556ede422835268742b25a18b356b@changeid
Changes in v3:
- Add Matthias tag.
- Added include file to description.
- Added pointer to inlude file in description.
- Added videocc include file.
- Discovered / added new gcc input clock on sdm845.
- Everyone but msm8998 now uses internal QC names.
- Fixed typo grpahics => graphics
- Newly discovered gcc_disp_gpll0_div_clk_src added.
- Patch ("clk: qcom: Get rid of fallback...dispcc-sc7180") split out for v3.
- Patch ("clk: qcom: Get rid of the test...dispcc-sc7180") split out for v3.
- Patch ("clk: qcom: Get rid of the test...gpucc-sc7180") split out for v3.
- Patch ("clk: qcom: Get rid of the test...videocc-sc7180") new for v3.
- Patch ("clk: qcom: Use ARRAY_SIZE in dispcc-sc7180...") split out for v3.
- Patch ("clk: qcom: Use ARRAY_SIZE in gpucc-sc7180...") split out for v3.
- Patch ("clk: qcom: Use ARRAY_SIZE in videocc-sc7180...") new for v3.
- Split bindings into 3 files.
- Split sc7180 and sdm845 into two files.
- Split videocc bindings into 2 files.
- Switched names to internal QC names rather than logical ones.
- Unlike in v2, use internal name instead of purist name.
- Updated commit description.
Changes in v2:
- Added includes
- Changed various parent names to match bindings / driver
- Patch ("arm64: dts: qcom: sdm845: Add...dispcc") new for v2.
- Patch ("arm64: dts: qcom: sdm845: Add...gpucc") new for v2.
- Patch ("arm64: dts: qcom: sdm845: Add...videocc") new for v2.
- Patch ("clk: qcom: rcg2: Don't crash...") new for v2.
- Patch ("dt-bindings: clock: Cleanup qcom,videocc") new for v2.
- Patch ("dt-bindings: clock: Fix qcom,dispcc...") new for v2.
- Patch ("dt-bindings: clock: Fix qcom,gpucc...") new for v2.
Douglas Anderson (14):
clk: qcom: rcg2: Don't crash if our parent can't be found; return an
error
dt-bindings: clock: Fix qcom,dispcc bindings for sdm845/sc7180
arm64: dts: qcom: sdm845: Add the missing clocks on the dispcc
clk: qcom: Get rid of fallback global names for dispcc-sc7180
clk: qcom: Get rid of the test clock for dispcc-sc7180
clk: qcom: Use ARRAY_SIZE in dispcc-sc7180 for parent clocks
dt-bindings: clock: Fix qcom,gpucc bindings for sdm845/sc7180/msm8998
arm64: dts: qcom: sdm845: Add missing clocks / fix names on the gpucc
clk: qcom: Get rid of the test clock for gpucc-sc7180
clk: qcom: Use ARRAY_SIZE in gpucc-sc7180 for parent clocks
dt-bindings: clock: Cleanup qcom,videocc bindings for sdm845/sc7180
clk: qcom: Get rid of the test clock for videocc-sc7180
clk: qcom: Use ARRAY_SIZE in videocc-sc7180 for parent clocks
arm64: dts: qcom: sdm845: Add the missing clock on the videocc
Taniya Das (1):
arm64: dts: sc7180: Add clock controller nodes
.../devicetree/bindings/clock/qcom,gpucc.yaml | 72 --------------
...om,dispcc.yaml => qcom,msm8998-gpucc.yaml} | 33 +++----
.../bindings/clock/qcom,sc7180-dispcc.yaml | 84 ++++++++++++++++
.../bindings/clock/qcom,sc7180-gpucc.yaml | 72 ++++++++++++++
.../bindings/clock/qcom,sc7180-videocc.yaml | 63 ++++++++++++
.../bindings/clock/qcom,sdm845-dispcc.yaml | 99 +++++++++++++++++++
.../bindings/clock/qcom,sdm845-gpucc.yaml | 72 ++++++++++++++
...,videocc.yaml => qcom,sdm845-videocc.yaml} | 27 ++---
arch/arm64/boot/dts/qcom/sc7180.dtsi | 47 +++++++++
arch/arm64/boot/dts/qcom/sdm845.dtsi | 28 +++++-
drivers/clk/qcom/clk-rcg2.c | 3 +
drivers/clk/qcom/dispcc-sc7180.c | 45 +++------
drivers/clk/qcom/gpucc-sc7180.c | 4 +-
drivers/clk/qcom/videocc-sc7180.c | 4 +-
14 files changed, 513 insertions(+), 140 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/clock/qcom,gpucc.yaml
rename Documentation/devicetree/bindings/clock/{qcom,dispcc.yaml => qcom,msm8998-gpucc.yaml} (51%)
create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-dispcc.yaml
create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-gpucc.yaml
create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml
create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdm845-dispcc.yaml
create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdm845-gpucc.yaml
rename Documentation/devicetree/bindings/clock/{qcom,videocc.yaml => qcom,sdm845-videocc.yaml} (60%)Signature · 1 line
2.25.0.341.g760bfbb309-goog
PATCH v3 1/15 clk: qcom: rcg2: Don't crash if our parent can't be found; return an error
When I got my clock parenting slightly wrong I ended up with a crash that looked like this:
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 ... pc : clk_hw_get_rate+0x14/0x44 ... Call trace: clk_hw_get_rate+0x14/0x44 _freq_tbl_determine_rate+0x94/0xfc clk_rcg2_determine_rate+0x2c/0x38 clk_core_determine_round_nolock+0x4c/0x88 clk_core_round_rate_nolock+0x6c/0xa8 clk_core_round_rate_nolock+0x9c/0xa8 clk_core_set_rate_nolock+0x70/0x180 clk_set_rate+0x3c/0x6c of_clk_set_defaults+0x254/0x360 platform_drv_probe+0x28/0xb0 really_probe+0x120/0x2dc driver_probe_device+0x64/0xfc device_driver_attach+0x4c/0x6c __driver_attach+0xac/0xc0 bus_for_each_dev+0x84/0xcc driver_attach+0x2c/0x38 bus_add_driver+0xfc/0x1d0 driver_register+0x64/0xf8 __platform_driver_register+0x4c/0x58 msm_drm_register+0x5c/0x60 ...
It turned out that clk_hw_get_parent_by_index() was returning NULL and we weren't checking. Let's check it so that we don't crash.
---
I haven't gone back and tried to reproduce this same crash on older kernels, but I'll put the blame on commit ac269395cdd8 ("clk: qcom:
Convert to clk_hw based provider APIs"). Before that if we got a NULL parent back it was fine and dandy since a NULL "struct clk" is valid to use but a NULL "struct clk_hw" is not.
Changes in v3:
- Add Matthias tag.
Changes in v2:
- Patch ("clk: qcom: rcg2: Don't crash...") new for v2.
drivers/clk/qcom/clk-rcg2.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/clk/qcom/clk-rcg2.c +3 -0
@@ -218,6 +218,9 @@ static int _freq_tbl_determine_rate(struct clk_hw *hw, const struct freq_tbl *f, clk_flags =clk_hw_get_flags (hw); p =clk_hw_get_parent_by_index (hw, index); +if (!p) +return -EINVAL ; +if (clk_flags &CLK_SET_RATE_PARENT ) { rate = f->freq;if (f->pre_div) {
Signature · 1 line
2.25.0.341.g760bfbb309-goog
PATCH v3 2/15 dt-bindings: clock: Fix qcom,dispcc bindings for sdm845/sc7180
In reply to Douglas AndersonThe qcom,dispcc bindings had a few problems with them:
1. They didn't specify all the clocks that dispcc is a client of. Specifically on sc7180 there are two clocks from the DSI PHY and two from the DP PHY. On sdm845 there are actually two DSI PHYs (each of which has two clocks) and an extra clock from the gcc. These all need to be specified.
2. The sdm845.dtsi has existed for quite some time without specifying the clocks. The Linux driver was relying on global names to match things up. While we should transition things, it should be noted in the bindings.
3. The names used the bindings for "xo" and "gpll0" didn't match the names that QC used for these clocks internally and this was causing confusion / difficulty with their code generation tools. Switched to the internal names to simplify everyone's lives. It's not quite as clean in a purist sense but it should avoid headaches. This officially changes the binding, but that seems OK in this case.
Also note that I updated the example.
---
Changes in v3:
- Added include file to description.
- Discovered / added new gcc input clock on sdm845.
- Split sc7180 and sdm845 into two files.
- Switched names to internal QC names rather than logical ones.
- Updated commit description.
Changes in v2:
- Patch ("dt-bindings: clock: Fix qcom,dispcc...") new for v2.
.../bindings/clock/qcom,dispcc.yaml | 67 ------------- .../bindings/clock/qcom,sc7180-dispcc.yaml | 84 ++++++++++++++++ .../bindings/clock/qcom,sdm845-dispcc.yaml | 99 +++++++++++++++++++ 3 files changed, 183 insertions(+), 67 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/qcom,dispcc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-dispcc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdm845-dispcc.yaml
Documentation/devicetree/bindings/clock/qcom,dispcc.yaml deleted +0 -67
@@ -1,67 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/bindings/clock/qcom,dispcc.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Qualcomm Display Clock & Reset Controller Binding - -maintainers: - - Taniya Das <[email protected]> - -description: | - Qualcomm display clock control module which supports the clocks, resets and - power domains. - -properties: - compatible: - enum: - - qcom,sc7180-dispcc - - qcom,sdm845-dispcc - - clocks: - minItems: 1 - maxItems: 2 - items: - - description: Board XO source - - description: GPLL0 source from GCC - - clock-names: - items: - - const: xo - - const: gpll0 - - '#clock-cells': - const: 1 - - '#reset-cells': - const: 1 - - '#power-domain-cells': - const: 1 - - reg: - maxItems: 1 - -required: - - compatible - - reg - - clocks - - clock-names - - '#clock-cells' - - '#reset-cells' - - '#power-domain-cells' - -examples: - # Example of DISPCC with clock node properties for SDM845: - - | - clock-controller@af00000 { - compatible = "qcom,sdm845-dispcc"; - reg = <0xaf00000 0x10000>; - clocks = <&rpmhcc 0>, <&gcc 24>; - clock-names = "xo", "gpll0"; - #clock-cells = <1>; - #reset-cells = <1>; - #power-domain-cells = <1>; - }; -...
Documentation/devicetree/bindings/clock/qcom,sc7180-dispcc.yaml new file +84 -0
84 lines not on this page · raw message
Documentation/devicetree/bindings/clock/qcom,sdm845-dispcc.yaml new file +99 -0
99 lines not on this page · raw message
Signature · 1 line
2.25.0.341.g760bfbb309-goog
Re: [PATCH v3 02/15] dt-bindings: clock: Fix qcom,dispcc bindings for sdm845/sc7180
Quoted 37 lines · Douglas Anderson
The qcom,dispcc bindings had a few problems with them:
1. They didn't specify all the clocks that dispcc is a client of. Specifically on sc7180 there are two clocks from the DSI PHY and two from the DP PHY. On sdm845 there are actually two DSI PHYs (each of which has two clocks) and an extra clock from the gcc. These all need to be specified.
2. The
sdm845.dtsihas existed for quite some time without specifying the clocks. The Linux driver was relying on global names to match things up. While we should transition things, it should be noted in the bindings.3. The names used the bindings for "xo" and "gpll0" didn't match the names that QC used for these clocks internally and this was causing confusion / difficulty with their code generation tools. Switched to the internal names to simplify everyone's lives. It's not quite as clean in a purist sense but it should avoid headaches. This officially changes the binding, but that seems OK in this case.
Also note that I updated the example.
Fixes 5d28e44ba630 ("dt-bindings: clock: Add YAML schemas for the QCOM DISPCC clock bindings")Signed-off-by Douglas Anderson <[email protected]>---
Changes in v3:
- Added include file to description.
- Discovered / added new gcc input clock on sdm845.
- Split sc7180 and sdm845 into two files.
- Switched names to internal QC names rather than logical ones.
- Updated commit description.Changes in v2:
- Patch ("dt-bindings: clock: Fix qcom,dispcc...") new for v2.
Quoted 7 lines
.../bindings/clock/qcom,dispcc.yaml | 67 ------------- .../bindings/clock/qcom,sc7180-dispcc.yaml | 84 ++++++++++++++++ .../bindings/clock/qcom,sdm845-dispcc.yaml | 99 +++++++++++++++++++ 3 files changed, 183 insertions(+), 67 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/qcom,dispcc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-dispcc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdm845-dispcc.yaml
Other than the same $id problem,
PATCH v3 3/15 arm64: dts: qcom: sdm845: Add the missing clocks on the dispcc
In reply to Douglas AndersonWe're transitioning over to requiring the Qualcomm Display Clock Controller to specify all the input clocks. Let's add them for sdm845.
NOTES:
- Until the Linux driver for sdm845's dispcc is updated, these clocks will not actually be used in Linux. It will continue to use global clock names to match things up.
- Although the clocks from the DP PHY are required, the DP PHY isn't represented in the dts yet. Apparently the magic for this is just to use <0>.
---
Changes in v3:
- Newly discovered gcc_disp_gpll0_div_clk_src added.
- Unlike in v2, use internal name instead of purist name.
Changes in v2:
- Patch ("arm64: dts: qcom: sdm845: Add...dispcc") new for v2.
arch/arm64/boot/dts/qcom/sdm845.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
arch/arm64/boot/dts/qcom/sdm845.dtsi +18 -0
@@ -2933,6 +2933,24 @@ opp-200000000 { dispcc: clock-controller@af00000 { compatible = "qcom,sdm845-dispcc"; reg = <0 0x0af00000 0 0x10000>; + clocks = <&rpmhcc RPMH_CXO_CLK>, + <&gcc GCC_DISP_GPLL0_CLK_SRC>, + <&gcc GCC_DISP_GPLL0_DIV_CLK_SRC>, + <&dsi0_phy 0>, + <&dsi0_phy 1>, + <&dsi1_phy 0>, + <&dsi1_phy 1>, + <0>, + <0>; + clock-names = "bi_tcxo", + "gcc_disp_gpll0_clk_src", + "gcc_disp_gpll0_div_clk_src", + "dsi0_phy_pll_out_byteclk", + "dsi0_phy_pll_out_dsiclk", + "dsi1_phy_pll_out_byteclk", + "dsi1_phy_pll_out_dsiclk", + "dp_link_clk_divsel_ten", + "dp_vco_divided_clk_src_mux"; #clock-cells = <1>; #reset-cells = <1>; #power-domain-cells = <1>;
Signature · 1 line
2.25.0.341.g760bfbb309-goog
PATCH v3 4/15 clk: qcom: Get rid of fallback global names for dispcc-sc7180
In reply to Douglas AndersonIn the new world input clocks should be matched by ".fw_name". sc7180 is new enough that no backward compatibility use of global names should be needed. Remove it.
With a proper device tree and downstream display patches I have verified booting a sc7180 up and seeing the display after this patch.
---
Changes in v3:
- Patch ("clk: qcom: Get rid of fallback...dispcc-sc7180") split out for v3.
- Unlike in v2, use internal name instead of purist name.
Changes in v2: None
drivers/clk/qcom/dispcc-sc7180.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
drivers/clk/qcom/dispcc-sc7180.c +10 -13
@@ -81,7 +81,7 @@ static const struct parent_map disp_cc_parent_map_0[] = {static const struct clk_parent_data disp_cc_parent_data_0[] = { { .fw_name ="bi_tcxo" }, - { .fw_name ="core_bi_pll_test_se" , .name ="core_bi_pll_test_se" }, + { .fw_name ="core_bi_pll_test_se" }, };static const struct parent_map disp_cc_parent_map_1[] = {
@@ -93,10 +93,9 @@ static const struct parent_map disp_cc_parent_map_1[] = {static const struct clk_parent_data disp_cc_parent_data_1[] = { { .fw_name ="bi_tcxo" }, - { .fw_name ="dp_phy_pll_link_clk" , .name ="dp_phy_pll_link_clk" }, - { .fw_name ="dp_phy_pll_vco_div_clk" , - .name ="dp_phy_pll_vco_div_clk" }, - { .fw_name ="core_bi_pll_test_se" , .name ="core_bi_pll_test_se" }, + { .fw_name ="dp_phy_pll_link_clk" }, + { .fw_name ="dp_phy_pll_vco_div_clk" }, + { .fw_name ="core_bi_pll_test_se" }, };static const struct parent_map disp_cc_parent_map_2[] = {
@@ -107,9 +106,8 @@ static const struct parent_map disp_cc_parent_map_2[] = {static const struct clk_parent_data disp_cc_parent_data_2[] = { { .fw_name ="bi_tcxo" }, - { .fw_name ="dsi0_phy_pll_out_byteclk" , - .name ="dsi0_phy_pll_out_byteclk" }, - { .fw_name ="core_bi_pll_test_se" , .name ="core_bi_pll_test_se" }, + { .fw_name ="dsi0_phy_pll_out_byteclk" }, + { .fw_name ="core_bi_pll_test_se" }, };static const struct parent_map disp_cc_parent_map_3[] = {
@@ -125,7 +123,7 @@ static const struct clk_parent_data disp_cc_parent_data_3[] = { { .hw = &disp_cc_pll0.clkr.hw }, { .fw_name = "gcc_disp_gpll0_clk_src" }, { .hw = &disp_cc_pll0_out_even.clkr.hw }, - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" }, + { .fw_name = "core_bi_pll_test_se" }, }; static const struct parent_map disp_cc_parent_map_4[] = {
@@ -137,7 +135,7 @@ static const struct parent_map disp_cc_parent_map_4[] = {static const struct clk_parent_data disp_cc_parent_data_4[] = { { .fw_name ="bi_tcxo" }, { .fw_name ="gcc_disp_gpll0_clk_src" }, - { .fw_name ="core_bi_pll_test_se" , .name ="core_bi_pll_test_se" }, + { .fw_name ="core_bi_pll_test_se" }, };static const struct parent_map disp_cc_parent_map_5[] = {
@@ -148,9 +146,8 @@ static const struct parent_map disp_cc_parent_map_5[] = {static const struct clk_parent_data disp_cc_parent_data_5[] = { { .fw_name ="bi_tcxo" }, - { .fw_name ="dsi0_phy_pll_out_dsiclk" , - .name ="dsi0_phy_pll_out_dsiclk" }, - { .fw_name ="core_bi_pll_test_se" , .name ="core_bi_pll_test_se" }, + { .fw_name ="dsi0_phy_pll_out_dsiclk" }, + { .fw_name ="core_bi_pll_test_se" }, };static const struct freq_tbl ftbl_disp_cc_mdss_ahb_clk_src[] = {
Signature · 1 line
2.25.0.341.g760bfbb309-goog
PATCH v3 5/15 clk: qcom: Get rid of the test clock for dispcc-sc7180
In reply to Douglas AndersonThe test clock isn't in the bindings and apparently it's not used by anyone upstream. Remove it.
---
Changes in v3:
- Patch ("clk: qcom: Get rid of the test...dispcc-sc7180") split out for v3.
Changes in v2: None
drivers/clk/qcom/dispcc-sc7180.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-)
drivers/clk/qcom/dispcc-sc7180.c +10 -22
@@ -76,38 +76,32 @@ static struct clk_alpha_pll_postdiv disp_cc_pll0_out_even = {static const struct parent_map disp_cc_parent_map_0[] = { {P_BI_TCXO ,0 }, - {P_CORE_BI_PLL_TEST_SE ,7 }, };static const struct clk_parent_data disp_cc_parent_data_0[] = { { .fw_name ="bi_tcxo" }, - { .fw_name ="core_bi_pll_test_se" }, };static const struct parent_map disp_cc_parent_map_1[] = { {P_BI_TCXO ,0 }, {P_DP_PHY_PLL_LINK_CLK ,1 }, {P_DP_PHY_PLL_VCO_DIV_CLK ,2 }, - {P_CORE_BI_PLL_TEST_SE ,7 }, };static const struct clk_parent_data disp_cc_parent_data_1[] = { { .fw_name ="bi_tcxo" }, { .fw_name ="dp_phy_pll_link_clk" }, { .fw_name ="dp_phy_pll_vco_div_clk" }, - { .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_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 ="core_bi_pll_test_se" }, };static const struct parent_map disp_cc_parent_map_3[] = {
@@ -115,7 +109,6 @@ static const struct parent_map disp_cc_parent_map_3[] = { { P_DISP_CC_PLL0_OUT_MAIN, 1 }, { P_GPLL0_OUT_MAIN, 4 }, { P_DISP_CC_PLL0_OUT_EVEN, 5 }, - { P_CORE_BI_PLL_TEST_SE, 7 }, }; static const struct clk_parent_data disp_cc_parent_data_3[] = {
@@ -123,31 +116,26 @@ static const struct clk_parent_data disp_cc_parent_data_3[] = { { .hw = &disp_cc_pll0.clkr.hw }, { .fw_name = "gcc_disp_gpll0_clk_src" }, { .hw = &disp_cc_pll0_out_even.clkr.hw }, - { .fw_name = "core_bi_pll_test_se" }, };static const struct parent_map disp_cc_parent_map_4[] = { {P_BI_TCXO ,0 }, {P_GPLL0_OUT_MAIN ,4 }, - {P_CORE_BI_PLL_TEST_SE ,7 }, };static const struct clk_parent_data disp_cc_parent_data_4[] = { { .fw_name ="bi_tcxo" }, { .fw_name ="gcc_disp_gpll0_clk_src" }, - { .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_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 ="core_bi_pll_test_se" }, }; static const struct freq_tbl ftbl_disp_cc_mdss_ahb_clk_src[] = {
@@ -166,7 +154,7 @@ static struct clk_rcg2 disp_cc_mdss_ahb_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="disp_cc_mdss_ahb_clk_src" , .parent_data = disp_cc_parent_data_4, - .num_parents =3 , + .num_parents =2 , .flags =CLK_SET_RATE_PARENT , .ops = &clk_rcg2_shared_ops, },
@@ -180,7 +168,7 @@ static struct clk_rcg2 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 =3 , + .num_parents =2 , .flags =CLK_SET_RATE_PARENT , .ops = &clk_byte2_ops, },
@@ -213,7 +201,7 @@ static struct clk_rcg2 disp_cc_mdss_dp_crypto_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="disp_cc_mdss_dp_crypto_clk_src" , .parent_data = disp_cc_parent_data_1, - .num_parents =4 , + .num_parents =3 , .flags =CLK_SET_RATE_PARENT , .ops = &clk_byte2_ops, },
@@ -227,7 +215,7 @@ static struct clk_rcg2 disp_cc_mdss_dp_link_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="disp_cc_mdss_dp_link_clk_src" , .parent_data = disp_cc_parent_data_1, - .num_parents =4 , + .num_parents =3 , .flags =CLK_SET_RATE_PARENT , .ops = &clk_byte2_ops, },
@@ -241,7 +229,7 @@ static struct clk_rcg2 disp_cc_mdss_dp_pixel_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="disp_cc_mdss_dp_pixel_clk_src" , .parent_data = disp_cc_parent_data_1, - .num_parents =4 , + .num_parents =3 , .flags =CLK_SET_RATE_PARENT , .ops = &clk_dp_ops, },
@@ -256,7 +244,7 @@ static struct clk_rcg2 disp_cc_mdss_esc0_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 =3 , + .num_parents =2 , .ops = &clk_rcg2_ops, }, };
@@ -279,7 +267,7 @@ static struct clk_rcg2 disp_cc_mdss_mdp_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="disp_cc_mdss_mdp_clk_src" , .parent_data = disp_cc_parent_data_3, - .num_parents =5 , + .num_parents =4 , .ops = &clk_rcg2_shared_ops, }, };
@@ -292,7 +280,7 @@ static struct clk_rcg2 disp_cc_mdss_pclk0_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 =3 , + .num_parents =2 , .flags =CLK_SET_RATE_PARENT , .ops = &clk_pixel_ops, },
@@ -307,7 +295,7 @@ static struct clk_rcg2 disp_cc_mdss_rot_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="disp_cc_mdss_rot_clk_src" , .parent_data = disp_cc_parent_data_3, - .num_parents =5 , + .num_parents =4 , .ops = &clk_rcg2_shared_ops, }, };
@@ -321,7 +309,7 @@ static struct clk_rcg2 disp_cc_mdss_vsync_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="disp_cc_mdss_vsync_clk_src" , .parent_data = disp_cc_parent_data_0, - .num_parents =2 , + .num_parents =1 , .ops = &clk_rcg2_shared_ops, }, };
Signature · 1 line
2.25.0.341.g760bfbb309-goog
PATCH v3 6/15 clk: qcom: Use ARRAY_SIZE in dispcc-sc7180 for parent clocks
In reply to Douglas AndersonIt's nicer to use ARRAY_SIZE instead of hardcoding. Had we always been doing this it would have prevented a previous bug. See commit 74c31ff9c84a ("clk: qcom: gpu_cc_gmu_clk_src has 5 parents, not 6").
---
Changes in v3:
- Patch ("clk: qcom: Use ARRAY_SIZE in dispcc-sc7180...") split out for v3.
Changes in v2: None
drivers/clk/qcom/dispcc-sc7180.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/clk/qcom/dispcc-sc7180.c +11 -11
@@ -154,7 +154,7 @@ static struct clk_rcg2 disp_cc_mdss_ahb_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="disp_cc_mdss_ahb_clk_src" , .parent_data = disp_cc_parent_data_4, - .num_parents =2 , + .num_parents =ARRAY_SIZE (disp_cc_parent_data_4), .flags =CLK_SET_RATE_PARENT , .ops = &clk_rcg2_shared_ops, },
@@ -168,7 +168,7 @@ static struct clk_rcg2 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 =2 , + .num_parents =ARRAY_SIZE (disp_cc_parent_data_2), .flags =CLK_SET_RATE_PARENT , .ops = &clk_byte2_ops, },
@@ -188,7 +188,7 @@ static struct clk_rcg2 disp_cc_mdss_dp_aux_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="disp_cc_mdss_dp_aux_clk_src" , .parent_data = disp_cc_parent_data_0, - .num_parents =2 , + .num_parents =ARRAY_SIZE (disp_cc_parent_data_0), .ops = &clk_rcg2_ops, }, };
@@ -201,7 +201,7 @@ static struct clk_rcg2 disp_cc_mdss_dp_crypto_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="disp_cc_mdss_dp_crypto_clk_src" , .parent_data = disp_cc_parent_data_1, - .num_parents =3 , + .num_parents =ARRAY_SIZE (disp_cc_parent_data_1), .flags =CLK_SET_RATE_PARENT , .ops = &clk_byte2_ops, },
@@ -215,7 +215,7 @@ static struct clk_rcg2 disp_cc_mdss_dp_link_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="disp_cc_mdss_dp_link_clk_src" , .parent_data = disp_cc_parent_data_1, - .num_parents =3 , + .num_parents =ARRAY_SIZE (disp_cc_parent_data_1), .flags =CLK_SET_RATE_PARENT , .ops = &clk_byte2_ops, },
@@ -229,7 +229,7 @@ static struct clk_rcg2 disp_cc_mdss_dp_pixel_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="disp_cc_mdss_dp_pixel_clk_src" , .parent_data = disp_cc_parent_data_1, - .num_parents =3 , + .num_parents =ARRAY_SIZE (disp_cc_parent_data_1), .flags =CLK_SET_RATE_PARENT , .ops = &clk_dp_ops, },
@@ -244,7 +244,7 @@ static struct clk_rcg2 disp_cc_mdss_esc0_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 =2 , + .num_parents =ARRAY_SIZE (disp_cc_parent_data_2), .ops = &clk_rcg2_ops, }, };
@@ -267,7 +267,7 @@ static struct clk_rcg2 disp_cc_mdss_mdp_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="disp_cc_mdss_mdp_clk_src" , .parent_data = disp_cc_parent_data_3, - .num_parents =4 , + .num_parents =ARRAY_SIZE (disp_cc_parent_data_3), .ops = &clk_rcg2_shared_ops, }, };
@@ -280,7 +280,7 @@ static struct clk_rcg2 disp_cc_mdss_pclk0_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 =2 , + .num_parents =ARRAY_SIZE (disp_cc_parent_data_5), .flags =CLK_SET_RATE_PARENT , .ops = &clk_pixel_ops, },
@@ -295,7 +295,7 @@ static struct clk_rcg2 disp_cc_mdss_rot_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="disp_cc_mdss_rot_clk_src" , .parent_data = disp_cc_parent_data_3, - .num_parents =4 , + .num_parents =ARRAY_SIZE (disp_cc_parent_data_3), .ops = &clk_rcg2_shared_ops, }, };
@@ -309,7 +309,7 @@ static struct clk_rcg2 disp_cc_mdss_vsync_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="disp_cc_mdss_vsync_clk_src" , .parent_data = disp_cc_parent_data_0, - .num_parents =1 , + .num_parents =ARRAY_SIZE (disp_cc_parent_data_0), .ops = &clk_rcg2_shared_ops, }, };
Signature · 1 line
2.25.0.341.g760bfbb309-goog
PATCH v3 7/15 dt-bindings: clock: Fix qcom,gpucc bindings for sdm845/sc7180/msm8998
In reply to Douglas AndersonThe qcom,gpucc bindings had a few problems with them:
1. When things were converted to yaml the name of the "gpll0 main" clock got changed from "gpll0" to "gpll0_main". Change it back for msm8998.
2. Apparently there is a push not to use purist aliases for clocks but instead to just use the internal Qualcomm names. For sdm845 and sc7180 (where the drivers haven't already been changed) move in this direction.
Things were also getting complicated harder to deal with by jamming several SoCs into one file. Splitting simplifies things.
---
Changes in v3:
- Added pointer to inlude file in description.
- Everyone but msm8998 now uses internal QC names.
- Fixed typo grpahics => graphics
- Split bindings into 3 files.
Changes in v2:
- Patch ("dt-bindings: clock: Fix qcom,gpucc...") new for v2.
.../devicetree/bindings/clock/qcom,gpucc.yaml | 72 ------------------- .../bindings/clock/qcom,msm8998-gpucc.yaml | 66 +++++++++++++++++ .../bindings/clock/qcom,sc7180-gpucc.yaml | 72 +++++++++++++++++++ .../bindings/clock/qcom,sdm845-gpucc.yaml | 72 +++++++++++++++++++ 4 files changed, 210 insertions(+), 72 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/qcom,gpucc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,msm8998-gpucc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-gpucc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdm845-gpucc.yaml
Documentation/devicetree/bindings/clock/qcom,gpucc.yaml deleted +0 -72
@@ -1,72 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/bindings/clock/qcom,gpucc.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Qualcomm Graphics Clock & Reset Controller Binding - -maintainers: - - Taniya Das <[email protected]> - -description: | - Qualcomm grpahics clock control module which supports the clocks, resets and - power domains. - -properties: - compatible: - enum: - - qcom,msm8998-gpucc - - qcom,sc7180-gpucc - - qcom,sdm845-gpucc - - clocks: - minItems: 1 - maxItems: 3 - items: - - description: Board XO source - - description: GPLL0 main branch source from GCC(gcc_gpu_gpll0_clk_src) - - description: GPLL0 div branch source from GCC(gcc_gpu_gpll0_div_clk_src) - - clock-names: - minItems: 1 - maxItems: 3 - items: - - const: xo - - const: gpll0_main - - const: gpll0_div - - '#clock-cells': - const: 1 - - '#reset-cells': - const: 1 - - '#power-domain-cells': - const: 1 - - reg: - maxItems: 1 - -required: - - compatible - - reg - - clocks - - clock-names - - '#clock-cells' - - '#reset-cells' - - '#power-domain-cells' - -examples: - # Example of GPUCC with clock node properties for SDM845: - - | - clock-controller@5090000 { - compatible = "qcom,sdm845-gpucc"; - reg = <0x5090000 0x9000>; - clocks = <&rpmhcc 0>, <&gcc 31>, <&gcc 32>; - clock-names = "xo", "gpll0_main", "gpll0_div"; - #clock-cells = <1>; - #reset-cells = <1>; - #power-domain-cells = <1>; - }; -...
Documentation/devicetree/bindings/clock/qcom,msm8998-gpucc.yaml new file +66 -0
66 lines not on this page · raw message
Documentation/devicetree/bindings/clock/qcom,sc7180-gpucc.yaml new file +72 -0
72 lines not on this page · raw message
Documentation/devicetree/bindings/clock/qcom,sdm845-gpucc.yaml new file +72 -0
72 lines not on this page · raw message
Signature · 1 line
2.25.0.341.g760bfbb309-goog
Rob Herring
maintainerRe: [PATCH v3 07/15] dt-bindings: clock: Fix qcom,gpucc bindings for sdm845/sc7180/msm8998
Quoted 28 lines · Douglas Anderson
The qcom,gpucc bindings had a few problems with them:
1. When things were converted to yaml the name of the "gpll0 main" clock got changed from "gpll0" to "
gpll0_main". Change it back for msm8998.2. Apparently there is a push not to use purist aliases for clocks but instead to just use the internal Qualcomm names. For sdm845 and sc7180 (where the drivers haven't already been changed) move in this direction.
Things were also getting complicated harder to deal with by jamming several SoCs into one file. Splitting simplifies things.
Fixes 5c6f3a36b913 ("dt-bindings: clock: Add YAML schemas for the QCOM GPUCC clock bindings")Signed-off-by Douglas Anderson <[email protected]>---
Changes in v3:
- Added pointer to inlude file in description.
- Everyone but msm8998 now uses internal QC names.
- Fixed typo grpahics => graphics
- Split bindings into 3 files.Changes in v2:
- Patch ("dt-bindings: clock: Fix qcom,gpucc...") new for v2.
Quoted 9 lines
.../devicetree/bindings/clock/qcom,gpucc.yaml | 72 ------------------- .../bindings/clock/qcom,msm8998-gpucc.yaml | 66 +++++++++++++++++ .../bindings/clock/qcom,sc7180-gpucc.yaml | 72 +++++++++++++++++++ .../bindings/clock/qcom,sdm845-gpucc.yaml | 72 +++++++++++++++++++ 4 files changed, 210 insertions(+), 72 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/qcom,gpucc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,msm8998-gpucc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-gpucc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdm845-gpucc.yaml
I'm not seeing any differences in sdm845 and sc7180. Do those really need to be separate? It doesn't have to be all combined or all separate.
Rob
Re: [PATCH v3 07/15] dt-bindings: clock: Fix qcom,gpucc bindings for sdm845/sc7180/msm8998
Hi,
Quoted 40 lines · Rob Herring
Quoted 28 lines · Douglas Anderson
The qcom,gpucc bindings had a few problems with them:
1. When things were converted to yaml the name of the "gpll0 main" clock got changed from "gpll0" to "
gpll0_main". Change it back for msm8998.2. Apparently there is a push not to use purist aliases for clocks but instead to just use the internal Qualcomm names. For sdm845 and sc7180 (where the drivers haven't already been changed) move in this direction.
Things were also getting complicated harder to deal with by jamming several SoCs into one file. Splitting simplifies things.
Fixes 5c6f3a36b913 ("dt-bindings: clock: Add YAML schemas for the QCOM GPUCC clock bindings")Signed-off-by Douglas Anderson <[email protected]>---
Changes in v3:
- Added pointer to inlude file in description.
- Everyone but msm8998 now uses internal QC names.
- Fixed typo grpahics => graphics
- Split bindings into 3 files.Changes in v2:
- Patch ("dt-bindings: clock: Fix qcom,gpucc...") new for v2.Quoted 9 lines
.../devicetree/bindings/clock/qcom,gpucc.yaml | 72 ------------------- .../bindings/clock/qcom,msm8998-gpucc.yaml | 66 +++++++++++++++++ .../bindings/clock/qcom,sc7180-gpucc.yaml | 72 +++++++++++++++++++ .../bindings/clock/qcom,sdm845-gpucc.yaml | 72 +++++++++++++++++++ 4 files changed, 210 insertions(+), 72 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/qcom,gpucc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,msm8998-gpucc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-gpucc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdm845-gpucc.yaml
Quoted 3 lines
I'm not seeing any differences in sdm845 and sc7180. Do those really need to be separate? It doesn't have to be all combined or all separate.
They are the same, other than pointing to a different #include file. I debated whether to put them in one file (arbitrarily named after one SoC or the other) or to put them in individual files. I got the impression from Stephen that he'd prefer them to be separate files even in the case that they were 99% identical, but I certainly could have misunderstood.
I'll do whatever you guys agree to. If you want them in one file I'll probably name it "qcom,sdm845-gpucc.yaml" just because that SoC is earlier, unless someone tells me otherwise.
-Doug
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v3 07/15] dt-bindings: clock: Fix qcom,gpucc bindings for sdm845/sc7180/msm8998
Hi,
Quoted 61 lines · Stephen Boyd
Quoting Doug Anderson (2020-01-31 08:48:37)
Quoted 54 lines
Hi,
Quoted 40 lines · Rob Herring
Quoted 28 lines · Douglas Anderson
The qcom,gpucc bindings had a few problems with them:
1. When things were converted to yaml the name of the "gpll0 main" clock got changed from "gpll0" to "
gpll0_main". Change it back for msm8998.2. Apparently there is a push not to use purist aliases for clocks but instead to just use the internal Qualcomm names. For sdm845 and sc7180 (where the drivers haven't already been changed) move in this direction.
Things were also getting complicated harder to deal with by jamming several SoCs into one file. Splitting simplifies things.
Fixes 5c6f3a36b913 ("dt-bindings: clock: Add YAML schemas for the QCOM GPUCC clock bindings")Signed-off-by Douglas Anderson <[email protected]>---
Changes in v3:
- Added pointer to inlude file in description.
- Everyone but msm8998 now uses internal QC names.
- Fixed typo grpahics => graphics
- Split bindings into 3 files.Changes in v2:
- Patch ("dt-bindings: clock: Fix qcom,gpucc...") new for v2.Quoted 9 lines
.../devicetree/bindings/clock/qcom,gpucc.yaml | 72 ------------------- .../bindings/clock/qcom,msm8998-gpucc.yaml | 66 +++++++++++++++++ .../bindings/clock/qcom,sc7180-gpucc.yaml | 72 +++++++++++++++++++ .../bindings/clock/qcom,sdm845-gpucc.yaml | 72 +++++++++++++++++++ 4 files changed, 210 insertions(+), 72 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/qcom,gpucc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,msm8998-gpucc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-gpucc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdm845-gpucc.yamlQuoted 3 lines
I'm not seeing any differences in sdm845 and sc7180. Do those really need to be separate? It doesn't have to be all combined or all separate.
They are the same, other than pointing to a different #include file. I debated whether to put them in one file (arbitrarily named after one SoC or the other) or to put them in individual files. I got the impression from Stephen that he'd prefer them to be separate files even in the case that they were 99% identical, but I certainly could have misunderstood.
Quoted 4 lines
I'll do whatever you guys agree to. If you want them in one file I'll probably name it "qcom,sdm845-gpucc.yaml" just because that SoC is earlier, unless someone tells me otherwise.
Quoted 5 lines
I'd prefer them to be split out and point at the include file so we know what numbers are valid. It provides clarity and helps avoid the back and forth of combining and splitting the files. We suffer the same problem on the driver side, and we've long given up trying to combine SoCs when they're otherwise fairly similar.
Thanks for clarifying! Rob: I hope it's OK that I've gone ahead and sent out v4 leaving this alone. I knew you were interested in getting the other bindings patch out sooner rather than later and I was hoping to get both series out together so I could context switch to a few other things early this week. Apologies if this was moving too fast...
-Doug
PATCH v3 8/15 arm64: dts: qcom: sdm845: Add missing clocks / fix names on the gpucc
In reply to Douglas AndersonWe're transitioning over to requiring the Qualcomm GPU Clock Controller to specify all the input clocks. Let's add them for sdm845.
As part of this we've decided that the xo clock should be referred to in the bindings as "bi_tcxo". Change the dts.
NOTE: Until the Linux driver for sdm845's gpucc is updated, these clocks will not actually be used in Linux. It will continue to use global clock names to match things up. Of course, Linux didn't use the old "xo" clock anyway.
---
Changes in v3:
- Unlike in v2, use internal name instead of purist name.
Changes in v2:
- Patch ("arm64: dts: qcom: sdm845: Add...gpucc") new for v2.
arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sdm845.dtsi +6 -2
@@ -1903,8 +1903,12 @@ gpucc: clock-controller@5090000 { #clock-cells = <1>; #reset-cells = <1>; #power-domain-cells = <1>; - clocks = <&rpmhcc RPMH_CXO_CLK>; - clock-names = "xo"; + clocks = <&rpmhcc RPMH_CXO_CLK>, + <&gcc GCC_GPU_GPLL0_CLK_SRC>, + <&gcc GCC_GPU_GPLL0_DIV_CLK_SRC>; + clock-names = "bi_tcxo", + "gcc_gpu_gpll0_clk_src", + "gcc_gpu_gpll0_div_clk_src"; }; stm@6002000 {
Signature · 1 line
2.25.0.341.g760bfbb309-goog
PATCH v3 9/15 clk: qcom: Get rid of the test clock for gpucc-sc7180
In reply to Douglas AndersonThe test clock isn't in the bindings and apparently it's not used by anyone upstream. Remove it.
---
Changes in v3:
- Patch ("clk: qcom: Get rid of the test...gpucc-sc7180") split out for v3.
Changes in v2: None
drivers/clk/qcom/gpucc-sc7180.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/clk/qcom/gpucc-sc7180.c +1 -3
@@ -60,7 +60,6 @@ static const struct parent_map gpu_cc_parent_map_0[] = { { P_GPU_CC_PLL1_OUT_MAIN, 3 }, { P_GPLL0_OUT_MAIN, 5 }, { P_GPLL0_OUT_MAIN_DIV, 6 }, - { P_CORE_BI_PLL_TEST_SE, 7 }, }; static const struct clk_parent_data gpu_cc_parent_data_0[] = {
@@ -68,7 +67,6 @@ static const struct clk_parent_data gpu_cc_parent_data_0[] = { { .hw = &gpu_cc_pll1.clkr.hw }, { .fw_name = "gcc_gpu_gpll0_clk_src" }, { .fw_name = "gcc_gpu_gpll0_div_clk_src" }, - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" }, }; static const struct freq_tbl ftbl_gpu_cc_gmu_clk_src[] = {
@@ -86,7 +84,7 @@ static struct clk_rcg2 gpu_cc_gmu_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="gpu_cc_gmu_clk_src" , .parent_data = gpu_cc_parent_data_0, - .num_parents =5 , + .num_parents =4 , .flags =CLK_SET_RATE_PARENT , .ops = &clk_rcg2_shared_ops, },
Signature · 1 line
2.25.0.341.g760bfbb309-goog
PATCH v3 10/15 clk: qcom: Use ARRAY_SIZE in gpucc-sc7180 for parent clocks
In reply to Douglas AndersonIt's nicer to use ARRAY_SIZE instead of hardcoding. Had we always been doing this it would have prevented a previous bug. See commit 74c31ff9c84a ("clk: qcom: gpu_cc_gmu_clk_src has 5 parents, not 6").
---
Changes in v3:
- Patch ("clk: qcom: Use ARRAY_SIZE in gpucc-sc7180...") split out for v3.
Changes in v2: None
drivers/clk/qcom/gpucc-sc7180.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/gpucc-sc7180.c +1 -1
@@ -84,7 +84,7 @@ static struct clk_rcg2 gpu_cc_gmu_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="gpu_cc_gmu_clk_src" , .parent_data = gpu_cc_parent_data_0, - .num_parents =4 , + .num_parents =ARRAY_SIZE (gpu_cc_parent_data_0), .flags =CLK_SET_RATE_PARENT , .ops = &clk_rcg2_shared_ops, },
Signature · 1 line
2.25.0.341.g760bfbb309-goog
PATCH v3 11/15 dt-bindings: clock: Cleanup qcom,videocc bindings for sdm845/sc7180
In reply to Douglas AndersonThis makes the qcom,videocc bindings match the recent changes to the dispcc and gpucc.
1. Switched to using "bi_tcxo" instead of "xo".
2. Adds a description for the XO clock. Not terribly important but nice if it cleanly matches its cousins.
3. Updates the example to use the symbolic name for the RPMH clock and also show that the real devices are currently using 2 address cells / size cells and fixes the spacing on the closing brace.
4. Split into 2 files. In this case they could probably share one file, but let's be consistent.
---
Changes in v3:
- Added include file to description.
- Split videocc bindings into 2 files.
- Unlike in v2, use internal name instead of purist name.
Changes in v2:
- Patch ("dt-bindings: clock: Cleanup qcom,videocc") new for v2.
.../bindings/clock/qcom,sc7180-videocc.yaml | 63 +++++++++++++++++++
...,videocc.yaml => qcom,sdm845-videocc.yaml} | 27 ++++----
2 files changed, 77 insertions(+), 13 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml
rename Documentation/devicetree/bindings/clock/{qcom,videocc.yaml => qcom,sdm845-videocc.yaml} (60%)Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml new file +63 -0
@@ -0,0 +1,63 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/bindings/clock/qcom,sc7180-videocc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Video Clock & Reset Controller Binding for SC7180 + +maintainers: + - Taniya Das <[email protected]> + +description: | + Qualcomm video clock control module which supports the clocks, resets and + power domains on SC7180. + + See also dt-bindings/clock/qcom,videocc-sc7180.h. + +properties: + compatible: + const: qcom,sc7180-videocc + + clocks: + items: + - description: Board XO source + + clock-names: + items: + - const: bi_tcxo + + '#clock-cells': + const: 1 + + '#reset-cells': + const: 1 + + '#power-domain-cells': + const: 1 + + reg: + maxItems: 1 + +required: + - compatible + - reg + - clocks + - clock-names + - '#clock-cells' + - '#reset-cells' + - '#power-domain-cells' + +examples: + - | + #include <dt-bindings/clock/qcom,rpmh.h> + clock-controller@ab00000 { + compatible = "qcom,sc7180-videocc"; + reg = <0 0x0ab00000 0 0x10000>; + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "bi_tcxo"; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; +...
Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml renamed from Documentation/devicetree/bindings/clock/qcom,videocc.yaml +14 -13
@@ -1,30 +1,31 @@ # SPDX-License-Identifier: GPL-2.0-only %YAML 1.2 --- -$id: http://devicetree.org/schemas/bindings/clock/qcom,videocc.yaml# +$id: http://devicetree.org/schemas/bindings/clock/qcom,sdm845-videocc.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Qualcomm Video Clock & Reset Controller Binding +title: Qualcomm Video Clock & Reset Controller Binding for SDM845 maintainers: - Taniya Das <[email protected]> description: | Qualcomm video clock control module which supports the clocks, resets and - power domains. + power domains on SDM845. + + See also dt-bindings/clock/qcom,videocc-sdm845.h. properties: compatible: - enum: - - qcom,sc7180-videocc - - qcom,sdm845-videocc + const: qcom,sdm845-videocc clocks: - maxItems: 1 + items: + - description: Board XO source clock-names: items: - - const: xo + - const: bi_tcxo '#clock-cells': const: 1
@@ -48,15 +49,15 @@ required: - '#power-domain-cells' examples: - # Example of VIDEOCC with clock node properties for SDM845: - | + #include <dt-bindings/clock/qcom,rpmh.h> clock-controller@ab00000 { compatible = "qcom,sdm845-videocc"; - reg = <0xab00000 0x10000>; - clocks = <&rpmhcc 0>; - clock-names = "xo"; + reg = <0 0x0ab00000 0 0x10000>; + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "bi_tcxo"; #clock-cells = <1>; #reset-cells = <1>; #power-domain-cells = <1>; - }; + }; ...
Signature · 1 line
2.25.0.341.g760bfbb309-goog
Re: [PATCH v3 11/15] dt-bindings: clock: Cleanup qcom,videocc bindings for sdm845/sc7180
Quoted 39 lines · Douglas Anderson
This makes the qcom,videocc bindings match the recent changes to the dispcc and gpucc.
1. Switched to using "
bi_tcxo" instead of "xo".2. Adds a description for the XO clock. Not terribly important but nice if it cleanly matches its cousins.
3. Updates the example to use the symbolic name for the RPMH clock and also show that the real devices are currently using 2 address cells / size cells and fixes the spacing on the closing brace.
4. Split into 2 files. In this case they could probably share one file, but let's be consistent.
Signed-off-by Douglas Anderson <[email protected]>---
Changes in v3:
- Added include file to description.
- Split videocc bindings into 2 files.
- Unlike in v2, use internal name instead of purist name.Changes in v2:
- Patch ("dt-bindings: clock: Cleanup qcom,videocc") new for v2..../bindings/clock/qcom,sc7180-videocc.yaml | 63 +++++++++++++++++++ ...,videocc.yaml => qcom,sdm845-videocc.yaml} | 27 ++++---- 2 files changed, 77 insertions(+), 13 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml rename Documentation/devicetree/bindings/clock/{qcom,videocc.yaml => qcom,sdm845-videocc.yaml} (60%)Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml new file +0
-0
Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml line 4
Quoted 4 lines
Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml new file +4
-0@@ -0,0 +1,63 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/bindings/clock/qcom,sc7180-videocc.yaml#
'bindings/' should be removed here. I just found my check on this was inadequate. The clock bindings seem to have the most copy-n-paste of this.
Otherwise,
Quoted 130 lines
Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml new file +59
-0+$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Video Clock & Reset Controller Binding for SC7180 + +maintainers: + - Taniya Das <[email protected]> + +description: | + Qualcomm video clock control module which supports the clocks, resets and + power domains on SC7180. + + See also dt-bindings/clock/qcom,videocc-sc7180.h. + +properties: + compatible: + const: qcom,sc7180-videocc + + clocks: + items: + - description: Board XO source + + clock-names: + items: + - const: bi_tcxo + + '#clock-cells': + const: 1 + + '#reset-cells': + const: 1 + + '#power-domain-cells': + const: 1 + + reg: + maxItems: 1 + +required: + - compatible + - reg + - clocks + - clock-names + - '#clock-cells' + - '#reset-cells' + - '#power-domain-cells' + +examples: + - | + #include <dt-bindings/clock/qcom,rpmh.h> + clock-controller@ab00000 { + compatible = "qcom,sc7180-videocc"; + reg = <0 0x0ab00000 0 0x10000>; + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "bi_tcxo"; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; +...Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml renamed from Documentation/devicetree/bindings/clock/qcom,videocc.yaml +14
-14@@ -1,30 +1,31 @@ # SPDX-License-Identifier: GPL-2.0-only %YAML 1.2 --- -$id: http://devicetree.org/schemas/bindings/clock/qcom,videocc.yaml# +$id: http://devicetree.org/schemas/bindings/clock/qcom,sdm845-videocc.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Qualcomm Video Clock & Reset Controller Binding +title: Qualcomm Video Clock & Reset Controller Binding for SDM845 maintainers: - Taniya Das <[email protected]> description: | Qualcomm video clock control module which supports the clocks, resets and - power domains. + power domains on SDM845. + + See also dt-bindings/clock/qcom,videocc-sdm845.h. properties: compatible: - enum: - - qcom,sc7180-videocc - - qcom,sdm845-videocc + const: qcom,sdm845-videocc clocks: - maxItems: 1 + items: + - description: Board XO source clock-names: items: - - const: xo + - const: bi_tcxo '#clock-cells': const: 1@@ -48,15 +49,15 @@ required: - '#power-domain-cells' examples: - # Example of VIDEOCC with clock node properties for SDM845: - | + #include <dt-bindings/clock/qcom,rpmh.h> clock-controller@ab00000 { compatible = "qcom,sdm845-videocc"; - reg = <0xab00000 0x10000>; - clocks = <&rpmhcc 0>; - clock-names = "xo"; + reg = <0 0x0ab00000 0 0x10000>; + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "bi_tcxo"; #clock-cells = <1>; #reset-cells = <1>; #power-domain-cells = <1>; - }; + }; --2.25.0.341.g760bfbb309-goog
PATCH v3 12/15 clk: qcom: Get rid of the test clock for videocc-sc7180
In reply to Douglas AndersonThe test clock isn't in the bindings and apparently it's not used by anyone upstream. Remove it.
---
Changes in v3:
- Patch ("clk: qcom: Get rid of the test...videocc-sc7180") new for v3.
Changes in v2: None
drivers/clk/qcom/videocc-sc7180.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/clk/qcom/videocc-sc7180.c +1 -3
@@ -50,13 +50,11 @@ static struct clk_alpha_pll video_pll0 = {static const struct parent_map video_cc_parent_map_1[] = { {P_BI_TCXO ,0 }, {P_VIDEO_PLL0_OUT_MAIN ,1 }, - {P_CORE_BI_PLL_TEST_SE ,7 }, };static const struct clk_parent_data video_cc_parent_data_1[] = { { .fw_name ="bi_tcxo" }, { .hw = &video_pll0.clkr.hw }, - { .fw_name ="core_bi_pll_test_se" , .name ="core_bi_pll_test_se" }, };static const struct freq_tbl ftbl_video_cc_venus_clk_src[] = {
@@ -78,7 +76,7 @@ static struct clk_rcg2 video_cc_venus_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="video_cc_venus_clk_src" , .parent_data = video_cc_parent_data_1, - .num_parents =3 , + .num_parents =2 , .flags =CLK_SET_RATE_PARENT , .ops = &clk_rcg2_shared_ops, },
Signature · 1 line
2.25.0.341.g760bfbb309-goog
PATCH v3 13/15 clk: qcom: Use ARRAY_SIZE in videocc-sc7180 for parent clocks
In reply to Douglas AndersonIt's nicer to use ARRAY_SIZE instead of hardcoding. Had we always been doing this it would have prevented a previous bug. See commit 74c31ff9c84a ("clk: qcom: gpu_cc_gmu_clk_src has 5 parents, not 6").
---
Changes in v3:
- Patch ("clk: qcom: Use ARRAY_SIZE in videocc-sc7180...") new for v3.
Changes in v2: None
drivers/clk/qcom/videocc-sc7180.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/videocc-sc7180.c +1 -1
@@ -76,7 +76,7 @@ static struct clk_rcg2 video_cc_venus_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name ="video_cc_venus_clk_src" , .parent_data = video_cc_parent_data_1, - .num_parents =2 , + .num_parents =ARRAY_SIZE (video_cc_parent_data_1), .flags =CLK_SET_RATE_PARENT , .ops = &clk_rcg2_shared_ops, },
Signature · 1 line
2.25.0.341.g760bfbb309-goog
PATCH v3 14/15 arm64: dts: qcom: sdm845: Add the missing clock on the videocc
In reply to Douglas AndersonWe're transitioning over to requiring the Qualcomm Video Clock Controller to specify all the input clocks. Let's add the one input clock for the videocc for sdm845.
NOTE: Until the Linux driver for sdm845's video is updated, this clock will not actually be used in Linux. It will continue to use global clock names to match things up.
---
Changes in v3:
- Unlike in v2, use internal name instead of purist name.
Changes in v2:
- Patch ("arm64: dts: qcom: sdm845: Add...videocc") new for v2.
arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sdm845.dtsi +2 -0
@@ -2607,6 +2607,8 @@ video-core1 { videocc: clock-controller@ab00000 { compatible = "qcom,sdm845-videocc"; reg = <0 0x0ab00000 0 0x10000>; + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "bi_tcxo"; #clock-cells = <1>; #power-domain-cells = <1>; #reset-cells = <1>;
Signature · 1 line
2.25.0.341.g760bfbb309-goog
PATCH v3 15/15 arm64: dts: sc7180: Add clock controller nodes
In reply to Douglas AndersonFrom: Taniya Das <[email protected]>
Add the display, video & graphics clock controller nodes supported on SC7180.
NOTE: the dispcc needs input clocks from various PHYs that aren't in the device tree yet. For now we'll leave these stubbed out with <0>, which is apparently the magic way to do this. These clocks aren't really "optional" and this stubbing out method is apparently the best way to handle it.
---
Changes in v3:
- Added videocc include file.
- Unlike in v2, use internal name instead of purist name.
Changes in v2:
- Added includes
- Changed various parent names to match bindings / driver
arch/arm64/boot/dts/qcom/sc7180.dtsi | 47 ++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)
arch/arm64/boot/dts/qcom/sc7180.dtsi +47 -0
@@ -5,8 +5,11 @@ * Copyright (c) 2019, The Linux Foundation. All rights reserved. */ +#include <dt-bindings/clock/qcom,dispcc-sc7180.h> #include <dt-bindings/clock/qcom,gcc-sc7180.h> +#include <dt-bindings/clock/qcom,gpucc-sc7180.h> #include <dt-bindings/clock/qcom,rpmh.h> +#include <dt-bindings/clock/qcom,videocc-sc7180.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/phy/phy-qcom-qusb2.h> #include <dt-bindings/power/qcom-aoss-qmp.h>
@@ -1039,6 +1042,20 @@ pinmux { }; }; + gpucc: clock-controller@5090000 { + compatible = "qcom,sc7180-gpucc"; + reg = <0 0x05090000 0 0x9000>; + clocks = <&rpmhcc RPMH_CXO_CLK>, + <&gcc GCC_GPU_GPLL0_CLK_SRC>, + <&gcc GCC_GPU_GPLL0_DIV_CLK_SRC>; + clock-names = "bi_tcxo", + "gcc_gpu_gpll0_clk_src", + "gcc_gpu_gpll0_div_clk_src"; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; + qspi: spi@88dc000 { compatible = "qcom,qspi-v1"; reg = <0 0x088dc000 0 0x600>;
@@ -1151,6 +1168,36 @@ usb_1_dwc3: dwc3@a600000 { }; }; + videocc: clock-controller@ab00000 { + compatible = "qcom,sc7180-videocc"; + reg = <0 0x0ab00000 0 0x10000>; + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "bi_tcxo"; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; + + dispcc: clock-controller@af00000 { + compatible = "qcom,sc7180-dispcc"; + reg = <0 0x0af00000 0 0x200000>; + clocks = <&rpmhcc RPMH_CXO_CLK>, + <&gcc GCC_DISP_GPLL0_CLK_SRC>, + <0>, + <0>, + <0>, + <0>; + clock-names = "bi_tcxo", + "gcc_disp_gpll0_clk_src", + "dsi0_phy_pll_out_byteclk", + "dsi0_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>; + }; + pdc: interrupt-controller@b220000 { compatible = "qcom,sc7180-pdc", "qcom,pdc"; reg = <0 0x0b220000 0 0x30000>;
Signature · 1 line
2.25.0.341.g760bfbb309-goog