Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

dt-bindings: clock: qcom,mmcc: fix clocks/clock-names definitions

Rather than defining (incorrect) global clocks and clock-names lists,
define them per platform using conditionals. Also, while we are at it,
mark these properties as required for all platforms for which DT files
contained clocks/clock-names for the MMCC nodes from the beginning (in
addition to existing MSM8998 this adds MSM8994, SDM630 and SDM660).

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220705112734.1323355-2-dmitry.baryshkov@linaro.org

authored by

Dmitry Baryshkov and committed by
Bjorn Andersson
73e66ddf 342470f7

+116 -31
+116 -31
Documentation/devicetree/bindings/clock/qcom,mmcc.yaml
··· 31 31 - qcom,mmcc-sdm660 32 32 33 33 clocks: 34 - items: 35 - - description: Board XO source 36 - - description: Board sleep source 37 - - description: Global PLL 0 clock 38 - - description: DSI phy instance 0 dsi clock 39 - - description: DSI phy instance 0 byte clock 40 - - description: DSI phy instance 1 dsi clock 41 - - description: DSI phy instance 1 byte clock 42 - - description: HDMI phy PLL clock 43 - - description: DisplayPort phy PLL vco clock 44 - - description: DisplayPort phy PLL link clock 34 + minItems: 9 35 + maxItems: 10 45 36 46 37 clock-names: 47 - items: 48 - - const: xo 49 - - const: sleep 50 - - const: gpll0 51 - - const: dsi0dsi 52 - - const: dsi0byte 53 - - const: dsi1dsi 54 - - const: dsi1byte 55 - - const: hdmipll 56 - - const: dpvco 57 - - const: dplink 38 + minItems: 9 39 + maxItems: 10 58 40 59 41 '#clock-cells': 60 42 const: 1 ··· 67 85 68 86 additionalProperties: false 69 87 70 - if: 71 - properties: 72 - compatible: 73 - contains: 74 - const: qcom,mmcc-msm8998 88 + allOf: 89 + - if: 90 + properties: 91 + compatible: 92 + contains: 93 + enum: 94 + - qcom,mmcc-msm8994 95 + - qcom,mmcc-msm8998 96 + - qcom,mmcc-sdm630 97 + - qcom,mmcc-sdm660 98 + then: 99 + required: 100 + - clocks 101 + - clock-names 75 102 76 - then: 77 - required: 78 - - clocks 79 - - clock-names 103 + - if: 104 + properties: 105 + compatible: 106 + contains: 107 + const: qcom,mmcc-msm8994 108 + then: 109 + properties: 110 + clocks: 111 + items: 112 + - description: Board XO source 113 + - description: Global PLL 0 clock 114 + - description: MMSS NoC AHB clock 115 + - description: GFX3D clock 116 + - description: DSI phy instance 0 dsi clock 117 + - description: DSI phy instance 0 byte clock 118 + - description: DSI phy instance 1 dsi clock 119 + - description: DSI phy instance 1 byte clock 120 + - description: HDMI phy PLL clock 121 + 122 + clock-names: 123 + items: 124 + - const: xo 125 + - const: gpll0 126 + - const: mmssnoc_ahb 127 + - const: oxili_gfx3d_clk_src 128 + - const: dsi0pll 129 + - const: dsi0pllbyte 130 + - const: dsi1pll 131 + - const: dsi1pllbyte 132 + - const: hdmipll 133 + 134 + - if: 135 + properties: 136 + compatible: 137 + contains: 138 + const: qcom,mmcc-msm8998 139 + then: 140 + properties: 141 + clocks: 142 + items: 143 + - description: Board XO source 144 + - description: Global PLL 0 clock 145 + - description: DSI phy instance 0 dsi clock 146 + - description: DSI phy instance 0 byte clock 147 + - description: DSI phy instance 1 dsi clock 148 + - description: DSI phy instance 1 byte clock 149 + - description: HDMI phy PLL clock 150 + - description: DisplayPort phy PLL link clock 151 + - description: DisplayPort phy PLL vco clock 152 + - description: Test clock 153 + 154 + clock-names: 155 + items: 156 + - const: xo 157 + - const: gpll0 158 + - const: dsi0dsi 159 + - const: dsi0byte 160 + - const: dsi1dsi 161 + - const: dsi1byte 162 + - const: hdmipll 163 + - const: dplink 164 + - const: dpvco 165 + - const: core_bi_pll_test_se 166 + 167 + - if: 168 + properties: 169 + compatible: 170 + contains: 171 + enum: 172 + - qcom,mmcc-sdm630 173 + - qcom,mmcc-sdm660 174 + then: 175 + properties: 176 + clocks: 177 + items: 178 + - description: Board XO source 179 + - description: Board sleep source 180 + - description: Global PLL 0 clock 181 + - description: Global PLL 0 DIV clock 182 + - description: DSI phy instance 0 dsi clock 183 + - description: DSI phy instance 0 byte clock 184 + - description: DSI phy instance 1 dsi clock 185 + - description: DSI phy instance 1 byte clock 186 + - description: DisplayPort phy PLL link clock 187 + - description: DisplayPort phy PLL vco clock 188 + 189 + clock-names: 190 + items: 191 + - const: xo 192 + - const: sleep_clk 193 + - const: gpll0 194 + - const: gpll0_div 195 + - const: dsi0pll 196 + - const: dsi0pllbyte 197 + - const: dsi1pll 198 + - const: dsi1pllbyte 199 + - const: dp_link_2x_clk_divsel_five 200 + - const: dp_vco_divided_clk_src_mux 80 201 81 202 examples: 82 203 # Example for MMCC for MSM8960: