From patchwork Mon Aug 9 21:32:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Curtis Malainey X-Patchwork-Id: 12427295 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=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 5652EC4338F for ; Mon, 9 Aug 2021 21:34:44 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9224560EE7 for ; Mon, 9 Aug 2021 21:34:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9224560EE7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 3F80586F; Mon, 9 Aug 2021 23:33:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3F80586F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1628544880; bh=mGD5Wg5KszZGZuY8C1zQZTBfg08Qtf3rri4wo85FHOo=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=cJ1GxKLYTi1Lm3JlVMXTxLFQvWBWVUoP04XuDbsE2BqwlvqaCCGKCquXyV2c5iftp +gPWBNAZ2lsSSS1OSKZ00Mm41MtYdEc/M7ZiunhnH4Yir4mhhHlvlFRIeYkAVcOHW7 l4A04h4wiLfftywYTuPGpBr7bRIYYgXSButxmJok= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id C4105F80105; Mon, 9 Aug 2021 23:33:49 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0BAB0F802D2; Mon, 9 Aug 2021 23:33:48 +0200 (CEST) Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 69CB4F800FD for ; Mon, 9 Aug 2021 23:33:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 69CB4F800FD Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="A8+7lVSh" Received: by mail-pl1-x62e.google.com with SMTP id a5so2384925plh.5 for ; Mon, 09 Aug 2021 14:33:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=VfxW8sERjeoO4VmUrLfMOYfhvu164iU9CMNXTq85PGw=; b=A8+7lVShkPFt70FuYnQVxtQn7ePphKnBob0WknKY8bBkviu1W6Kxj1p2vCx85sUFSu mBk92XVlAbY8nHWiI1he0PsuK85kz6J/BnIA+WVE3ytBRvafnO248UHQvoy6vyTQ/yCZ iMnLxzQ1q2SnceAP11eSBvbjK5gRJUj53gnkQ= 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=VfxW8sERjeoO4VmUrLfMOYfhvu164iU9CMNXTq85PGw=; b=gNIZ/J1VhP1RleLumjxS5RMovMr9fpeWMXs0fHvBXTnFnaJa0IMbJfpLwRat5naTmi dpM+jY9e3Ve6wbU1y7N6DNQ5nZhx/F0ahJMbdxKkusL2rQ3hGNeSxa0AB0vbx+bcbgu1 wfep+ZbHUvSCXT8mtUCeObmyMUW2XAVZfDbfFq6zPKMQGQl5nm8B5YTibDGNp8mli7W/ q1S8zx2v/MhXjiqLHXA4nuD9E73MYeXxtWTaudcs9RakCC06ijZcl4EDP9j9/76vY6C+ 7Vx6/7tBEQigypCIX2B1NkBVNtMdXyBbfzky3ENknbIvQS56aNn+cwKh/BlCpllw4w8J N8Tw== X-Gm-Message-State: AOAM532a7wWvmnuwIk+PWbqHOH/uzpR11kWUhT5mBgpJn0HzC3jlr01l xMc8aCkJgwAmMxBjoLDHL0zIF4Efppmx X-Google-Smtp-Source: ABdhPJyE4jIOeXFCOUR3xmivnZ5yOd60Kcil6FjKzsiSBYRpdDE5Xgrp5xoe0cNNfkcYnHW+sGcD/Q== X-Received: by 2002:a17:90a:474e:: with SMTP id y14mr27873047pjg.33.1628544814713; Mon, 09 Aug 2021 14:33:34 -0700 (PDT) Received: from localhost ([2620:15c:202:201:e554:9d7b:a40d:3e6]) by smtp.gmail.com with UTF8SMTPSA id g19sm450527pjl.25.2021.08.09.14.33.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 09 Aug 2021 14:33:34 -0700 (PDT) From: Curtis Malainey To: alsa-devel@alsa-project.org Subject: [PATCH] ASoC: Intel: Fix platform ID matching Date: Mon, 9 Aug 2021 14:32:42 -0700 Message-Id: <20210809213248.1674049-1-cujomalainey@chromium.org> X-Mailer: git-send-email 2.32.0.605.g8dce9f2422-goog MIME-Version: 1.0 Cc: Guennadi Liakhovetski , Cezary Rojewski , Kai Vehmanen , Mark Brown , Takashi Iwai , Jie Yang , Pierre-Louis Bossart , Liam Girdwood , Matt Davis , Paul Olaru , Curtis Malainey , Rander Wang , Bard Liao , Brent Lu X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Sparse warnings triggered truncating the IDs of some platform device tables. Unfortunately some of the IDs in the match tables were missed which breaks audio. The KBL change has been verified to fix audio, the CML change was not tested as it was found through grepping the broken changes and found to match the same situation in anticipation that it should also be fixed. Fixes: 94efd726b947 ("ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters") Fixes: 24e46fb811e9 ("ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters") Signed-off-by: Curtis Malainey Tested-by: Matt Davis --- sound/soc/intel/common/soc-acpi-intel-cml-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/common/soc-acpi-intel-cml-match.c b/sound/soc/intel/common/soc-acpi-intel-cml-match.c index 42ef51c3fb4f..b591c6fd13fd 100644 --- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c @@ -75,7 +75,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = { }, { .id = "DLGS7219", - .drv_name = "cml_da7219_max98357a", + .drv_name = "cml_da7219_mx98357a", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &max98390_spk_codecs, .sof_fw_filename = "sof-cml.ri", diff --git a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c index ba5ff468c265..741bf2f9e081 100644 --- a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c @@ -87,7 +87,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = { }, { .id = "DLGS7219", - .drv_name = "kbl_da7219_max98357a", + .drv_name = "kbl_da7219_mx98357a", .fw_filename = "intel/dsp_fw_kbl.bin", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &kbl_7219_98357_codecs,