Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: 1Yw0iO/a/QqUbS6GbhqnEOT/9vXltmKFdD7CBDGLYRknnJYnNrl197CJccBiDcMxSdVE3ilXUp
 yNt9tceFaW1yEKMFoIiWUJ7WWdSqkGxIz2J5vUkmf6kAcg7yvVVWLjW/lx+sJrouMGMt3GWpcc
 rBjnqFrtINcnzblJKNsKLxalMD6CDFUMW4Ve9McUjued+wY3pnF8j7ZP8X1kn0il7OzsFQI1X1
 MnZSIkUt2cD+pIHzrX1PI3Iv2qa0A7bQK3DZ1PVy9Sj/Rt99XJBEaRWXrzZuOD+bWaciy9cEkg
 N8g=
From:   <Ajay.Kathat@microchip.com>
To:     <linux-wireless@vger.kernel.org>
CC:     <Claudiu.Beznea@microchip.com>, <Nicolas.Ferre@microchip.com>,
        <Sripad.Balwadgi@microchip.com>, <Ajay.Kathat@microchip.com>
Subject: [PATCH wireless-drivers-next 4/5] wilc1000: use unified single
 wilc1000 FW binary
Thread-Topic: [PATCH wireless-drivers-next 4/5] wilc1000: use unified single
 wilc1000 FW binary
Thread-Index: AQHWVnmN/7GFufJWcUuxIpCgE4RRPg==
Date:   Fri, 10 Jul 2020 05:18:31 +0000
Message-ID: <20200710051826.3267-5-ajay.kathat@microchip.com>
References: <20200710051826.3267-1-ajay.kathat@microchip.com>
In-Reply-To: <20200710051826.3267-1-ajay.kathat@microchip.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 93e9e3fa-c8da-43af-d43d-08d82490af86
X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jul 2020 05:18:31.0945
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: sWhVH9Qe8iTvpRycnkd50lVA81yYyQGw1TC9NeikNHE5G+lgy8f3sFmCNS4pjM3Lospaa8eHTINS/fnSkaaM9u1nmTY7DXDSKatbiPmkNw8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4128
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

From: Ajay Singh <ajay.kathat@microchip.com>

Modify WILC1000 binary filename to use single unified wilc1000 FW.
A single wilc1000 binary is used for different wilc1000 revisions.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 .../net/wireless/microchip/wilc1000/Makefile   |  3 +--
 .../net/wireless/microchip/wilc1000/netdev.c   | 18 +++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/Makefile b/drivers/net=
/wireless/microchip/wilc1000/Makefile
index a3305a0a888a..7d1ed5f40cbb 100644
--- a/drivers/net/wireless/microchip/wilc1000/Makefile
+++ b/drivers/net/wireless/microchip/wilc1000/Makefile
@@ -1,8 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_WILC1000) +=3D wilc1000.o
=20
-ccflags-y +=3D -DFIRMWARE_1002=3D\"atmel/wilc1002_firmware.bin\" \
-		-DFIRMWARE_1003=3D\"atmel/wilc1003_firmware.bin\"
+ccflags-y +=3D -DFIRMWARE_WILC1000=3D\"atmel/wilc1000_wifi_firmware.bin\"
=20
 wilc1000-objs :=3D cfg80211.o netdev.o mon.o \
 			hif.o wlan_cfg.o wlan.o
diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net=
/wireless/microchip/wilc1000/netdev.c
index fda0ab97b02c..1005526ae896 100644
--- a/drivers/net/wireless/microchip/wilc1000/netdev.c
+++ b/drivers/net/wireless/microchip/wilc1000/netdev.c
@@ -176,23 +176,19 @@ static int wilc_wlan_get_firmware(struct net_device *=
dev)
 	struct wilc_vif *vif =3D netdev_priv(dev);
 	struct wilc *wilc =3D vif->wilc;
 	int chip_id;
-	const struct firmware *wilc_firmware;
-	char *firmware;
+	const struct firmware *wilc_fw;
=20
 	chip_id =3D wilc_get_chipid(wilc, false);
=20
-	if (chip_id < 0x1003a0)
-		firmware =3D FIRMWARE_1002;
-	else
-		firmware =3D FIRMWARE_1003;
-
-	netdev_info(dev, "loading firmware %s\n", firmware);
+	netdev_info(dev, "ChipID [%x] loading firmware [%s]\n", chip_id,
+		    FIRMWARE_WILC1000);
=20
-	if (request_firmware(&wilc_firmware, firmware, wilc->dev) !=3D 0) {
-		netdev_err(dev, "%s - firmware not available\n", firmware);
+	if (request_firmware(&wilc_fw, FIRMWARE_WILC1000, wilc->dev) !=3D 0) {
+		netdev_err(dev, "%s - firmware not available\n",
+			   FIRMWARE_WILC1000);
 		return -EINVAL;
 	}
-	wilc->firmware =3D wilc_firmware;
+	wilc->firmware =3D wilc_fw;
=20
 	return 0;
 }
--=20
2.24.0