diff for duplicates of <20160917160633.8767-5-tony@atomide.com> diff --git a/a/1.txt b/N1/1.txt index e540d7f..9fce7be 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,7 +24,7 @@ Let's fix the issue by using the chip specific config firmware data, and make sure we produce understandable warnings if something is missing. -Signed-off-by: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> +Signed-off-by: Tony Lindgren <tony@atomide.com> --- drivers/net/wireless/ti/wlcore/boot.c | 15 +++++++++---- drivers/net/wireless/ti/wlcore/main.c | 36 ++++++++++++++++++++----------- @@ -148,8 +148,8 @@ diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlc @@ -6572,4 +6585,3 @@ MODULE_PARM_DESC(no_recovery, "Prevent HW recovery. FW will remain stuck."); MODULE_LICENSE("GPL"); - MODULE_AUTHOR("Luciano Coelho <coelho-l0cyMroinI0@public.gmane.org>"); - MODULE_AUTHOR("Juuso Oikarinen <juuso.oikarinen-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>"); + MODULE_AUTHOR("Luciano Coelho <coelho@ti.com>"); + MODULE_AUTHOR("Juuso Oikarinen <juuso.oikarinen@nokia.com>"); -MODULE_FIRMWARE(WL12XX_NVS_NAME); diff --git a/drivers/net/wireless/ti/wlcore/wlcore_i.h b/drivers/net/wireless/ti/wlcore/wlcore_i.h --- a/drivers/net/wireless/ti/wlcore/wlcore_i.h @@ -164,3 +164,9 @@ diff --git a/drivers/net/wireless/ti/wlcore/wlcore_i.h b/drivers/net/wireless/ti - * the correct NVS size in wl1271_boot_upload_nvs(). - */ -#define WL12XX_NVS_NAME "ti-connectivity/wl1271-nvs.bin" +- + struct wilink_family_data { + const char *name; + const char *nvs_name; /* wl12xx nvs file */ +-- +2.9.3 diff --git a/a/content_digest b/N1/content_digest index 5958c89..0045d4d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,16 @@ "ref\020160917160633.8767-1-tony@atomide.com\0" - "ref\020160917160633.8767-1-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org\0" - "From\0Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>\0" + "From\0Tony Lindgren <tony@atomide.com>\0" "Subject\0[PATCH 4/5] wlcore: Fix config firmware loading issues\0" "Date\0Sat, 17 Sep 2016 09:06:32 -0700\0" - "To\0Kalle Valo <kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\0" - "Cc\0Eyal Reizer <eyalr-l0cyMroinI0@public.gmane.org>" - Guy Mishol <guym-l0cyMroinI0@public.gmane.org> - Luca Coelho <luciano.coelho-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> - Maital Hahn <maitalm-l0cyMroinI0@public.gmane.org> - Maxim Altshul <maxim.altshul-l0cyMroinI0@public.gmane.org> - Shahar Patury <shaharp-l0cyMroinI0@public.gmane.org> - linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "To\0Kalle Valo <kvalo@codeaurora.org>\0" + "Cc\0Eyal Reizer <eyalr@ti.com>" + Guy Mishol <guym@ti.com> + Luca Coelho <luciano.coelho@intel.com> + Maital Hahn <maitalm@ti.com> + Maxim Altshul <maxim.altshul@ti.com> + Shahar Patury <shaharp@ti.com> + linux-wireless@vger.kernel.org + " linux-omap@vger.kernel.org\0" "\00:1\0" "b\0" "Booting multiple wl12xx and wl18xx devices using the same rootfs is\n" @@ -40,7 +39,7 @@ "data, and make sure we produce understandable warnings if something\n" "is missing.\n" "\n" - "Signed-off-by: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>\n" + "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" "---\n" " drivers/net/wireless/ti/wlcore/boot.c | 15 +++++++++----\n" " drivers/net/wireless/ti/wlcore/main.c | 36 ++++++++++++++++++++-----------\n" @@ -164,8 +163,8 @@ " \n" "@@ -6572,4 +6585,3 @@ MODULE_PARM_DESC(no_recovery, \"Prevent HW recovery. FW will remain stuck.\");\n" " MODULE_LICENSE(\"GPL\");\n" - " MODULE_AUTHOR(\"Luciano Coelho <coelho-l0cyMroinI0@public.gmane.org>\");\n" - " MODULE_AUTHOR(\"Juuso Oikarinen <juuso.oikarinen-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>\");\n" + " MODULE_AUTHOR(\"Luciano Coelho <coelho@ti.com>\");\n" + " MODULE_AUTHOR(\"Juuso Oikarinen <juuso.oikarinen@nokia.com>\");\n" "-MODULE_FIRMWARE(WL12XX_NVS_NAME);\n" "diff --git a/drivers/net/wireless/ti/wlcore/wlcore_i.h b/drivers/net/wireless/ti/wlcore/wlcore_i.h\n" "--- a/drivers/net/wireless/ti/wlcore/wlcore_i.h\n" @@ -179,6 +178,12 @@ "- * ini parameters between them are different. The driver validates\n" "- * the correct NVS size in wl1271_boot_upload_nvs().\n" "- */\n" - "-#define WL12XX_NVS_NAME \"ti-connectivity/wl1271-nvs.bin\"" + "-#define WL12XX_NVS_NAME \"ti-connectivity/wl1271-nvs.bin\"\n" + "-\n" + " struct wilink_family_data {\n" + " \tconst char *name;\n" + " \tconst char *nvs_name;\t/* wl12xx nvs file */\n" + "-- \n" + 2.9.3 -68bc9c478e486b8fbcff4940ef182a9dd34da09aa62377211038d52542cfd69d +ee26ae355f09ed26f3ac2616ba4df45bd05843210cee71368b71a3f92c0eb742
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.