From patchwork Tue Feb 11 03:12:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 1236137 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48GnsZ5v6Vz9sRf; Tue, 11 Feb 2020 14:13:20 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1j1Lz7-000187-HY; Tue, 11 Feb 2020 03:13:13 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1j1Lz6-000180-6q for kernel-team@lists.ubuntu.com; Tue, 11 Feb 2020 03:13:12 +0000 Received: from [114.254.46.93] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1j1Lz5-0005pj-BY for kernel-team@lists.ubuntu.com; Tue, 11 Feb 2020 03:13:11 +0000 From: Hui Wang To: kernel-team@lists.ubuntu.com Subject: [SRU][Focal][PATCH 0/3] change the ASoC card name and card longname to meet the requirement of alsa-lib-1.2.1 (Focal) Date: Tue, 11 Feb 2020 11:12:49 +0800 Message-Id: <20200211031252.6620-1-hui.wang@canonical.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: http://bugs.launchpad.net/bugs/1862712 In the ubuntu-20.04, we integrate the alsa-lib-1.2.1.2, and from the alsa-lib-1.2.1, the ucm is put into a standalone package alsa-ucm-conf, and from the 1.2.1, the alsa-lib supports the ucm2. In the alsa-ucm-conf-1.2.1.2, the ucm2 folders are named by new card name or longname, kernel-v5.5-rc1 has patches to change those names to new names. now we backport them to focal kernel. [Impact] booting with the focal kernel, the audio driver can't find the ucm2 confs, that is becuase alsa-lib-1.2.1 requires new cardname and long name, but focal kernel provides the old card names. [Fix] backport 3 patches from v5.5-rc1. [Test Case] install the 20.04 daily build image, install the linux-firmware and alsa-ucm-conf, booting with the kernel which have those 3 patches, the alsa-lib could find the correct ucm2 confs. [Regression Risk] It is low risk to focal. If users install focal kernel to bionic or disco, it will break the audio since the ucm in the bionic and disco still follow the old card name and longname, we need to link a new copy ucm named by new cardname or longname in the bionic and disco. Jaroslav Kysela (3): ASoC: improve the DMI long card code in asoc-core ASoC: DMI long name - avoid to add board name if matches with product name ASoC: intel - fix the card names .../intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- sound/soc/intel/boards/skl_hda_dsp_generic.c | 2 +- sound/soc/intel/boards/sof_rt5682.c | 2 +- sound/soc/soc-core.c | 67 +++++++------------ 4 files changed, 29 insertions(+), 44 deletions(-)