Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp1146352pxv; Fri, 9 Jul 2021 19:29:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwERs9l5Sj2viy75lErrAgTD6B1lMazUY8GWBmBiX8f6pC7IE/FFRu4x1uZJjmWu7YGeVLX X-Received: by 2002:a05:6402:1592:: with SMTP id c18mr15285547edv.243.1625884162476; Fri, 09 Jul 2021 19:29:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625884162; cv=none; d=google.com; s=arc-20160816; b=TXg+YiBA2djuZZnA069BPecZbhkiAmCF1NlCKFagiXTcEesoc0DpL9w4uZlp1ahBQp 99hWCAKTbWgYXGLsRs9Dx1w40uscFruroaEwp/9PXfCsa2QZFKzos5Wq3M82h3IJoUk1 KDo1sqEQFvyYfGcLVNKavUMJmWE25A6Xter9Mpw5OSRF598ItZnmw/MLsrVTBXU7zDvQ uIB9NCFvaqBmM9JjkwJzUevNfGozk2wcCeeKTnXHzCn/sE/Cvt3j+ixZ+CBrdr6aw20P GyL23SMAms/ycqMshtWUsoOYkBLEWXZPJDOuatxh06X3NzpUGCt00dN+LOakcCdDgL9D AeCA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sJYyGLurCqDMlHRnreLYdh7GBgM0h+hyeLvHjgdueUI=; b=A7PygoY0BPV//su28Di5HbbTmjPLf6b7FVEia/NtBc/w4P+JhocgbZKXKNku0g/y5/ Dn6C+23rq2i6IOuRvo/kh/j/xQ0skNRZdwb7LAzg6n0qKEyvI/dk0+BmW4nmOGTlAqol uMYQGT1mSKw/+1z5N//Y1ai9E/eCFBM/RxIIjUUtQiFdvEEg6xwHoQ9wZJDq9lVWIPv+ iKU19fdaADmFqd1z1SJ+kWPYjvJW4vGuOLDFAuDTXfW5BHc/JdN/lOiclqtUjEB+2eVn /ihOpy+7l9jyBM6UPITon7sdOoVBCVkFWcO0hIsndsNjg58g6ugyG8CDujgcpUZB1Clf DDkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=r427RMGH; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i11si10517097edb.471.2021.07.09.19.28.59; Fri, 09 Jul 2021 19:29:22 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=r427RMGH; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233295AbhGJCat (ORCPT + 99 others); Fri, 9 Jul 2021 22:30:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:42146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233800AbhGJC2E (ORCPT ); Fri, 9 Jul 2021 22:28:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 22AA160BD3; Sat, 10 Jul 2021 02:24:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625883894; bh=wrF8ezly5hOS9kAYOcf2E6X904LNxqEox+vrkpnSTug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r427RMGH8waaWvIp1Y6w7MeLWG6fYC1sTgA3YftJkqZwQB/LrSincyrOJZ5vvN/Sw HGi+8vqSoJR9jQsqNxW4lAIKmYUVwUP+GJZxb6q6SuzT+XJ57Zze1vDlazeoAqHV2Q Tzr4wT+FuXXPMxb/PnCJY6tyUmYGOHlVraRituJ5wfkEK/ZP+/ytf2nCjMYrZZDr/4 4KIGKEmnQJbI+wFUif0/4B9X19fJ6xYfGJvN9kF6WbhNB/4h59vqzOP3MSXu6UOmC+ Ugb6VL+NIqWhhBrDXPJBgeytmROFJEhL1mkxjHrGue/EF/PaOeDy7cjeMVc8vhLwMP mPnB2Ix9AwRxA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Takashi Sakamoto , Takashi Iwai , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.10 19/93] Revert "ALSA: bebob/oxfw: fix Kconfig entry for Mackie d.2 Pro" Date: Fri, 9 Jul 2021 22:23:13 -0400 Message-Id: <20210710022428.3169839-19-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210710022428.3169839-1-sashal@kernel.org> References: <20210710022428.3169839-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Sakamoto [ Upstream commit 5d6fb80a142b5994355ce675c517baba6089d199 ] This reverts commit 0edabdfe89581669609eaac5f6a8d0ae6fe95e7f. I've explained that optional FireWire card for d.2 is also built-in to d.2 Pro, however it's wrong. The optional card uses DM1000 ASIC and has 'Mackie DJ Mixer' in its model name of configuration ROM. On the other hand, built-in FireWire card for d.2 Pro and d.4 Pro uses OXFW971 ASIC and has 'd.Pro' in its model name according to manuals and user experiences. The former card is not the card for d.2 Pro. They are similar in appearance but different internally. Signed-off-by: Takashi Sakamoto Link: https://lore.kernel.org/r/20210518084557.102681-2-o-takashi@sakamocchi.jp Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/firewire/Kconfig | 4 ++-- sound/firewire/bebob/bebob.c | 2 +- sound/firewire/oxfw/oxfw.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig index 9897bd26a438..def1f3d5ecf5 100644 --- a/sound/firewire/Kconfig +++ b/sound/firewire/Kconfig @@ -38,7 +38,7 @@ config SND_OXFW * Mackie(Loud) Onyx 1640i (former model) * Mackie(Loud) Onyx Satellite * Mackie(Loud) Tapco Link.Firewire - * Mackie(Loud) d.4 pro + * Mackie(Loud) d.2 pro/d.4 pro (built-in FireWire card with OXFW971 ASIC) * Mackie(Loud) U.420/U.420d * TASCAM FireOne * Stanton Controllers & Systems 1 Deck/Mixer @@ -84,7 +84,7 @@ config SND_BEBOB * PreSonus FIREBOX/FIREPOD/FP10/Inspire1394 * BridgeCo RDAudio1/Audio5 * Mackie Onyx 1220/1620/1640 (FireWire I/O Card) - * Mackie d.2 (FireWire Option) and d.2 Pro + * Mackie d.2 (optional FireWire card with DM1000 ASIC) * Stanton FinalScratch 2 (ScratchAmp) * Tascam IF-FW/DM * Behringer XENIX UFX 1204/1604 diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c index daeecfa8b9aa..90e98a6d1546 100644 --- a/sound/firewire/bebob/bebob.c +++ b/sound/firewire/bebob/bebob.c @@ -387,7 +387,7 @@ static const struct ieee1394_device_id bebob_id_table[] = { SND_BEBOB_DEV_ENTRY(VEN_BRIDGECO, 0x00010049, &spec_normal), /* Mackie, Onyx 1220/1620/1640 (Firewire I/O Card) */ SND_BEBOB_DEV_ENTRY(VEN_MACKIE2, 0x00010065, &spec_normal), - // Mackie, d.2 (Firewire option card) and d.2 Pro (the card is built-in). + // Mackie, d.2 (optional Firewire card with DM1000). SND_BEBOB_DEV_ENTRY(VEN_MACKIE1, 0x00010067, &spec_normal), /* Stanton, ScratchAmp */ SND_BEBOB_DEV_ENTRY(VEN_STANTON, 0x00000001, &spec_normal), diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c index 9eea25c46dc7..5490637d278a 100644 --- a/sound/firewire/oxfw/oxfw.c +++ b/sound/firewire/oxfw/oxfw.c @@ -355,7 +355,7 @@ static const struct ieee1394_device_id oxfw_id_table[] = { * Onyx-i series (former models): 0x081216 * Mackie Onyx Satellite: 0x00200f * Tapco LINK.firewire 4x6: 0x000460 - * d.4 pro: Unknown + * d.2 pro/d.4 pro (built-in card): Unknown * U.420: Unknown * U.420d: Unknown */ -- 2.30.2