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>,
        Francesco Dolcini <francesco.dolcini@toradex.com>,
        netdev@vger.kernel.org
Subject: [PATCH 2/2] mwifiex: Add SD8997 SDIO-UART firmware
Date:   Fri,  8 Apr 2022 09:51:00 +0200
Message-Id: <20220408075100.10458-3-andrejs.cainikovs@toradex.com>
In-Reply-To: <20220408075100.10458-1-andrejs.cainikovs@toradex.com>
References: <20220408075100.10458-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?sr6YgcxRfMH14Du5Ji446S9HuPAduq19JDZcHE25HoQ8rhIC2rN6E39osaqp?=
 =?us-ascii?Q?ccmVehqi0YHcFtdAj7p4Cu2+dvmLT6PO8HzchtnAYyyTfFjWNh0cCL5lAcfr?=
 =?us-ascii?Q?rQJc1jbzZJOah0ehtT9gxSpCT9Q8KxTMjJ5fu4ruwuWhbVXhal7uXSF+1DJ2?=
 =?us-ascii?Q?Y1781zmtUaJKnCM181QiEOqkRSh1fArIcmGHdGEC2USc/IMzakZ2AKOtDztU?=
 =?us-ascii?Q?J/j8NEjIV16c+IqtyQLiivLQW4BoIW9juRVIE+xo0J2Zdktj/Xvpbe0wgXG1?=
 =?us-ascii?Q?EgY6oqIBibIJBZgGyHxaKlry360ojjB05rk9r+9f0/cCYruYR2sjS73lvqQK?=
 =?us-ascii?Q?S3gXelUEH39Fd4RztS65wlCQJxLYihruMvnB4DWWvPIfbkbDlm59rNOHWycA?=
 =?us-ascii?Q?8wah0IfamypkcXBHHyDso/DG+FSBS3IBGiyZZQa1w90Iam9ufvnhvEBst32O?=
 =?us-ascii?Q?9pT1rxVCc5IL70oINUspKI6rexZriaiZrWagBqi/qjk6Iv57BlgphEu+D6PF?=
 =?us-ascii?Q?NxZ3WMn+sCI78KlDHavhVYhUr3gR5EO2rB9JloKdxl5fo4XrTtCv58tOwsmh?=
 =?us-ascii?Q?HYYmfd3OaBpnurZhpPEw5zWIY3P4iq0XGgqH/ak3884SXaRSXESuXWVI5B/Y?=
 =?us-ascii?Q?+3vVnZlrAnd123tdiTkYYI50DYml5Ap2gDQDAdBrkgaj/B0Njr9sX+c+hA4p?=
 =?us-ascii?Q?yLzqOvks/IK+t77laqNv0EWN0pyMKeNVaMjlL3Pj1SMSQ1DToa1hxpV0YO9b?=
 =?us-ascii?Q?dQ2u4XffmcDWqB7X9VZM8+HK6VFW+c1KczqqXM6S3SrYc+FTfmDTcrrZX6A/?=
 =?us-ascii?Q?i8hcZwBh/6dH20SUSCU8v7g/uwgGWdBybGLSyVuNvybYre6xXNPqE3nmrYgN?=
 =?us-ascii?Q?JY2OmM+N+0Pg4A0iF/XDf/efBj8EL0X0vyNFykvb/qLTV685GUjD9OfdLccF?=
 =?us-ascii?Q?uJ1cpMcdYtL6hXetsryQyb0S/LB9Tg+be1pS3SHxswhu3EJqk5QTdDTnA+eg?=
 =?us-ascii?Q?Jx9qPz6QlSOOBg6SNzX+axQ1TFPe38+GKe+xPbPCBcuXhV/6RU1xEgaps1i4?=
 =?us-ascii?Q?V4dzoRj4pTU5aZLWyaiyl0zgLm/C3p47bJ0AHe+SxzAcnd5XOGAg1+v6DIVb?=
 =?us-ascii?Q?/Hbf60qn50zUnLwYHAyLvf+yQHE27P9lrUWDZmISwFqLuAdhmNGa5QLOtTNJ?=
 =?us-ascii?Q?xAOEncbC+XRXVtmwPH4Nd0UMMtAj8zCR+CPCwkscJM+rFK9VmomRIml1pvAv?=
 =?us-ascii?Q?gpmKaVHcg/aUaW+x9s1Nhllf98pLhCR1XzuVszvg3cPcjksWwFLbGkaY/Aqi?=
 =?us-ascii?Q?YEvC7Wo9mnLgs2t5qs5hTdoH+Z/MTzH9XHcxVrIJU5TkxHbFNjmMZHVOvQyR?=
 =?us-ascii?Q?k/KeISTXNci6LV4nmW9W52XYsxH12ss2vtIh3qbZkfI5ZH546liJlrzSiv3h?=
 =?us-ascii?Q?QKjCIaEl9VpqCyYNeHxrEDf9TZTzORb8XErDN2nmIt69vaNM0/bom4nX7hTR?=
 =?us-ascii?Q?PHorQY44uCGCEBRsj1f2a+vQReuR7UHi3uCQBt2PAdauRpPfmGXDeEhyKP1E?=
 =?us-ascii?Q?tSh03gFyrqLdPiyariNQlfo1JOdOkMOm6xG0X+VVBX4zLBxcmrvjg9yHZW5w?=
 =?us-ascii?Q?X8BR+vI+o+XR6rcNAd0KIS5dCplKcOq5PMAZJj3hL/Iu604UTHiwvQMb6vyq?=
 =?us-ascii?Q?l6XgRSiM0lVXmRPwXUTjvK7wLEoPDjRIZLAFEUBW5QUr5QwwsG3vU3on5g30?=
 =?us-ascii?Q?8QVN7sQsr6D74Ew7WE6I0xbUtTGmSxo=3D?=
X-OriginatorOrg: toradex.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4819016d-ae0c-4e14-e60e-08da19348ccd
X-MS-Exchange-CrossTenant-AuthSource: GVAP278MB0929.CHEP278.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2022 07:51:11.8582
 (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: d0ZrYCCLAPeqXMqE3WPsgTY3FCRATlXsf3ZCt9FNLeDNlAyPP6b3HYDnVeA4bv4nda9mY77kZu3orehUTpidbF048OHDBlBIOXa7+a2oHAY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV0P278MB0001
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,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED 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 23160d179485..dd5eb1a370b0 100644
--- a/drivers/net/wireless/marvell/mwifiex/sdio.c
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
@@ -405,6 +405,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,
@@ -3173,3 +3174,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