From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 605F516D9BF; Mon, 23 Jun 2025 22:19:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750717158; cv=none; b=MATL8SLZVzT3UAH/M1b3P1fWJ+pNdmxrxoCU0T7GdbKPPF/oj1M2IRoke2TwUXzD4BCmtMgbvBytkUOybowtlmAi48ZBTdAD0foWl+TnTvUEEuNS8bFbIo09waKZ5jniAKCc2O8R/uvbaR235zVEsbEgbP7HqOdtzoNyaTGwmiA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750717158; c=relaxed/simple; bh=NWjkBsarqYqN3Wv2GNpKIEQbZUWzB2+abYrCjVW8tSs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Rq5se56KJ7y7VZjasvwLlkbhktke3GPY+2rjuO2Lb54E29wCJB9nuwEkppyQRF+hxc51lD4bYz793l+WvJJJShoUTd0DJSuSdcWMxtbBbi+5Ka3YcjbEx+JOrROtWLcXNqnhwU7g6uynkxS9VMhRrrsFa+O3+WPt5GIFl3z9/Gw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=AYXk4Ilj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="AYXk4Ilj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE6A6C4CEEA; Mon, 23 Jun 2025 22:19:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750717158; bh=NWjkBsarqYqN3Wv2GNpKIEQbZUWzB2+abYrCjVW8tSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AYXk4IljQt6eiOUFCcpkBflpSdFgDyM8ULr62OD/LzYshpfGrJR7RXSw1i0shUrzs 0GX5IT1m+pQaEtgBLCl4+r2JCzFEzkryuCpd6Uc9S4TJ5WrpphNGjzKWlvlLwTIgUW l0V7PlIiDLsXEaOwuoob/9t8WtmQ9ilS3K9euaO0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, wangdicheng , Takashi Iwai Subject: [PATCH 6.12 331/414] ALSA: usb-audio: Rename ALSA kcontrol PCM and PCM1 for the KTMicro sound card Date: Mon, 23 Jun 2025 15:07:48 +0200 Message-ID: <20250623130650.263599339@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130642.015559452@linuxfoundation.org> References: <20250623130642.015559452@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: wangdicheng commit 93adf20ff4d6e865e0b974110d3cf2f07c057177 upstream. PCM1 not in Pulseaudio's control list; standardize control to "Speaker" and "Headphone". Signed-off-by: wangdicheng Cc: Link: https://patch.msgid.link/20250613063636.239683-1-wangdich9700@163.com Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/mixer_maps.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c @@ -383,6 +383,13 @@ static const struct usbmix_name_map ms_u { 0 } /* terminator */ }; +/* KTMicro USB */ +static struct usbmix_name_map s31b2_0022_map[] = { + { 23, "Speaker Playback" }, + { 18, "Headphone Playback" }, + { 0 } +}; + /* ASUS ROG Zenith II with Realtek ALC1220-VB */ static const struct usbmix_name_map asus_zenith_ii_map[] = { { 19, NULL, 12 }, /* FU, Input Gain Pad - broken response, disabled */ @@ -692,6 +699,11 @@ static const struct usbmix_ctl_map usbmi .id = USB_ID(0x045e, 0x083c), .map = ms_usb_link_map, }, + { + /* KTMicro USB */ + .id = USB_ID(0X31b2, 0x0022), + .map = s31b2_0022_map, + }, { 0 } /* terminator */ };