Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp1646858pxb; Wed, 20 Oct 2021 09:05:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxe7DenAPG5DoYBkTp232olvMM+Z24paJ6f5dzvSVkQlksj7D8ZbFw6fC7cMt1NE20jcJJn X-Received: by 2002:a17:90a:9d81:: with SMTP id k1mr8527561pjp.153.1634745937451; Wed, 20 Oct 2021 09:05:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634745937; cv=none; d=google.com; s=arc-20160816; b=McxJbMY7yISgbLdfw7lWh1k5MXWGcUpy2e6T6frTJj14u46pwKGgZk4bKaRFrzvaZT C8GT8Q2EiA2u55seGAdGKVOzqIykD8bpt7W32Ab8L3uNgMH2mbTgZwYDDqRBFhC9TWtF lOXIwOikazQOO0WvXHmING0Qj7XCpk5y1mIC7eG5n74DksCHM6+jmwCbJbGDXv6+usET m0XpVb590fRLoaMp36zl2QLDMJ40mYvDjqLRKsJdyIjx1OUVVSCzooV6Hz31sKtw71wC 9+YS35873FR/3DcVgWWF/WGtRNKjQMc7MhjajXZfS7fKeVurx9xEAXK9LsADi8dCQMER vZLg== 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=8GaP+TWsl5fK/nWKUf96y07mHSsafBvmhY2y9O6ZDU8=; b=xmIQ8rgrMQgG6mIp6DnSEeoP7EK6syASeTyE17raERhR7YoelB40umt1a4kOAQdmzA SHS7Vlcf3X3hCBxMixbyFgS9mxrrqNXJM+DH36ISRIGD84kyCswDTS9EySBkl2Zb3L3a zz+s5yGtNLXecfGsMnU6cJtH9XPUr51LGo1qNhu/wys8vGVEBwGr+warGTx/x/VjYjD6 MELeVGenzUqeTecjDii8KW00i853T/ub/CCyGe8b1I+mzDmQcXAx8AcPSqpeMTeMUp16 zxGvV8Bjt7LLMThylca5V9g/703XUHf7L3L+pvYdhLqEXAHbDj48Q63q1vnGoFTR5DWb EeMg== 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 x1si4215408pgj.465.2021.10.20.09.05.20; Wed, 20 Oct 2021 09:05:37 -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 S231167AbhJTQGR (ORCPT + 99 others); Wed, 20 Oct 2021 12:06:17 -0400 Received: from mga14.intel.com ([192.55.52.115]:12447 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231163AbhJTQGL (ORCPT ); Wed, 20 Oct 2021 12:06:11 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10143"; a="229088031" X-IronPort-AV: E=Sophos;i="5.87,167,1631602800"; d="scan'208";a="229088031" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2021 08:59:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,167,1631602800"; d="scan'208";a="494685355" Received: from brentlu-brix.itwn.intel.com ([10.5.253.56]) by orsmga008.jf.intel.com with ESMTP; 20 Oct 2021 08:59:07 -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 , Huajun Li , Brent Lu , Paul Olaru , Mac Chiang , Curtis Malainey , Guennadi Liakhovetski , linux-kernel@vger.kernel.org, Yong Zhi , Vamshi Krishna Gopal , Bard Liao , Libin Yang , Gongjun Song , Liam Girdwood , Rander Wang , Hans de Goede , Andy Shevchenko Subject: [PATCH v4 0/6] Multiple headphone codec driver support Date: Wed, 20 Oct 2021 23:57:09 +0800 Message-Id: <20211020155715.2045947-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 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