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 614711591F9; Fri, 29 Mar 2024 12:31:46 +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=1711715506; cv=none; b=oN6IIkaTKzcgiu3QY0JwyRo2B3Cdnh/tIfotc/CR9F08icQa+ol2QmB06Wb+knklSOiZB6ngHJntUUxVMEtQjVeJF4y03saeDDHnWCImo4jR6Wx53aF48Bfs1aqobMSU6f3gYTiu7pvLjdxRPmaIj8rlV8v/eXkcqIu2kEJjykk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711715506; c=relaxed/simple; bh=kCYlsjnjhRCFwW3ooyxlXYFDVmS7Q+NdhjZM27HwCFQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QQRisyfV7hwFCokJvpNcjFBRn3a6rcPDZ+I0oC6dvMpwlk3vlj6ZdMo3uKwYdfVDQrgjYIVpw7PIskwe3axwJqmiXU0PhaaayAt0kec0b5FhgcSjGpVgW/8rH5NB2NDC6R2JJIs5KxuJhIm2w455Wc/5P5xnTc2Em+5GXOxixNw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=E7iFq4x7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="E7iFq4x7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0290C433F1; Fri, 29 Mar 2024 12:31:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711715506; bh=kCYlsjnjhRCFwW3ooyxlXYFDVmS7Q+NdhjZM27HwCFQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E7iFq4x7oD4/JWsqdONnz4T6IxIagaN13WoTq2yENRA7rtBb+HJLnrrjGH/9Ri58i SeEFEfkiFWStt9PyC5Sl5ccPLUfwaMfDPC60f4AiYsXYtfzUTL/9kRJhWzqNScqUMm 13uvqeoyjgZYL4GACkqSVrHnO28sIxWtpVMfApdqZP6O4WYQM34gvqEjpp4IpjF62H JDds9kiyTsEscDcj23Lb6EnDbR4f0eIpLfDTtD0aFenN/5URlPiui7Ewg593gtQvkn B+oC3+HmuLpIa3yb20J2wj4quxwYxx/jbTKR5DN4yQuXNA9MgqwihypQvPIYLqQiOM 0qeqVl8F6U45g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Takashi Iwai , Paul Menzel , Matthias Brugger , Luiz Augusto von Dentz , Sasha Levin , marcel@holtmann.org, luiz.dentz@gmail.com, angelogioacchino.delregno@collabora.com, linux-bluetooth@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 6.6 51/52] Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922 Date: Fri, 29 Mar 2024 08:29:21 -0400 Message-ID: <20240329122956.3083859-51-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240329122956.3083859-1-sashal@kernel.org> References: <20240329122956.3083859-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.23 Content-Transfer-Encoding: 8bit From: Takashi Iwai [ Upstream commit 3e465a07cdf444140f16bc57025c23fcafdde997 ] Since dracut refers to the module info for defining the required firmware files and btmtk driver doesn't provide the firmware info for MT7922, the generate initrd misses the firmware, resulting in the broken Bluetooth. This patch simply adds the MODULE_FIRMWARE() for the missing entry for covering that. Link: https://bugzilla.suse.com/show_bug.cgi?id=1214133 Signed-off-by: Takashi Iwai Reviewed-by: Paul Menzel Reviewed-by: Matthias Brugger Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- drivers/bluetooth/btmtk.c | 1 + drivers/bluetooth/btmtk.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c index aaabb732082cd..e5138a207f371 100644 --- a/drivers/bluetooth/btmtk.c +++ b/drivers/bluetooth/btmtk.c @@ -420,5 +420,6 @@ MODULE_LICENSE("GPL"); MODULE_FIRMWARE(FIRMWARE_MT7622); MODULE_FIRMWARE(FIRMWARE_MT7663); MODULE_FIRMWARE(FIRMWARE_MT7668); +MODULE_FIRMWARE(FIRMWARE_MT7922); MODULE_FIRMWARE(FIRMWARE_MT7961); MODULE_FIRMWARE(FIRMWARE_MT7925); diff --git a/drivers/bluetooth/btmtk.h b/drivers/bluetooth/btmtk.h index 56f5502baadf9..cbcdb99a22e6d 100644 --- a/drivers/bluetooth/btmtk.h +++ b/drivers/bluetooth/btmtk.h @@ -4,6 +4,7 @@ #define FIRMWARE_MT7622 "mediatek/mt7622pr2h.bin" #define FIRMWARE_MT7663 "mediatek/mt7663pr2h.bin" #define FIRMWARE_MT7668 "mediatek/mt7668pr2h.bin" +#define FIRMWARE_MT7922 "mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin" #define FIRMWARE_MT7961 "mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin" #define FIRMWARE_MT7925 "mediatek/mt7925/BT_RAM_CODE_MT7925_1_1_hdr.bin" -- 2.43.0