Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
To:     linux-wireless@vger.kernel.org,
        Amitkumar Karwar <amitkarwar@gmail.com>,
        Ganapathi Bhat <ganapathi017@gmail.com>,
        Sharvari Harisangam <sharvari.harisangam@nxp.com>,
        Xinming Hu <huxinming820@gmail.com>
Cc:     Andrejs Cainikovs <andrejs.cainikovs@toradex.com>,
        Kalle Valo <kvalo@kernel.org>,
        "David S . Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Brian Norris <briannorris@chromium.org>,
        =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>,
        =?UTF-8?q?Alvin=20=C5=A0ipraga?= <alsi@bang-olufsen.dk>,
        Francesco Dolcini <francesco.dolcini@toradex.com>,
        netdev@vger.kernel.org
Subject: [PATCH v2 2/2] mwifiex: Add SD8997 SDIO-UART firmware
Date:   Fri, 22 Apr 2022 11:03:13 +0200
Message-Id: <20220422090313.125857-3-andrejs.cainikovs@toradex.com>
In-Reply-To: <20220422090313.125857-1-andrejs.cainikovs@toradex.com>
References: <20220422090313.125857-1-andrejs.cainikovs@toradex.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SnMIsQcNd0CrpkoMJ8aySGQfmRXA2gv89s9VL5KWinMx9dbC2Ol6X4tlNb5q?=
 =?us-ascii?Q?C0OSAitQdPV7IJWWTuavZo812kHqo3aYQ6pF6A4zWoqUP9syf+FffHX3eqoy?=
 =?us-ascii?Q?9fMamgXkosWfin3jDZJXwK3AMnXsulBDl7gmL1yXu/gwWldwHAVg8h5Ddd19?=
 =?us-ascii?Q?vUDzaDJ7Gq4jgWiAcfqWS63AvNgBb1quAi2KhTXAinUSpaih6WJIQxE5wkIM?=
 =?us-ascii?Q?16iMwlDJnwwI46GY9k6YEIbeUuehti4y/BU9UW1UPgumIBMxtroo1eaYwyQP?=
 =?us-ascii?Q?ggsR+7MG60utjEY5I5ja5IynZAwdcc7qdu9ziUjB3GXEMuBLhuvMNI9akdYO?=
 =?us-ascii?Q?MnLru5fPAnNJL6yE7TKEb3/smTcQS5ULIv9eH+R3hEagJi2XZcp5b3fSo2dW?=
 =?us-ascii?Q?eyFgqBE/roOljDCSn7j+q+1Itz1x1z02K0gXNdnWmmi0G7Ulcg2d5vBmRRFv?=
 =?us-ascii?Q?cePdDgACjuo1pGEapJvF9kfSqgQ4ev8GJdyNZlL7tOCEtLOYx3pXSX48/Jtr?=
 =?us-ascii?Q?Hy2v5tKh+ozs42gob9gFTFLIdz+SS+Uu1QCrn7kFpQVEkTP4d+AACxk2ZOFt?=
 =?us-ascii?Q?gxTx1nf1icFGNuAtXhpFfjoKYoCWvLrrtIg+19+Ma0JS7AbX277+L7MqX+gc?=
 =?us-ascii?Q?FPfzCw+xOdXdckzs3dAXe5kkMlgMQuKdxOFz0fPvUA3izFhwGXHCfdHQgtkB?=
 =?us-ascii?Q?ne8l3CYNGdEpTgARIpljcXC/WMQOymY2u3F1+jv4gyMmwvItu83LOlSiGodV?=
 =?us-ascii?Q?LgAyApzHKO7A+JGFXT1Iza7mLqoN6r03Me67ZGkxK7bLr2QQW8ScoUIAfNyC?=
 =?us-ascii?Q?p3KMiMd3eBVXfBUJEKsMAyQrF3o19YiZRpuJPz59f+rLpSHUhc9ByaEQVe8r?=
 =?us-ascii?Q?6qPCZazyN/+uEcNyHsqenNGdhsJ4qowD+Xvvn8cvds0scOGemjzoJ/JKCoyx?=
 =?us-ascii?Q?bQSjuUz8fdrWxMT2rbjGApv2s6b6vrZd4/lb1morRGVPMdsxRNMlOhUZEZR6?=
 =?us-ascii?Q?ZjQ69GeX09pbU/GAKFdXFX33r7zbHxCy0vikXpTAUx5nfxD+FLUXD3l/ZBui?=
 =?us-ascii?Q?vsNY2PuIo2wjnESZySnDeawaR6LebBT+V7Gl+hekSaUuFqC4INqc1uCB3SGc?=
 =?us-ascii?Q?8YdDeBhGxFXn/BQG60aBCQDFlNeaGnR4o07CF9XttF0Jm1i2MzFUaX4zR7ar?=
 =?us-ascii?Q?HrLtE74Vte2NN3Y58z3EyrO5e7X/yJRpzLChdlRoynCoMIONcJE5YJuao3eD?=
 =?us-ascii?Q?IHNfW87HNmIeOW3ECp91x8RM6rLtMvcTOLq9Q1BKgx3gnLDvqd+Jpt8ATcoT?=
 =?us-ascii?Q?Gm8vBQPS2uWLTPB7Ttg+2/0j6Mvp7s7bxCFxSgOHFP53MIFqJ5gBgGb0VyNy?=
 =?us-ascii?Q?N+8NXyDeZBke7r7HhT2EvGB0SVv8WSSN829RnmBL8XMNUs8WqqerYOEiQKjl?=
 =?us-ascii?Q?qkIgeJtB3qfXGgTJafNnFF1Mbue62CkaCinZ4PN95MYtd6gfeR933L7+OsOu?=
 =?us-ascii?Q?5sPr5hj7BNKcdQS5zBctml+Izy1y2scm6tnkpe2cMVnbztzyCjK4FqHIOUqT?=
 =?us-ascii?Q?+KCBr1cn/K/h0wbvWyUcAm4UGzDj5UCku71PxpeWg55yZF8bsUNEaRLgkk0x?=
 =?us-ascii?Q?G+CzFfi+A73Tc8U2f+KJm4s5tkM6uNnjeXXS1WbrfYlVyYVPIE5RgriJVAMZ?=
 =?us-ascii?Q?0zdtsCO8HqTrORJxESD8Zjka4T5YKxyW+9eNcIxKyBHTR85R1aYiLCRYy0XM?=
 =?us-ascii?Q?Bv3FJ16h4ESzDP4apveMHc2fLvJpnlc=3D?=
