Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp313369pxb; Fri, 29 Oct 2021 10:18:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhhNdudPwI4hNjGeAuj/5DsxSJxiXayZDi2/LfCXBlLnirc5VHEoJ4uoYkt4YaqdekC0qU X-Received: by 2002:a17:907:869f:: with SMTP id qa31mr15585640ejc.361.1635527891937; Fri, 29 Oct 2021 10:18:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635527891; cv=none; d=google.com; s=arc-20160816; b=Wp0Dl5bQ+NADPrnofbcdxoN+5E645Krmzzgl3KggWYOHTCjRmu85Ds5tZUAc1KHg38 v/zgfVljbOttudPuBNWtse8DDkSp93ynlj53BQHpO5Br1C7r8hDkosfPh9UyLnHs8Zjt EzgIum9AOeSBQwax+XNbOFT11/b5VhhXACpK8YTGnCrbTeu95JKq9QCz36ZUzZKnpxoA d4+mpK9EINSmO4OCGnP9JlSIq63LOIJ8ZhhywovVY29Mwy5gmDWb2KCD6y3Xwc/iHUcq 1JWAgM9WTj5kE+H3ghbnuOIVOtIXPU2BUI4CdLo2mrpJWrpXb3bJdnL9Xa7q81IugwXn 3bbw== 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=CukYNS32Bx326V6J7iIk2fbGEBs/fsMIKlLBHtTtOvs=; b=B+TJjoKD/KS8wjYtE8Rmxhg18qDqCx7y36uvcELd4VlbC+8DfPyulhxCioUjaAagHv sD/o8wre9d/Nc3w1cFlVbUDHv9V+rjTSW/1b3BoHgSHeaqOwgyoz0ym5xVRRJoj7p+VU o3+cRQH+ZCYortalhGKDUMiQCVbbU2jPCPCneToWD0Baq3GFlrrYFcJnD3evv6XXl7iO cBkrmkZG3Tcfj4fvv7zu3F9jwGUGdZjmsXYT/6Kq74QNcX7+AEh9R+x2nyrXHEzenemd mHdTbJ2KYkpRDRdoZAAbI0Fuv7cEMkCSg826pG4vmqwhJgOeuEgS1Cg3pwr0UAi57i/4 g2eA== 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 cs11si1332126ejc.235.2021.10.29.10.17.48; Fri, 29 Oct 2021 10:18:11 -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 S229826AbhJ2RS0 (ORCPT + 99 others); Fri, 29 Oct 2021 13:18:26 -0400 Received: from mga07.intel.com ([134.134.136.100]:3541 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229772AbhJ2RS0 (ORCPT ); Fri, 29 Oct 2021 13:18:26 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10152"; a="294170684" X-IronPort-AV: E=Sophos;i="5.87,193,1631602800"; d="scan'208";a="294170684" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Oct 2021 10:15:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,193,1631602800"; d="scan'208";a="598276447" Received: from brentlu-brix.itwn.intel.com ([10.5.253.1]) by orsmga004.jf.intel.com with ESMTP; 29 Oct 2021 10:15:52 -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 , Rander Wang , Kai Vehmanen , Guennadi Liakhovetski , Brent Lu , Curtis Malainey , Mac Chiang , Bard Liao , linux-kernel@vger.kernel.org, Yong Zhi , Vamshi Krishna Gopal , Bard Liao , Malik_Hsu , Libin Yang , Paul Olaru , Christophe JAILLET , Gongjun Song , Liam Girdwood , Rander Wang , Hans de Goede , Charles Keepax Subject: [PATCH v5 0/6] Multiple headphone codec driver support Date: Sat, 30 Oct 2021 01:14:03 +0800 Message-Id: <20211029171409.611600-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 V4 Changes: - add signoff to patch 4~6 V5 Changes: - none, just rebase for patch 3 conflict 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