[PATCH 1/2] ASoC: dt-bindings: qcom, sm8250: use fallback for SDM845 sound cards
All SDM845 sound cards are compatible with each other, so use one generic fallback compatible for them.
Signed-off-by: Krzysztof Kozlowski krzysztof.kozlowski@linaro.org --- .../bindings/sound/qcom,sm8250.yaml | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml b/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml index 70080d04ddc9..262de7a60a73 100644 --- a/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml @@ -15,16 +15,20 @@ description:
properties: compatible: - enum: - - lenovo,yoga-c630-sndcard - - qcom,apq8016-sbc-sndcard - - qcom,db845c-sndcard - - qcom,msm8916-qdsp6-sndcard - - qcom,qrb5165-rb5-sndcard - - qcom,sc8280xp-sndcard - - qcom,sdm845-sndcard - - qcom,sm8250-sndcard - - qcom,sm8450-sndcard + oneOf: + - items: + - enum: + - lenovo,yoga-c630-sndcard + - qcom,db845c-sndcard + - const: qcom,sdm845-sndcard + - enum: + - qcom,apq8016-sbc-sndcard + - qcom,msm8916-qdsp6-sndcard + - qcom,qrb5165-rb5-sndcard + - qcom,sc8280xp-sndcard + - qcom,sdm845-sndcard + - qcom,sm8250-sndcard + - qcom,sm8450-sndcard
audio-routing: $ref: /schemas/types.yaml#/definitions/non-unique-string-array
If all devices are the same or compatible, there is no single need to keep growing of_device_id list with new entries.
Signed-off-by: Krzysztof Kozlowski krzysztof.kozlowski@linaro.org
---
Patches are independent and backwards compatible. DTS fixup will be sent separately. --- sound/soc/qcom/sdm845.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/sound/soc/qcom/sdm845.c b/sound/soc/qcom/sdm845.c index d8d35563af00..02612af714a8 100644 --- a/sound/soc/qcom/sdm845.c +++ b/sound/soc/qcom/sdm845.c @@ -588,6 +588,7 @@ static int sdm845_snd_platform_probe(struct platform_device *pdev)
static const struct of_device_id sdm845_snd_device_id[] = { { .compatible = "qcom,sdm845-sndcard" }, + /* Do not grow the list for compatible devices */ { .compatible = "qcom,db845c-sndcard" }, { .compatible = "lenovo,yoga-c630-sndcard" }, {},
On Wed, 18 Jan 2023 11:15:41 +0100, Krzysztof Kozlowski wrote:
All SDM845 sound cards are compatible with each other, so use one generic fallback compatible for them.
Signed-off-by: Krzysztof Kozlowski krzysztof.kozlowski@linaro.org
.../bindings/sound/qcom,sm8250.yaml | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-)
Acked-by: Rob Herring robh@kernel.org
On Wed, 18 Jan 2023 11:15:41 +0100, Krzysztof Kozlowski wrote:
All SDM845 sound cards are compatible with each other, so use one generic fallback compatible for them.
Applied to
broonie/sound.git for-next
Thanks!
[1/2] ASoC: dt-bindings: qcom,sm8250: use fallback for SDM845 sound cards commit: b4090b7cda255daafe816a00f2848f4f8e761786 [2/2] ASoC: qcom: sdm845: add remark about unneeded compatibles commit: 3a14adc51605452fdf1c009cc3333c7e399821d9
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
participants (3)
-
Krzysztof Kozlowski -
Mark Brown -
Rob Herring