From patchwork Thu Oct 29 10:15:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 310755 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12EA4C55178 for ; Thu, 29 Oct 2020 10:16:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9AB31206BE for ; Thu, 29 Oct 2020 10:16:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="O05Zz/pd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726352AbgJ2KQB (ORCPT ); Thu, 29 Oct 2020 06:16:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725920AbgJ2KQA (ORCPT ); Thu, 29 Oct 2020 06:16:00 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CF8CC0613D2 for ; Thu, 29 Oct 2020 03:15:58 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id a72so1797638wme.5 for ; Thu, 29 Oct 2020 03:15:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fYyCEb9n1uW/GtO+Icma9ul0k8OoUNEYDQcb88XmO5g=; b=O05Zz/pdl27ZIwt1YVkKcFWRvvhrwjPNE9cxeiuglOIbnH6BjoHV2zF/AvOHpPrqMh QNF0RzQjv4or6DnHhQOvxDJJHM449xfcFJxz1c2+CdNZCfuCphKAWVdfze7oCrduMIDb mGzE1XM8UXj389iex1BSebqeI/cnM/O1Ta8s/d5URElFfu3LRwMD7jLiYbNQvKX6FVd6 UXz0x9odecvYPlkkU1EBaZfRvl7nhHhsj2iED9sWxKabnR63wh/OHRZu2OPaEng9gGYm /srhE/3A5TXmq/aNtps5sxRt+kAfl/SJL//AUDxuEwMD1DB1efMowkg5uELz6iKUi37U j5pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fYyCEb9n1uW/GtO+Icma9ul0k8OoUNEYDQcb88XmO5g=; b=GRLNZcic0e54sbj/UZOhZcRYgWiesW4srwJBl05MKhrezLWbSmEd9IrMs+JWAaXeMb aBMMFwOF17UAxfXFq5vP0vs7Sww1uFfAeHwy6esDU3XeNUTwovgftp3+W3OFpIz6UrCN 5xEdnwBTea8tEYOGlOyMKaSCeQB/kGfsu7OeAcFFA/s6Ufvahtxzxy6zFbOR7l5vmfrk S1FLmezMMwxlRWzHcqfCfaSi+4aCVG6w033N8gsP4+c51xICLSYxC0Dzc/y14wi+xh1v qDTrL8TA9VmdrFkjgc9UjQiAkrn7hVPE2lR84AOYZ/V8TGCWVoq+YKxsYuadlJ6/vtUA WTBw== X-Gm-Message-State: AOAM531vhdENxJd9lZWfMok7RetgC66QmSQHcdOU237qvvBsmwf7vqqf rDPVU6jbOrUiFxNcUUnhRfMG9s5zIUkOAA== X-Google-Smtp-Source: ABdhPJwNELU/1Cf7kaWKDnW3VeGHFj4v73i/xYmaOjqFZoHSRmwDNjXa9Dz3BF4lx+TaAOpHlYdA2w== X-Received: by 2002:a7b:c387:: with SMTP id s7mr3493931wmj.52.1603966557351; Thu, 29 Oct 2020 03:15:57 -0700 (PDT) Received: from srini-hackbox.lan (cpc86377-aztw32-2-0-cust226.18-1.cable.virginm.net. [92.233.226.227]) by smtp.gmail.com with ESMTPSA id 32sm4222495wro.31.2020.10.29.03.15.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 03:15:56 -0700 (PDT) From: Srinivas Kandagatla To: broonie@kernel.org Cc: perex@perex.cz, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, lgirdwood@gmail.com, devicetree@vger.kernel.org, robh+dt@kernel.org, Srinivas Kandagatla , Rob Herring Subject: [PATCH 1/2] ASoC: qcom: dt-bindings: sm8250: update compatibles Date: Thu, 29 Oct 2020 10:15:49 +0000 Message-Id: <20201029101550.31695-1-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 Signed-off-by: Srinivas Kandagatla --- 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 #include 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", From patchwork Thu Oct 29 10:15:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 314776 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 602CFC55179 for ; Thu, 29 Oct 2020 10:16:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F114D20790 for ; Thu, 29 Oct 2020 10:16:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="QOQ7mU5W" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725920AbgJ2KQB (ORCPT ); Thu, 29 Oct 2020 06:16:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726319AbgJ2KQA (ORCPT ); Thu, 29 Oct 2020 06:16:00 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFECCC0613D3 for ; Thu, 29 Oct 2020 03:15:59 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id n18so2105318wrs.5 for ; Thu, 29 Oct 2020 03:15:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i74O5NY+sTiDci0iVom9weNEC9VKdMsGWfdVhOUj4Xk=; b=QOQ7mU5WYK5nyIpw5goqHMmsDSJMRHJi7oEVLYhjcY05Ep9bxWWdfS1vEpBCsYdiGV ON9iuONq3yODrxlinvhw/tHBi45DHvBHl6ZUqUk/IHG7RA06GD21Ej2t00A0OP9mD+0A z3E+FgeqB8kmrVeALkdA0zemjJFO75HIAPns/O7YlpqUbd7S9+wn7su9FPS+CrB6uSBk qvZfUDapwV7z0KOmE5iPq/qf4OXjcZJrHOAe6/kl98pd7rkEHxblIvDJkYPLETT2FMzr /aJV7nTRfMaT+WBkbauH17hXn+QhTSgR1TtATAbuZE6K/EAQ4Vq9KuEQD8mPL8udiV3q vrOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i74O5NY+sTiDci0iVom9weNEC9VKdMsGWfdVhOUj4Xk=; b=IwYzTCASRMHPwWSMHVDtox2gIYdBQltyaph5bcmP2u9gu4+YemZca22X5XBfbPJN3E 4wWdR9tql2JyxpS+eSnXeDa9wiw08k3iI4VcxG2ksQiM5w2Rd5racajFw8bj05CQDMNW 3kgs/N3y7NZvQP+XEXppoefU4TGkuUn4ZV3EfeLWgpdkWkpaOlKzOcYGSMvatGRQB187 WKjorZsJ5JRulXIxQILaf37uRPcqlnW15stRc0VBEBjikHxxg/gtfdX84FLCc6cziC6A CwMiv3crGfSx4DHsV7G+/h+encCVc9LdVOj++j6+sNzAbx/lhlRafPMWVy49EgrfolUH jYkw== X-Gm-Message-State: AOAM532rsVy6v1HQRLRZn3c9erzzCPvc4rEXLPojs3IOO6ViFHiI+c8W uyTEdpyQP/2vQP5zBXmbjYh8ZQ== X-Google-Smtp-Source: ABdhPJxFoVwhtInQxp4YNuWp2oFll6oAB0fdAsEjCqEVIm6c5GIOXbS3RSbETDmBOXb4v/2rIw8nxg== X-Received: by 2002:adf:fd49:: with SMTP id h9mr4784034wrs.115.1603966558585; Thu, 29 Oct 2020 03:15:58 -0700 (PDT) Received: from srini-hackbox.lan (cpc86377-aztw32-2-0-cust226.18-1.cable.virginm.net. [92.233.226.227]) by smtp.gmail.com with ESMTPSA id 32sm4222495wro.31.2020.10.29.03.15.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 03:15:58 -0700 (PDT) From: Srinivas Kandagatla To: broonie@kernel.org Cc: perex@perex.cz, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, lgirdwood@gmail.com, devicetree@vger.kernel.org, robh+dt@kernel.org, Srinivas Kandagatla , Rob Herring Subject: [PATCH 2/2] ASoC: qcom: sm8250: update compatible with new bindings Date: Thu, 29 Oct 2020 10:15:50 +0000 Message-Id: <20201029101550.31695-2-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201029101550.31695-1-srinivas.kandagatla@linaro.org> References: <20201029101550.31695-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 Signed-off-by: Srinivas Kandagatla --- 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"}, {} };