From patchwork Thu Sep 26 04:07:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neeraj Sanjay Kale X-Patchwork-Id: 830841 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011010.outbound.protection.outlook.com [52.101.70.10]) (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 A2C841D5ADE; Thu, 26 Sep 2024 04:07:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.10 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727323627; cv=fail; b=sXYJ+rtw5gXv/uLizXKebzGr0K0DeFnGoAJoNCrJGAi/L0L1NJlQpOvsPZXUYZvf9N90iISl+ZplevB/iJSolN7QvUuce1j7508asyLAJUw2sk246tOG+wwWr6Cj6v8Hk7nKl2Dmbqni45ip6ZGAPC4e/ayVHAOg4gMzXfw7g48= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727323627; c=relaxed/simple; bh=4Mlgv93H5SUJxlojkN4Ml/YX+WUpEVq/Wmn8toGRO7Q=; h=From:To:Cc:Subject:Date:Message-Id:Content-Type:MIME-Version; b=UVE6fQfOci5FgqfheBfRTTy66R8SUYtwqcWLYClSSQ8SlSW//FdxC5db5Sjg4PyIbJ4dB3IK+RRT8P14drgYoIWN/JPfL4+lZPaGcSMxWnkXF0VFuPj5nJvNXyqHE2Cp4CoIRrybFxQkOTERjlho6G+BrppbPLPr7ysIT7hULuc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=ODlqdAon; arc=fail smtp.client-ip=52.101.70.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="ODlqdAon" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nkX6mulEHovbQ25Ezwreid9FbWCELkjFfU/N0Nv+VJQjZG/1kQFtN97IWGFzrXev80f31atDkAybkidLWU1mgXPDS1N09pfmLsnuYBv/3Q5kojy+AqhRlXHzAqkt2iarzy+W5slnUMyEuWS+rymTNfIQw+ynabFAF5HqhCfWQ4pkxAG53X1oA7+sJSmhc3XdPzrL4hY8LOl0OMlpq59kq3koOq83ZsPqZ9H8ulDBSDZ4fSNK5FA1Be0u5R3Ws7E5dbnQxK7phx/pmANskGHDqH2Gr+su8jQSzsB4AzZ5g3ChONNaHfY/ghHq+LP4Cz1iKdzQvPAwasr7JKGsBTEdjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ju1WeKtg5l7okRqOJlSeh7BVQkCDysc9jzWbSTQE9sA=; b=ji8YHqy0ZoSrbbmnGlniS5eSNlZzjSeLYV+vrooAwOuZau/SEcH4dfEM8vIBgKbGF57bE9STGhABM25qR4pqHBtDJAKctIJzs3K6rQwtdiJXsh455L51qLUZbBdKxKAlG2hF4UYmi4XN3U4+7+L7UKLfc5I2RwnNWfx3pQXW6d8jZi70PZggSmsiV2TGQ7yhtvP0aGAfPN1M5fV5Pxvi6G9pyZC6ToET8aLcnJckWHj1J/22gZ9omuxczdUpdaD8M2I/zfvEKtMY5NbRUwxHcm7KXmp4u00MmWaON0hPv9TcXvy1feAelTecscAnuyv3WhExMiF5cEq9eJL1xWQ9+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ju1WeKtg5l7okRqOJlSeh7BVQkCDysc9jzWbSTQE9sA=; b=ODlqdAoni+948FhMQVObtK1aEsSaAsryk446UAbw3fED4n8RciXs51jPKacjq7JvbPsmYEq+Qgvy9TMwpmzxtQqbDe5fu0xZDJWR0AbqV0egtR8PMtZe8t7oNUAEYX3HUIufHf/iVxGD2lrd7/ncKnYNiu1Ct+cC32NaNPh8KbhDjo3TXXLgOwbzt0MaNhZwyflE6H/d0fvHs5VCTKOGTcwHKIo5sBER8BB8kuFIaX76VxQHdLgNhuNdDGY4LE/ztCB9fYqoxlSELXhdAJcCfIzTDTwdtMVyQ7qbt90rMov/EN3dSx/d1WShFNhh0NOipEpMh4LRVSzL44heh3uZxA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PA4PR04MB9687.eurprd04.prod.outlook.com (2603:10a6:102:270::15) by VE1PR04MB7392.eurprd04.prod.outlook.com (2603:10a6:800:1b2::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.17; Thu, 26 Sep 2024 04:06:56 +0000 Received: from PA4PR04MB9687.eurprd04.prod.outlook.com ([fe80::742e:a5ac:15f4:116a]) by PA4PR04MB9687.eurprd04.prod.outlook.com ([fe80::742e:a5ac:15f4:116a%7]) with mapi id 15.20.7982.022; Thu, 26 Sep 2024 04:06:56 +0000 From: Neeraj Sanjay Kale To: marcel@holtmann.org, luiz.dentz@gmail.com Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, amitkumar.karwar@nxp.com, rohit.fule@nxp.com, neeraj.sanjaykale@nxp.com, yuzhi.jin@nxp.com, sherry.sun@nxp.com, ziniu.wang_1@nxp.com, haibo.chen@nxp.com, LnxRevLi@nxp.com Subject: [PATCH v2 1/2] Bluetooth: btnxpuart: Drop _v0 suffix from FW names Date: Thu, 26 Sep 2024 09:37:56 +0530 Message-Id: <20240926040757.375999-1-neeraj.sanjaykale@nxp.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: SG2PR02CA0056.apcprd02.prod.outlook.com (2603:1096:4:54::20) To PA4PR04MB9687.eurprd04.prod.outlook.com (2603:10a6:102:270::15) Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PA4PR04MB9687:EE_|VE1PR04MB7392:EE_ X-MS-Office365-Filtering-Correlation-Id: 3dd2370b-9199-43e9-3014-08dcdde0a962 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: Lc2F/7iL+S39KTK8Y3KW7TYfT72Cb76yawP1VVPvXr4NcgvnkTvOhU1JCad9h20PZD0keonTDuRGzWMbbLCSKJlang/59rC85MDoaAfiSnVRj01C9qUnDcB1wR/2y7wSydhvme6SD1YixDe+6OYWaR7FHc0FDSbFeFEVen1DXLvPXj4oXgPfsEAN9vfjqCS7I/kAuLwHqEGHguwMWi1nBF+kdjf1GOaOwHI8TOIrtAWC18tFu4Al3jSak8zbt135+uNMtTPzpAnAIfZQ1mzmr7vuRH1WmMxWBu/18KPE2Z2aAG2ixFbrDYtUfEsJCeQp0hqMN3dgNa2MIsbgo+BWNW/Piez9Ca7s2a62sS9wR71eKggZM0fJte3T8dPev/e9iBveWrebtdzKmUv2ezyZXssjrESWi+0q/AqY19Z7r8kTyaNjqlEJAgRE860sMvcs4a71ZvrFmA2kEqzqNvxPXRduKpMeZU7TH4LGLk9sJ0CnH1HlJfkcb4voivumHETTek7VuU4T3doSaMTk5MftzIBynqt4lr5GHx+RaMv1tKr45btIeisFNocTjpJDuiGiiWmSz1x42YKHyTh99QGdWwD9UO+wP6OEH5saqMPiaxH/WwMbmcga1Ygv2Nkclhw1U/alG6XmOk+NybG5m7zhhRVmrAUBBcM1bb1ZkBvsT+UXB96gYP8oF5cFFOdDV77Kk62wyadbR6+HcR0KnTj0wNIbEkh1rDuxT3bSVQiSpLg4OOahlTp8XO1+DRWUMdC/lf2Fj1UMsF6cE0EzYC8g8K6ZH07lGa4s37i95ucjkSsGpaC7GfEZaVZAJxcSI0RlB6aucYTDDJLcaP6TS8TMRtcTJB/Fdu68XBV9ffHdQuiIuZl4ip9QYEN8vsmLhtyZlwvMLcsJuvewssQnX4HphHJp5L2ff/9ObUfVaOvzGlJL12QC0npJpqc070TVqOhiOmWB8QjdaNfm2RB6LnCZvRfyHehbxucy1fJJola7cADdT3wuEJX7Xvru9+Va/jMJU/BnrFkIWKHULYLePOgN7YawnGREjSYPK992hCIYdcl9lFO0H7CWn4xLaxxnHJbuhee/V7/UuoJCoiZpMRFFRN3xvwx9PHinSsipkeMABxZkRS7jbeGtkxPF7yZrWsZnniL+ce1TSWGhE/nbekjuv/1+AAKZ6syOtnkAJqPkjVB4eiAuHQWS4xaR2IwOCTXdsP+hsmj9mEEzOZlFKHlose0sqdS0UZbsmCwbgwO2EUeqnRKXs4+LICNTdFbvAjajGsUee2CMrMQWCswzQaS/ll6n0kkSd7qk4e/WhTl7K2B0r1IRUKSKg78544IQ/2roM+9aHK/hgSUbvE+pWpHmk2FiGb1j3ZLVfF6L0j89EoW/4AsghksqRqxoaY+mJ3YCt6jH2WVyZIeq/Brqd7hZ+w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PA4PR04MB9687.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lsUZT2AMbdgXCzn573kxlqinoeZP/lOtstEmVJ8H6Wop71QXmIg+oFBdsOTrwnQ6A0YMHyjvGC6JKegXfxjc97zCAV2cxhh/eoVGIDmHe5oE9zrOktWO1cpB8Q6+WmHOnXYmwYp59+Px0eT1M7sR0zmvrHgEmC4pEJeii9Hzrc3vcCTHuiUgC1erOu4CIA8yA8VURwBNxOJ6bVU439qVTKFzuAeddjUBskzrrbHe+lYIaaLgctvBtLt9kKdDLtGjaQlnOmqozz5X7q6+GXpOV1fqa+r7iyXaB9ESCrItjl1v9TvApn5si3/MV3lzAqMBtmBhYKl6pyR9QOMLOgvY8LcIQBaqkvf/s1+NlC9WaaUjQEFGc01TN1LfL6Oj/NJh/4XKjE7G7BgBMO+TP83V0CT36yC7NpGnCYXV6+STxjcVZp7RoB/etYdyDJQ0zwnCc5INYy4/ryoLT/62beYZeCXf156eYeFpnInCzAzzTdS/qkTuCvgjA3Fm1ByP6Kbud9NC17+ovYiWBt3RJhnbkU8vaoE2Cu/IkiAnOyypINl8XyPRN4BnIBmUNLRYIPh3eXAVJKKV6o5PsyLESKDURg1i3PbQnOQsABInsTq+6t9BBVh1ENKLqZ0pCriNqFSaZb1+sYHBoAGLjBoBQUaXdcyPBaPL2PgbJRpCShAH5w1C6TCgkGn2fJDH3W0c95ztSVfrpoNFfgpT+pe0ua1w0JYUmpEISz1rcXCZEPQ+jkd55zwiSeHGvbzjSHla192xIULDcmu0C0/QZNd//oSMTZFRT3atbym7QKtyEiuR/YcEeTI4x9EPKE0iTWnbV0n/+4dsgfg8Ka3J8Mt3Un/Ay1O8Rqf9A5o3+cNZOqF/oU4dE2Y30ZebGbjZIc/X4p4pXloKHgzxjtQ0DY0eZLQpWaX5B16goNXqhfQx3EpPjwp7yYTyzunace5bIRtWNGAcKj2RxXjG0jCXTm90AnYAOenngswg+CgL+SSCWZketSvYp566UI4PX1qRp5zD1r0Uo8yTs5/Fwpv6X9iBWdmOVJNkbkedPxqAsPpTAot8y/PUt4SVNU9h3NCKL5KkdAXWnZadLPPaDTkWD929IiRlyVcfSsak6yg9KOq+rRJbeE5/zLCDUM3x3AaOKTFnALxH9HUAOcIEpNvHPTXQz3+yuZNU5MVGGCoTVOqLcywtRz53zrBl7LKwWMs6bfG3w5HuAW6SwD+qUkVBcnyc00sc+FOiGh3I5+B1OMNQXVgTBkuEWLRhLLXSMN9MX+OX5mTH8Qoss4QWJ4KFtNTB9mUMianIEdh2N3wR9u+5+5Yffw2YZ94j+9169jOozfplAdE+G6FfXjGMq2I1+hAV4ptaZyjTBpP5dvzH2/Ea/f6tIyfawBiJ5CwKU3Wp5qL6Vd/jsmL5N/azsmo21DKWBYw+vauoaW0vtmhuVgTd1ecCtoM2rZl5S/SAL9CFznB8Yeq5tu5Z+1NN4ZyhSUtdxAmJ4VJRCxWGG1z0z8vNXv8EAneaNoEyAhII/YA3PIwDVqIwuXAFJUa1j2NmAdnzvXK1LzDdNDhyGK2dOOoP0LfaEIodA7a2VtdfiTbq9btdARAYCXg+RjVupRuTXF20fqG7SQ== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3dd2370b-9199-43e9-3014-08dcdde0a962 X-MS-Exchange-CrossTenant-AuthSource: PA4PR04MB9687.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2024 04:06:56.5891 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: LXpdTLkjJHslj3rlxppyFqH/VEEt7+r73HbjQjy2GHrh2MgtMAQNLmcyRpIZ7fB6yTEntfPB2KYVSHkisc0jhCcPkOxVLr+essS1JiaooG0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7392 This updates all FW names by dropping the _v0 suffix. Its been decided that all NXP BT/ WiFi FW names won't support _v0 suffix. The suffix would be kept for next HW versions such as v1, v2 and so on, which do not have backward compatible FW. This change affects W8987, IW416 and IW615 chipsets, out of which new FW files for W8987 and IW615 are yet to be released to broad market. For IW416, old and new FW names are added to maintain backward compatibility for existing customers. Signed-off-by: Neeraj Sanjay Kale --- v2: Add a change for renaming IW615 to IW610 as a patch series. --- drivers/bluetooth/btnxpuart.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/bluetooth/btnxpuart.c b/drivers/bluetooth/btnxpuart.c index 7c2030cec10e..19ab468498ac 100644 --- a/drivers/bluetooth/btnxpuart.c +++ b/drivers/bluetooth/btnxpuart.c @@ -34,16 +34,17 @@ /* NXP HW err codes */ #define BTNXPUART_IR_HW_ERR 0xb0 -#define FIRMWARE_W8987 "uart8987_bt_v0.bin" +#define FIRMWARE_W8987 "uart8987_bt.bin" #define FIRMWARE_W8987_OLD "uartuart8987_bt.bin" #define FIRMWARE_W8997 "uart8997_bt_v4.bin" #define FIRMWARE_W8997_OLD "uartuart8997_bt_v4.bin" #define FIRMWARE_W9098 "uart9098_bt_v1.bin" #define FIRMWARE_W9098_OLD "uartuart9098_bt_v1.bin" -#define FIRMWARE_IW416 "uartiw416_bt_v0.bin" +#define FIRMWARE_IW416 "uartiw416_bt.bin" +#define FIRMWARE_IW416_OLD "uartiw416_bt_v0.bin" #define FIRMWARE_IW612 "uartspi_n61x_v1.bin.se" -#define FIRMWARE_IW615 "uartspi_iw610_v0.bin" -#define FIRMWARE_SECURE_IW615 "uartspi_iw610_v0.bin.se" +#define FIRMWARE_IW615 "uartspi_iw610.bin" +#define FIRMWARE_SECURE_IW615 "uartspi_iw610.bin.se" #define FIRMWARE_IW624 "uartiw624_bt.bin" #define FIRMWARE_SECURE_IW624 "uartiw624_bt.bin.se" #define FIRMWARE_AW693 "uartaw693_bt.bin" @@ -971,6 +972,9 @@ static char *nxp_get_old_fw_name_from_chipid(struct hci_dev *hdev, u16 chipid, case CHIP_ID_W9098: fw_name_old = FIRMWARE_W9098_OLD; break; + case CHIP_ID_IW416: + fw_name_old = FIRMWARE_IW416_OLD; + break; } return fw_name_old; } From patchwork Thu Sep 26 04:07:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neeraj Sanjay Kale X-Patchwork-Id: 831317 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011010.outbound.protection.outlook.com [52.101.70.10]) (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 DBE97170A3A; Thu, 26 Sep 2024 04:07:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.10 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727323629; cv=fail; b=QWjkNvEbdtdVim9w1aEp6yjimA35ISYek5hPsHJscuZWCT4j6UA2mO2payzeNqZX07hoo9i9Ynt66uWdiiLUsoOFQLN9zubhS3dcTK2U+9Xa4A5dBW4OJoAeyCfT2vm3rLA32riIBMVUD+kY88TOdkAiqBQ7IfWNGssWCGwuouQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727323629; c=relaxed/simple; bh=0yRwUiQPyep2SSyGnOhngMifAmHmqAcp109vRpJOS2c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=ssOP2VpcwJa20hCKSlgZ5sHMCfSTj7EWn/k0dABGPIrlLjGSqz9dY5Uws5EmeCBUNOW9/+pzq+bgYrlBBsWTgxRC7fTBgj9cKdin2e7H5nMc91/nw06ejsqEWlD+Dr4In73FiEZG7kVVdsnDfYOLNmfgS9Ij+6W3ygbflhVhcLQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=Fc5q5YtK; arc=fail smtp.client-ip=52.101.70.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="Fc5q5YtK" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QJtlNwiICtcct74xgM3wmtzh6axthEricY7QUrhucvCrcvGM0kEkzRgDTGWawe0zXaqdGC6OqjEx+KEBFXkAX1haMeHRJd9t5IXWJaBpqDe5TwgfPFynK/AV9YPGNLCZt8hBNaRFdv4oleKHpzdIkBs6LQvHjsC0qBD7M+Bzs7MEmuOaeYIoTEew9IoabiSZh6+Zr+shTUVRQ1ZPr3bfJyyJaiprYXvky0xAtmbF6oTvEZMOAv67E4Bp/RZ85wIlioUdkbLW9qIItEOBR62nHb4o1UyoZgfs3iDy86+SAbZJac3d2jJifelIJWFRFlf5h3iGPCnzfLzoW0py08eIzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+fvBEHIGnHyxuoSzJ77vyossG+kCCO4KO1+nL+ZZQY0=; b=MGZZD+8/ic0yHw1eVpOe7QO5V1SzLbDbnWyLaZ9fdhQGulAPne4qyT8VtV6jmV2vkMeW8PIuXYxtVXy6gMZQkPhFMdE0fJb1LYpCnGxMY2r8qGPI0HrGw41U5vjPyIbyvsc6mb7AmA6UdhvnHjxa/IyKBO54lH1FMlZAEymtYL5GdqC7uX1W6lrtmDhC6MrNHqnS5Pem1BbWrhRivfvvhZvROKTNXeAWGVB8SyUWmdY3zNb95qgK/mM2mePTB/kKOUIbqTRjtEoMpLcK5MotztQZPqkuUJeLaZ0vGXHbbq3vHrk5VhTQxipsXETVMNt4Eh5GyeGAPlzRqktARZsAGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+fvBEHIGnHyxuoSzJ77vyossG+kCCO4KO1+nL+ZZQY0=; b=Fc5q5YtKh7wseVj13u0DNbhIeTusVaiZoEluh1KURPoDjsJbLNqiTJAccLAxMXpNoL8lovzwgi6v5oWt4rSbtZxQLLMBeCHbtnGZUXomIt+QIYV9v5sBDp/E9XBdurDuGiNbKYj3qg47T/ve+S+iBIh+I+9OUrgh58E9zMGYJm28+2hW5CxOqzebp0AX/9dqTwMRIpqOIpJYdZvROd+xT9GTyx/JZKuUfOkozGtv498FwUKibVyBYieQYucDKHerYd2hd/xC3qb/huGvjOmumekTKzpSY5+Ays136sZtQP5OXN5FDS0pWJ35Gmq5kWvw1F9wF8DXjxR0QFOWneQRcg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PA4PR04MB9687.eurprd04.prod.outlook.com (2603:10a6:102:270::15) by VE1PR04MB7392.eurprd04.prod.outlook.com (2603:10a6:800:1b2::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.17; Thu, 26 Sep 2024 04:07:00 +0000 Received: from PA4PR04MB9687.eurprd04.prod.outlook.com ([fe80::742e:a5ac:15f4:116a]) by PA4PR04MB9687.eurprd04.prod.outlook.com ([fe80::742e:a5ac:15f4:116a%7]) with mapi id 15.20.7982.022; Thu, 26 Sep 2024 04:07:00 +0000 From: Neeraj Sanjay Kale To: marcel@holtmann.org, luiz.dentz@gmail.com Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, amitkumar.karwar@nxp.com, rohit.fule@nxp.com, neeraj.sanjaykale@nxp.com, yuzhi.jin@nxp.com, sherry.sun@nxp.com, ziniu.wang_1@nxp.com, haibo.chen@nxp.com, LnxRevLi@nxp.com Subject: [PATCH v2 2/2] Bluetooth: btnxpuart: Rename IW615 to IW610 Date: Thu, 26 Sep 2024 09:37:57 +0530 Message-Id: <20240926040757.375999-2-neeraj.sanjaykale@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240926040757.375999-1-neeraj.sanjaykale@nxp.com> References: <20240926040757.375999-1-neeraj.sanjaykale@nxp.com> X-ClientProxiedBy: SG2PR02CA0056.apcprd02.prod.outlook.com (2603:1096:4:54::20) To PA4PR04MB9687.eurprd04.prod.outlook.com (2603:10a6:102:270::15) Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PA4PR04MB9687:EE_|VE1PR04MB7392:EE_ X-MS-Office365-Filtering-Correlation-Id: 8764ceb1-d9d4-4b58-9363-08dcdde0ab6a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: yM2ViqJjiXap6/aa+VjYZTRfj/lt/am5U8JqcERcELRYGW1VIB52yYJwpa6xvNL8lwEYwPpo3wbcbDN8gbXaKcfVobR7YlusYS+st48PnF4ZwaxMUjZ+StgsD0FE6W97OgyhxRiDe1KSMGIYMJ4uEmZ53INyJK/UnB+sR/eXpdwUQRx0EPjYEIIqmGq8XWNPk3gQQMiCFfN180Sbt8EwIRXlkwbgzOFZtxnNWyCCba6HajvqevetkiL1+1LZaAdQwuXFl4FIMyLRPNc4EPLbrypjpUwdrkBV73ia6A+QOrC+YM09wetcfON2G2GXzlBdOEvfZIKJ/SBnyjowVoX4pOXJe2EKCrg2Vm+XjeTT/dpYqtYEzwgAQAVyeQI6g9CNwQEvFyb7XK80/gsKRS/IJN++XciUmDfquE+5quPF09ib7cXsQRDBUOAKCw7jGsF2jw8SmW/piMUDuI4Z1UEaJRghMW3ehpLmJ7YzMzrV2t5evQL5kqgwavfFtbdyIxoBfQKUQtRW89tBJEJ4Ft+Z/k7q0ydnoSuMG0PSLBuP6SW50o6vA+AhB7zaW7Y8CcoyaP/F8Pc1ehK+jOYep1wf28YMmW7b/7SnZuTl5PX5lVJdLY6rIEcTgESPlsyjO/0e9chBwwGVgTA3cteVz2mc5uywWKGsINFEqxqIusuGjEIq4CsKM7Y6LWRFOfc7OVeD4T0nOLigBGtdyDpy0WLtTQmzE5VJiBfzKWDW2wuDLxoNavH56ll6GQbMk+1A/nd1Vaze3EK4w3FeYUl0IdE0MAVDrxuAr06p1J9RTk95SxbiSRmZDs76JwgpJvW9D1pFWc9r96yyn51lIqI7OSSlFcyHq1K0JNEUX9TsahMc0oTclz1M0VCiD+96ANYxy0xZ/uTdOBZsIlX1Do+gElVK+iXGtgvjXy8YaQen94I7eS3xDMn4DZin/PT5ss0/yduQ64sjHeAl8pFtrHwnE1E1mVUWSR2FsEciNH4Txh4FknyqofDnWeEOxBbp+Z6ia2f/wU4/EhpDXD2B3E2UIZZftus4QD9u3uRKm30aUJcdL8KNKjKdZRUG11lc+xOCqxrr5WDp4jc/F6NuvR1dRqpXR1UjxKoyn9BaVhTNgREkNJb1WMYgxGjeECWzDfREgcdha53nXxZH6GlW9jW3i2gquJSv0VuWTdnAzh3EFt3cMG4CFdmH3UN+WagdnpXXReGa4eY2Or/dn77+s22kcPfqr4KUqeGWEH4l+dXmfpB0Lbo2pSs4pKAy0WpTwrkNSQvIc7QuOh4rpws5rO9LJFYPMbYq+H5eKy2+e2EBGoWK20G5ggPGQgnUbe926FFfo1t25U2Tv5gRemN7Ovhv4EXgX9gCINo6A1H1SK4zwsEwm8sgVIOVUMjp4Ecn0qNcZRoMJj6NYo7sk2By4FmtSso3Nw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PA4PR04MB9687.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cdZzLB0rrEKBt2ubnRrezbq8eDx8LYnuUDjHM90qhPBa8it0qpz5BZ1RwYEIULYSvf5qAUBD4yMgBnz2+rqoWWSECJdiwZoXEWT7pM68+pgW01iKQ67WqI8BluAaCGjGP5lkJYlHNuC6+DCAOTHqIE6KdXLPUPlNUyiFNI+FoFgZ5wYBHx/TdllzDwKRRGprXlboR+b9AcCdr5Gkd22brfS+2cNFZcl+L6mSJW8q862N1Az3zGOakXnBXb7pOQkemom+AUJ8vyLZMIFIP/pRNEWjCjmb14k6yUuIliaLFNqeNjPpJY1BAtLET8S5Bm2ThnGIraFwN3+MepM9zuCA60deKY+p3CYmJA2lWvAqd4Gy6aa3jCLdI+UuV1hFeCghyOIl+TcW3u54xqowGaKMXVt34mDM4jabe6aHxTutbYDMFtXcxTzOAdSWZ4qyW6gQF1Pe9vs1ArXtLgJzEqu98T8iDWlYi75YDxtOTpYNY+q9iyRfms03UPy8uoAuwAkVfEBeebbX5kw69T4kfwGWUC7EPR5tQgBKpdAfzGv4qpSp5JEgXazH4nVLCPANXhP9RlWfe48uOcGMAKQd0Weplr2x5/3VeDR7L/DqYTVnT8yoKv6JzZhEaN0RynAuwA00wwkGTKEex/aP9Vk1NJvUNjM0Ilq4KVB5b4LKKBBwrsPKcxGx+qUcJU5p9kEVSuewRk1oUhhNYgpdWI0krffSr4XG8Xt9OUaM2afuSvFgCmEkyZRUuowJUyKx5I7d92RlV7yi2L5BPG2neOmGO3IY3NlgSF8bs8H7jhEa/146InZC5p9/SPxW5l9AS2OWofzK+FOF2dp1hwsqgrNMV3ba7ld78xJly/1Tp+rsrabiLQROn/4RnDWaM2BppTlaBPH+F/LiNSrq6qHwhj3o0nnbOF9+drrkNP/iGjdF5eUWQWw2pvryx6JLiWVCYwiXHBXLUYgDjJVEIztYzLvtyunRRZrRwtzmmXC14BhwmdAeoQ+KSRrosfh2eLrXgM2ZjNBpHP1Kj4I5k/pyDBjhU8P0cdWLey3CoT8YDLWngBNxN23j3u8i7OWFPdvif0klb3RU+Ezoc1e9+ga3te3jIUx50b9w+/ME/VLfGv67KT9jt7/XCKVBufM/3R4wWq4T5amBBkNvCl2LPQJLxPp+jGr/7M5Fdhy9sc5z+muadZthy05XLuvDgsAdAuSIOFbZZUnQd6zNKr5aXmDqdGSkf5cFeyE4njS1gE8LE/r6vCPO/feMc1jg7DTZBEebASPvzVeJXHcK92dP1XHDM+8ewOLJvmAkkeHwECQ5+fqO7oB9pKA4IIVJ87d4pXqSjXBlOyWXd7ic00/2nX78yrR+VMmLwwbx4aO+oDM58BFXO/NVetfR81Tc+SXRZ2qFq7nqwyt9s3t5yq+QS4q3JlisLc416yzprG/gsOTlMOukii5o2jOkTZ4PKeH8nL+oRgCf1V0RtV2ltgNo+BXL7TKICA2TPhqrE9yO3Yja+bVXJDIjio+K7sUV9oInBqdKjL+XFdpET5dapBjjNU8S9NIHD4me7WSX4tRqgYRNaLxGpvLGrkY0YFIrZYiodbGrwg3YSFuOVoFtcNIUqAaD0X/6YCPoug== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8764ceb1-d9d4-4b58-9363-08dcdde0ab6a X-MS-Exchange-CrossTenant-AuthSource: PA4PR04MB9687.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2024 04:06:59.9570 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MpsczczEbIO8gWyZTFlHhtCfr+1lrRjIEeE8kRFp25hKDnSZIAkwfG2roMspJAowN96x+VF5qFmUgfseDHdI6OdyqyJoHunVSoTZkphq0xg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7392 This changes the chip name of IW615 to IW610. IW610 (formerly called IW615) is yet to be released to broad market, hence there is no issue of backward compatibility. Signed-off-by: Neeraj Sanjay Kale --- drivers/bluetooth/btnxpuart.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/bluetooth/btnxpuart.c b/drivers/bluetooth/btnxpuart.c index 19ab468498ac..2b8a07c745c9 100644 --- a/drivers/bluetooth/btnxpuart.c +++ b/drivers/bluetooth/btnxpuart.c @@ -43,8 +43,8 @@ #define FIRMWARE_IW416 "uartiw416_bt.bin" #define FIRMWARE_IW416_OLD "uartiw416_bt_v0.bin" #define FIRMWARE_IW612 "uartspi_n61x_v1.bin.se" -#define FIRMWARE_IW615 "uartspi_iw610.bin" -#define FIRMWARE_SECURE_IW615 "uartspi_iw610.bin.se" +#define FIRMWARE_IW610 "uartspi_iw610.bin" +#define FIRMWARE_SECURE_IW610 "uartspi_iw610.bin.se" #define FIRMWARE_IW624 "uartiw624_bt.bin" #define FIRMWARE_SECURE_IW624 "uartiw624_bt.bin.se" #define FIRMWARE_AW693 "uartaw693_bt.bin" @@ -60,8 +60,8 @@ #define CHIP_ID_IW624c 0x8001 #define CHIP_ID_AW693a0 0x8200 #define CHIP_ID_AW693a1 0x8201 -#define CHIP_ID_IW615a0 0x8800 -#define CHIP_ID_IW615a1 0x8801 +#define CHIP_ID_IW610a0 0x8800 +#define CHIP_ID_IW610a1 0x8801 #define FW_SECURE_MASK 0xc0 #define FW_OPEN 0x00 @@ -947,12 +947,12 @@ static char *nxp_get_fw_name_from_chipid(struct hci_dev *hdev, u16 chipid, else bt_dev_err(hdev, "Illegal loader version %02x", loader_ver); break; - case CHIP_ID_IW615a0: - case CHIP_ID_IW615a1: + case CHIP_ID_IW610a0: + case CHIP_ID_IW610a1: if ((loader_ver & FW_SECURE_MASK) == FW_OPEN) - fw_name = FIRMWARE_IW615; + fw_name = FIRMWARE_IW610; else if ((loader_ver & FW_SECURE_MASK) != FW_AUTH_ILLEGAL) - fw_name = FIRMWARE_SECURE_IW615; + fw_name = FIRMWARE_SECURE_IW610; else bt_dev_err(hdev, "Illegal loader version %02x", loader_ver); break;