From: Marcel Holtmann <marcel@holtmann.org>
To: Lubomir Rintel <lkundrak@v3.sk>
Cc: Bing Zhao <bzhao@marvell.com>,
Ben Hutchings <ben@decadent.org.uk>,
David Woodhouse <dwmw2@infradead.org>,
Gustavo Padovan <gustavo@padovan.org>,
Johan Hedberg <johan.hedberg@gmail.com>,
libertas-dev@lists.infradead.org,
linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] bluetooth: btmrvl_sdio: look for sd8688 firmware in proper location
Date: Thu, 17 Jan 2013 23:58:13 -0800 [thread overview]
Message-ID: <1358495893.5510.0.camel@aeonflux> (raw)
In-Reply-To: <1358494643-29765-1-git-send-email-lkundrak@v3.sk>
Hi Lubumir,
proper commit message with explanation here please.
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> ---
> drivers/bluetooth/btmrvl_sdio.c | 8 ++++----
> drivers/bluetooth/btmrvl_sdio.h | 6 ++++--
> 2 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
> index 3f4bfc8..bc27d01 100644
> --- a/drivers/bluetooth/btmrvl_sdio.c
> +++ b/drivers/bluetooth/btmrvl_sdio.c
> @@ -83,8 +83,8 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = {
> };
>
> static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {
> - .helper = "sd8688_helper.bin",
> - .firmware = "sd8688.bin",
> + .helper = "mrvl/sd8688_helper.bin",
> + .firmware = "mrvl/sd8688.bin",
> .reg = &btmrvl_reg_8688,
> .sd_blksz_fw_dl = 64,
> };
> @@ -1179,7 +1179,7 @@ MODULE_AUTHOR("Marvell International Ltd.");
> MODULE_DESCRIPTION("Marvell BT-over-SDIO driver ver " VERSION);
> MODULE_VERSION(VERSION);
> MODULE_LICENSE("GPL v2");
> -MODULE_FIRMWARE("sd8688_helper.bin");
> -MODULE_FIRMWARE("sd8688.bin");
> +MODULE_FIRMWARE("mrvl/sd8688_helper.bin");
> +MODULE_FIRMWARE("mrvl/sd8688.bin");
> MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");
> MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");
> diff --git a/drivers/bluetooth/btmrvl_sdio.h b/drivers/bluetooth/btmrvl_sdio.h
> index 43d35a6..4a5a019 100644
> --- a/drivers/bluetooth/btmrvl_sdio.h
> +++ b/drivers/bluetooth/btmrvl_sdio.h
> @@ -84,7 +84,9 @@ struct btmrvl_sdio_card {
> struct sdio_func *func;
> u32 ioport;
> const char *helper;
> + const char *helper2;
> const char *firmware;
> + const char *firmware2;
And please clear out the patch from left-overs.
> const struct btmrvl_sdio_card_reg *reg;
> u16 sd_blksz_fw_dl;
> u8 rx_unit;
> @@ -92,8 +94,8 @@ struct btmrvl_sdio_card {
> };
>
> struct btmrvl_sdio_device {
> - const char *helper;
> - const char *firmware;
> + const char *helper, *helper2;
> + const char *firmware, *firmware2;
And here as well.
Regards
Marcel
next prev parent reply other threads:[~2013-01-18 7:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-08 23:56 sd8688 firmware location Lubomir Rintel
2013-01-08 23:56 ` [PATCH] Bluetooth: btmrvl_sdio: look for sd8688 firmware in alternate place Lubomir Rintel
2013-01-09 2:28 ` Marcel Holtmann
2013-01-09 2:43 ` Bing Zhao
2013-01-09 6:31 ` Lubomir Rintel
2013-01-09 6:35 ` Marcel Holtmann
2013-01-18 7:33 ` Lubomir Rintel
2013-01-21 1:12 ` Ben Hutchings
2013-01-27 11:21 ` Lubomir Rintel
2013-02-18 3:18 ` Ben Hutchings
2013-01-18 7:37 ` [PATCH] bluetooth: btmrvl_sdio: look for sd8688 firmware in proper location Lubomir Rintel
2013-01-18 7:58 ` Marcel Holtmann [this message]
2013-01-19 19:01 ` Lubomir Rintel
2013-01-19 20:23 ` Marcel Holtmann
2013-01-08 23:57 ` [PATCH] Move sd8688*.bin images away from libertas tree Lubomir Rintel
2013-01-09 22:45 ` sd8688 firmware location Dan Williams
2013-01-10 1:20 ` Bing Zhao
2013-01-18 7:39 ` [PATCH] libertas sdio: look for 8688 firmware in common location Lubomir Rintel
2013-01-21 1:13 ` sd8688 firmware location Ben Hutchings
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358495893.5510.0.camel@aeonflux \
--to=marcel@holtmann.org \
--cc=ben@decadent.org.uk \
--cc=bzhao@marvell.com \
--cc=dwmw2@infradead.org \
--cc=gustavo@padovan.org \
--cc=johan.hedberg@gmail.com \
--cc=libertas-dev@lists.infradead.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lkundrak@v3.sk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).