Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp215556pxb; Tue, 19 Oct 2021 01:04:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHDCW85tJRI9y4fEAMCx8StGMS+/GIeo3JS66RQs61wFiY1dXxiSv+puVAwcBAyLhvu8g6 X-Received: by 2002:a17:90a:688c:: with SMTP id a12mr4779318pjd.227.1634630676229; Tue, 19 Oct 2021 01:04:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634630676; cv=none; d=google.com; s=arc-20160816; b=pVJ+jpn0r2Aw6OFRrlHcEwm9fWcfhzWCABGRF/rGjYjekBuMGqTjsmR1Y9rKa/yvA3 Lh3zd3tSvOy0lCRBIiVWXXPIhZ/Cp5+RfT++nmcf1hmCtVDUOANYBsp5z29P0EIMb3Iu YY9H/3wYnB2yZTgvEZIv/O+yF/P+hpZZuZDF8Cgw/L1mdt1pU2DO6+jtGWJH/s9zMrsr 5aePc3tfzOxyodUsXbBzHdVd8zmf4N15X4b3U3kn3HpaYsbZes6k3HBYJ3Zl6z0fiPfW n1A4/nyCA6MwTaBxUq3jr/zSjxh5d58aoe69ir7wsVqgTwJpEBKT10UyiDgEBKTV+WC6 rZ8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=2hGfcFY/D/kvLwPYdsjBiGurZKksTTdc0y/Jyql/09o=; b=fbyz8CYkaXY1JBwo++IjxEM2ScxqXi6ZK9pYXByaa0JsHWtzPHHH3ZNa7Ki3nMwjT0 ODIwUgMdZV7Uunz6PTeoIjrrhRsLw494TIhTG6ADh86JV+KO0r8xStduA4dBKxT6vIJF HRI34kOoi+Gh/BN5Injzsg2Yqo8aXRrpsDxy3sn+0h/eAoNT6bAXrhAOoBpB/UylgrNR f/aVbc00YtAL5ZxNtL/LBeEqknKERRGNkz0tkwFsNgA3QXNA7r208EDiGqUx0WJgr3s6 sWYLhU8GMHKvi0daUw8ba8tyCXxXUFgu3FQQY/rhrofhYelL8jjTlrSs9WtbQpPed1X/ olWw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h187si24988949pgc.377.2021.10.19.01.04.20; Tue, 19 Oct 2021 01:04:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234561AbhJSIFS (ORCPT + 99 others); Tue, 19 Oct 2021 04:05:18 -0400 Received: from mga06.intel.com ([134.134.136.31]:14634 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231187AbhJSIFR (ORCPT ); Tue, 19 Oct 2021 04:05:17 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10141"; a="289299554" X-IronPort-AV: E=Sophos;i="5.85,383,1624345200"; d="scan'208";a="289299554" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2021 01:02:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,383,1624345200"; d="scan'208";a="493984187" Received: from brentlu-brix.itwn.intel.com ([10.5.253.56]) by orsmga008.jf.intel.com with ESMTP; 19 Oct 2021 01:02:33 -0700 From: Brent Lu To: alsa-devel@alsa-project.org Cc: Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Jie Yang , Mark Brown , Jaroslav Kysela , Takashi Iwai , Kai Vehmanen , Rander Wang , Paul Olaru , Guennadi Liakhovetski , Brent Lu , Mac Chiang , Curtis Malainey , linux-kernel@vger.kernel.org, Yong Zhi , Vamshi Krishna Gopal , Bard Liao , Libin Yang , Christophe JAILLET , Gongjun Song , Liam Girdwood , Rander Wang , Hans de Goede Subject: [PATCH v3 0/6] Multiple headphone codec driver support Date: Tue, 19 Oct 2021 15:59:35 +0800 Message-Id: <20211019075941.2037787-1-brent.lu@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Support multiple headphone drivers in same machine driver. In this case, both rt5682 and rt5682s are supported and enumerated by different ACPI HID "10EC5682" and "RTL5682". V2 Changes: - remove useless 'NULL', 'false' in if-condition - can use 'comp_ids' field alone to enumerate driver - add comma to the end of entry in structure initialization - keep the table of byt/cht/cml/icl untouched V3 Changes: - upstreamd from SOF github, PR#3200 - use new compatiable IDs to shrink the enumerate table of BYT and CHT - add 'const' to snd_soc_acpi_codecs structures Brent Lu (3): ASoC: soc-acpi: add comp_ids field for machine driver matching ASoC: Intel: sof_rt5682: detect codec variant in probe function ASoC: Intel: sof_rt5682: use comp_ids to enumerate rt5682s Pierre-Louis Bossart (3): ASoC: Intel: soc-acpi-byt: shrink tables using compatible IDs ASoC: Intel: soc-acpi-cht: shrink tables using compatible IDs ASoC: Intel: soc-acpi: use const for all uses of snd_soc_acpi_codecs include/sound/soc-acpi.h | 3 + sound/soc/intel/boards/sof_rt5682.c | 34 ++------- .../intel/common/soc-acpi-intel-adl-match.c | 11 ++- .../intel/common/soc-acpi-intel-bxt-match.c | 2 +- .../intel/common/soc-acpi-intel-byt-match.c | 68 +++++++----------- .../intel/common/soc-acpi-intel-cht-match.c | 69 +++++++------------ .../intel/common/soc-acpi-intel-cml-match.c | 8 +-- .../intel/common/soc-acpi-intel-glk-match.c | 2 +- .../intel/common/soc-acpi-intel-jsl-match.c | 43 ++++-------- .../intel/common/soc-acpi-intel-kbl-match.c | 12 ++-- .../intel/common/soc-acpi-intel-skl-match.c | 2 +- .../intel/common/soc-acpi-intel-tgl-match.c | 11 ++- sound/soc/soc-acpi.c | 24 ++++++- 13 files changed, 119 insertions(+), 170 deletions(-) -- 2.25.1