X-OriginatorOrg: toradex.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 82bc273e-0f4d-4692-f99a-08da243eff7c
X-MS-Exchange-CrossTenant-AuthSource: GVAP278MB0929.CHEP278.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2022 09:03:42.0080
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: d9995866-0d9b-4251-8315-093f062abab4
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: CrHs5R0QV+RwyyTbQHnZ9gXQf0qXJ6Giqg6OXsLWfeR0bi5flUd9/1I0SH8PuXZoVdZhL9Zv6nYXwEaB+AoX5N7WYYzwfLv17c/g3PWMnmY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZR0P278MB0393
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

With a recent change now it is possible to detect the strapping
option on SD8997, which allows to pick up a correct firmware
for either SDIO-SDIO or SDIO-UART.

This commit enables SDIO-UART firmware on SD8997.

Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
---
 drivers/net/wireless/marvell/mwifiex/sdio.c | 2 ++
 drivers/net/wireless/marvell/mwifiex/sdio.h | 1 +
 2 files changed, 3 insertions(+)

diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c
index d26efd56be08..76004bda0c02 100644
--- a/drivers/net/wireless/marvell/mwifiex/sdio.c
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
@@ -408,6 +408,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8977 = {
 
 static const struct mwifiex_sdio_device mwifiex_sdio_sd8997 = {
 	.firmware = SD8997_DEFAULT_FW_NAME,
+	.firmware_sdiouart = SD8997_SDIOUART_FW_NAME,
 	.reg = &mwifiex_reg_sd8997,
 	.max_ports = 32,
 	.mp_agg_pkt_limit = 16,
@@ -3176,3 +3177,4 @@ MODULE_FIRMWARE(SD8887_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(SD8977_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(SD8987_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(SD8997_DEFAULT_FW_NAME);
+MODULE_FIRMWARE(SD8997_SDIOUART_FW_NAME);
diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.h b/drivers/net/wireless/marvell/mwifiex/sdio.h
index ad2c28cbb630..28e8f76bdd58 100644
--- a/drivers/net/wireless/marvell/mwifiex/sdio.h
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.h
@@ -39,6 +39,7 @@
 #define SD8977_DEFAULT_FW_NAME "mrvl/sdsd8977_combo_v2.bin"
 #define SD8987_DEFAULT_FW_NAME "mrvl/sd8987_uapsta.bin"
 #define SD8997_DEFAULT_FW_NAME "mrvl/sdsd8997_combo_v4.bin"
+#define SD8997_SDIOUART_FW_NAME "mrvl/sdiouart8997_combo_v4.bin"
 
 #define BLOCK_MODE	1
 #define BYTE_MODE	0
-- 
2.25.1