[PATCH 1/2] ASoC: qcom: dt-bindings: sm8250: update compatibles

[PATCH 1/2] ASoC: qcom: dt-bindings: sm8250: update compatibles

[Srinivas Kandagatla]

Update compatible string as board compatible and device compatible
should not be same!. New compatible is now suffixed with -sndcard
to be inline with other Qualcomm Sound cards.

This also fixes the warnings/error reported by dt_binding_check.

Fixes: 765c37598494 ("ASoC: qcom: dt-bindings: Add SM8250 sound card bindings")
Reported-by: Rob Herring <robh@kernel.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 Documentation/devicetree/bindings/sound/qcom,sm8250.yaml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml b/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml
index b8f97fe6e92c..72ad9ab91832 100644
--- a/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml
+++ b/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml
@@ -16,10 +16,8 @@ description:
 properties:
   compatible:
     oneOf:
-      - const: qcom,qrb5165-rb5
-      - items:
-        - const: qcom,sm8250
-        - const: qcom,qrb5165-rb5
+      - const: qcom,sm8250-sndcard
+      - const: qcom,qrb5165-rb5-sndcard
 
   audio-routing:
     $ref: /schemas/types.yaml#/definitions/non-unique-string-array
@@ -83,7 +81,7 @@ examples:
     #include <dt-bindings/sound/qcom,q6afe.h>
     #include <dt-bindings/sound/qcom,q6asm.h>
     sound {
-        compatible = "qcom,qrb5165-rb5";
+        compatible = "qcom,qrb5165-rb5-sndcard";
         model = "Qualcomm-qrb5165-RB5-WSA8815-Speakers-DMIC0";
         audio-routing = "SpkrLeft IN", "WSA_SPK1 OUT",
                     "SpkrRight IN", "WSA_SPK2 OUT",
-- 
2.21.0

[PATCH 2/2] ASoC: qcom: sm8250: update compatible with new bindings

[Srinivas Kandagatla]

Update compatible string as board compatible and device compatible
should not be same!. Make the driver inline with the new bindings.

Fixes: aa2e2785545a ("ASoC: qcom: sm8250: add sound card qrb5165-rb5 support")
Reported-by: Rob Herring <robh@kernel.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 sound/soc/qcom/sm8250.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/qcom/sm8250.c b/sound/soc/qcom/sm8250.c
index 52c40512102f..315ed6ccb7c4 100644
--- a/sound/soc/qcom/sm8250.c
+++ b/sound/soc/qcom/sm8250.c
@@ -207,8 +207,8 @@ static int sm8250_platform_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id snd_sm8250_dt_match[] = {
-	{.compatible = "qcom,sdm8250"},
-	{.compatible = "qcom,qrb5165-rb5"},
+	{.compatible = "qcom,sm8250-sndcard"},
+	{.compatible = "qcom,qrb5165-rb5-sndcard"},
 	{}
 };
 
-- 
2.21.0

Re: [PATCH 1/2] ASoC: qcom: dt-bindings: sm8250: update compatibles

[Mark Brown]

On Thu, 29 Oct 2020 10:15:49 +0000, Srinivas Kandagatla wrote:
> Update compatible string as board compatible and device compatible
> should not be same!. New compatible is now suffixed with -sndcard
> to be inline with other Qualcomm Sound cards.
> 
> This also fixes the warnings/error reported by dt_binding_check.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/2] ASoC: qcom: dt-bindings: sm8250: update compatibles
      commit: a889583a19206636082c44625141b26392e46a62
[2/2] ASoC: qcom: sm8250: update compatible with new bindings
      commit: bbc4e1bb5fd6577ed668e7c2ba0705dff1783bce

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