Message ID | 20231219-topic-sm8x50-upstream-va-macro-bindings-fix-v1-1-ae133886f70e@linaro.org (mailing list archive) |
---|---|
State | Accepted |
Commit | c13cf1991f4231d38f1c43fcf51ec1cf29c8c82d |
Headers | show |
Series | ASoC: dt-bindings: qcom,lpass-va-macro: remove spurious contains in if statement | expand |
On 19/12/2023 14:23, Neil Armstrong wrote: > Remove this spurious "contains" which causes the bindings check of > qcom,sm8450-lpass-va-macro compatible to fail with: > codec@33f0000: clocks: [[156, 57, 1], [156, 102, 1], [156, 103, 1], [156, 70, 1]] is too long > from schema $id: http://devicetree.org/schemas/sound/qcom,lpass-va-macro.yaml# > codec@33f0000: clock-names: ['mclk', 'macro', 'dcodec', 'npl'] is too long > from schema $id: http://devicetree.org/schemas/sound/qcom,lpass-va-macro.yaml# > > Seems the double "contains" was considered as valid by the tool but broke > the entire if statements. > > Fixes: f243ef746d0a ("ASoC: dt-bindings: qcom,lpass-va-macro: Add SM8650 LPASS VA") Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On Tue, 19 Dec 2023 14:23:37 +0100, Neil Armstrong wrote: > Remove this spurious "contains" which causes the bindings check of > qcom,sm8450-lpass-va-macro compatible to fail with: > codec@33f0000: clocks: [[156, 57, 1], [156, 102, 1], [156, 103, 1], [156, 70, 1]] is too long > from schema $id: http://devicetree.org/schemas/sound/qcom,lpass-va-macro.yaml# > codec@33f0000: clock-names: ['mclk', 'macro', 'dcodec', 'npl'] is too long > from schema $id: http://devicetree.org/schemas/sound/qcom,lpass-va-macro.yaml# > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: dt-bindings: qcom,lpass-va-macro: remove spurious contains in if statement commit: c13cf1991f4231d38f1c43fcf51ec1cf29c8c82d All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml b/Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml index c03ff9472a85..6b483fa3c428 100644 --- a/Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml @@ -121,9 +121,8 @@ allOf: properties: compatible: contains: - contains: - enum: - - qcom,sm8550-lpass-va-macro + enum: + - qcom,sm8550-lpass-va-macro then: properties: clocks:
Remove this spurious "contains" which causes the bindings check of qcom,sm8450-lpass-va-macro compatible to fail with: codec@33f0000: clocks: [[156, 57, 1], [156, 102, 1], [156, 103, 1], [156, 70, 1]] is too long from schema $id: http://devicetree.org/schemas/sound/qcom,lpass-va-macro.yaml# codec@33f0000: clock-names: ['mclk', 'macro', 'dcodec', 'npl'] is too long from schema $id: http://devicetree.org/schemas/sound/qcom,lpass-va-macro.yaml# Seems the double "contains" was considered as valid by the tool but broke the entire if statements. Fixes: f243ef746d0a ("ASoC: dt-bindings: qcom,lpass-va-macro: Add SM8650 LPASS VA") Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> --- Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- base-commit: aa4db8324c4d0e67aa4670356df4e9fae14b4d37 change-id: 20231219-topic-sm8x50-upstream-va-macro-bindings-fix-924ffff6ae31 Best regards,