All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 3.4-rc4 1/1] mwifiex: add support for SD8786 sdio
@ 2012-04-24  4:41 Jason Plum
  2012-04-24  5:00 ` Julian Calaby
  0 siblings, 1 reply; 5+ messages in thread
From: Jason Plum @ 2012-04-24  4:41 UTC (permalink / raw)
  To: Bing Zhao; +Cc: linux-wireless

From: Jason Plum <max@warheads.net>

Date:   Mon Apr 23 23:54:47 2012 -0400

    mwifiex: add support for SD8786 sdio

        modified:   drivers/net/wireless/mwifiex/Kconfig
        - notate additional chipset
        modified:   drivers/net/wireless/mwifiex/sdio.c
        - add definition of id (0x9116)
        - add to switch for firmware load
        - add MODULE_FIRMWARE
        modified:   drivers/net/wireless/mwifiex/sdio.h
        - add definition of default firmware name

    Signed-off-by: Jason Plum <max@warheads.net>
---

diff --git a/drivers/net/wireless/mwifiex/Kconfig
b/drivers/net/wireless/mwifiex/Kconfig
index 2a078ce..48c4c32 100644
--- a/drivers/net/wireless/mwifiex/Kconfig
+++ b/drivers/net/wireless/mwifiex/Kconfig
@@ -10,12 +10,12 @@ config MWIFIEX
          mwifiex.

 config MWIFIEX_SDIO
-       tristate "Marvell WiFi-Ex Driver for SD8787/SD8797"
+       tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797"
        depends on MWIFIEX && MMC
        select FW_LOADER
        ---help---
          This adds support for wireless adapters based on Marvell
-         8787/8797 chipsets with SDIO interface.
+         8786/8787/8797 chipsets with SDIO interface.

          If you choose to build it as a module, it will be called
          mwifiex_sdio.
diff --git a/drivers/net/wireless/mwifiex/sdio.c
b/drivers/net/wireless/mwifiex/sdio.c
index f8012e2..74981ab 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -250,6 +250,8 @@ static int mwifiex_sdio_resume(struct device *dev)
        return 0;
 }

+/* Device ID for SD8786 */
+#define SDIO_DEVICE_ID_MARVELL_8786   (0x9116)
 /* Device ID for SD8787 */
 #define SDIO_DEVICE_ID_MARVELL_8787   (0x9119)
 /* Device ID for SD8797 */
@@ -257,6 +259,7 @@ static int mwifiex_sdio_resume(struct device *dev)

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH 3.4-rc4 1/1] mwifiex: add support for SD8786 sdio
  2012-04-24  4:41 [PATCH 3.4-rc4 1/1] mwifiex: add support for SD8786 sdio Jason Plum
@ 2012-04-24  5:00 ` Julian Calaby
  2012-04-24 11:37   ` Jason Plum
  0 siblings, 1 reply; 5+ messages in thread
From: Julian Calaby @ 2012-04-24  5:00 UTC (permalink / raw)
  To: Jason Plum; +Cc: Bing Zhao, linux-wireless

Hi Jason,

On Tue, Apr 24, 2012 at 14:41, Jason Plum <max@warheads.net> wrote:
> From: Jason Plum <max@warheads.net>
>
> Date:   Mon Apr 23 23:54:47 2012 -0400
>
>    mwifiex: add support for SD8786 sdio

> diff --git a/drivers/net/wireless/mwifiex/Kconfig
> b/drivers/net/wireless/mwifiex/Kconfig
> index 2a078ce..48c4c32 100644
> --- a/drivers/net/wireless/mwifiex/Kconfig
> +++ b/drivers/net/wireless/mwifiex/Kconfig
> @@ -10,12 +10,12 @@ config MWIFIEX
>          mwifiex.
>
>  config MWIFIEX_SDIO
> -       tristate "Marvell WiFi-Ex Driver for SD8787/SD8797"
> +       tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797"
>        depends on MWIFIEX && MMC
>        select FW_LOADER
>        ---help---
>          This adds support for wireless adapters based on Marvell
> -         8787/8797 chipsets with SDIO interface.
> +         8786/8787/8797 chipsets with SDIO interface.
>
>          If you choose to build it as a module, it will be called
>          mwifiex_sdio.
> diff --git a/drivers/net/wireless/mwifiex/sdio.c
> b/drivers/net/wireless/mwifiex/sdio.c
> index f8012e2..74981ab 100644
> --- a/drivers/net/wireless/mwifiex/sdio.c
> +++ b/drivers/net/wireless/mwifiex/sdio.c
> @@ -250,6 +250,8 @@ static int mwifiex_sdio_resume(struct device *dev)
>        return 0;
>  }
>
> +/* Device ID for SD8786 */
> +#define SDIO_DEVICE_ID_MARVELL_8786   (0x9116)
>  /* Device ID for SD8787 */
>  #define SDIO_DEVICE_ID_MARVELL_8787   (0x9119)
>  /* Device ID for SD8797 */
> @@ -257,6 +259,7 @@ static int mwifiex_sdio_resume(struct device *dev)

The rest of the patch doesn't seem to have made it to the list.

Do you want to resend it?

Thanks,

-- 
Julian Calaby

Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
.Plan: http://sites.google.com/site/juliancalaby/

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH 3.4-rc4 1/1] mwifiex: add support for SD8786 sdio
  2012-04-24  5:00 ` Julian Calaby
@ 2012-04-24 11:37   ` Jason Plum
  0 siblings, 0 replies; 5+ messages in thread
From: Jason Plum @ 2012-04-24 11:37 UTC (permalink / raw)
  To: Julian Calaby; +Cc: Bing Zhao, linux-wireless

Hi Julian,

Indeed. Carpe Noctem failed me last night apparently. I shall re-submit shortly.

On Tue, Apr 24, 2012 at 1:00 AM, Julian Calaby <julian.calaby@gmail.com> wrote:
> Hi Jason,
>
> .. code ..
>
> The rest of the patch doesn't seem to have made it to the list.
>
> Do you want to resend it?
>
> Thanks,
>
> --
> Julian Calaby
>
> Email: julian.calaby@gmail.com
> Profile: http://www.google.com/profiles/julian.calaby/
> .Plan: http://sites.google.com/site/juliancalaby/



-- 
Maximus*
WarheadsSE
MaxSource

^ permalink raw reply	[flat|nested] 5+ messages in thread
* RE: [PATCH 3.4-rc4 1/1] mwifiex: add support for SD8786 sdio
  2012-04-24 11:43 Jason Plum
@ 2012-04-24 18:34 ` Bing Zhao
  0 siblings, 0 replies; 5+ messages in thread
From: Bing Zhao @ 2012-04-24 18:34 UTC (permalink / raw)
  To: Jason Plum; +Cc: linux-wireless

Hi Jason

Thanks for the patch.

> From: Jason Plum <max@warheads.net>
> 
> Author: Jason Plum <max@warheads.net>
> Date:   Mon Apr 23 23:54:47 2012 -0400
> 
>     mwifiex: add support for SD8786 sdio
> 
>         modified:   drivers/net/wireless/mwifiex/Kconfig
>         - notate additional chipset
>         modified:   drivers/net/wireless/mwifiex/sdio.c
>         - add definition of id (0x9116)
>         - add to switch for firmware load
>         - add MODULE_FIRMWARE
>         modified:   drivers/net/wireless/mwifiex/sdio.h
>         - add definition of default firmware name
> 
>     Signed-off-by: Jason Plum <max@warheads.net>
> ---
> 
> Prior transmittal was truncated.

This patch seems corrupt and I cannot apply.

Could you please generate the patch with "git format-patch" and re-submit it with "git send-email"?

Thanks,
Bing

> 
> 
> diff --git a/drivers/net/wireless/mwifiex/Kconfig
> b/drivers/net/wireless/mwifiex/Kconfig
> index 2a078ce..48c4c32 100644
> --- a/drivers/net/wireless/mwifiex/Kconfig
> +++ b/drivers/net/wireless/mwifiex/Kconfig
> @@ -10,12 +10,12 @@ config MWIFIEX
>           mwifiex.
> 
>  config MWIFIEX_SDIO
> -       tristate "Marvell WiFi-Ex Driver for SD8787/SD8797"
> +       tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797"
>         depends on MWIFIEX && MMC
>         select FW_LOADER
>         ---help---
>           This adds support for wireless adapters based on Marvell
> -         8787/8797 chipsets with SDIO interface.
> +         8786/8787/8797 chipsets with SDIO interface.
> 
>           If you choose to build it as a module, it will be called
>           mwifiex_sdio.
> diff --git a/drivers/net/wireless/mwifiex/sdio.c
> b/drivers/net/wireless/mwifiex/sdio.c
> index f8012e2..74981ab 100644
> --- a/drivers/net/wireless/mwifiex/sdio.c
> +++ b/drivers/net/wireless/mwifiex/sdio.c
> @@ -250,6 +250,8 @@ static int mwifiex_sdio_resume(struct device *dev)
>         return 0;
>  }
> 
> +/* Device ID for SD8786 */
> +#define SDIO_DEVICE_ID_MARVELL_8786   (0x9116)
>  /* Device ID for SD8787 */
>  #define SDIO_DEVICE_ID_MARVELL_8787   (0x9119)
>  /* Device ID for SD8797 */
> @@ -257,6 +259,7 @@ static int mwifiex_sdio_resume(struct device *dev)
> 
>  /* WLAN IDs */
>  static const struct sdio_device_id mwifiex_ids[] = {
> +       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8786)},
>         {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787)},
>         {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797)},
>         {},
> @@ -1596,6 +1599,9 @@ static int mwifiex_register_dev(struct
> mwifiex_adapter *adapter)
>         adapter->dev = &func->dev;
> 
>         switch (func->device) {
> +       case SDIO_DEVICE_ID_MARVELL_8786:
> +               strcpy(adapter->fw_name, SD8786_DEFAULT_FW_NAME);
> +               break;
>         case SDIO_DEVICE_ID_MARVELL_8797:
>                 strcpy(adapter->fw_name, SD8797_DEFAULT_FW_NAME);
>                 break;
> @@ -1804,5 +1810,6 @@ MODULE_AUTHOR("Marvell International Ltd.");
>  MODULE_DESCRIPTION("Marvell WiFi-Ex SDIO Driver version " SDIO_VERSION);
>  MODULE_VERSION(SDIO_VERSION);
>  MODULE_LICENSE("GPL v2");
> +MODULE_FIRMWARE(SD8786_DEFAULT_FW_NAME);
>  MODULE_FIRMWARE(SD8787_DEFAULT_FW_NAME);
>  MODULE_FIRMWARE(SD8797_DEFAULT_FW_NAME);
> diff --git a/drivers/net/wireless/mwifiex/sdio.h
> b/drivers/net/wireless/mwifiex/sdio.h
> index a3fb322..572d7dd 100644
> --- a/drivers/net/wireless/mwifiex/sdio.h
> +++ b/drivers/net/wireless/mwifiex/sdio.h
> @@ -28,6 +28,7 @@
> 
>  #include "main.h"
> 
> +#define SD8786_DEFAULT_FW_NAME "mrvl/sd8786_uapsta.bin"
>  #define SD8787_DEFAULT_FW_NAME "mrvl/sd8787_uapsta.bin"
>  #define SD8797_DEFAULT_FW_NAME "mrvl/sd8797_uapsta.bin"

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH 3.4-rc4 1/1] mwifiex: add support for SD8786 sdio
@ 2012-04-24 11:43 Jason Plum
  2012-04-24 18:34 ` Bing Zhao
  0 siblings, 1 reply; 5+ messages in thread
From: Jason Plum @ 2012-04-24 11:43 UTC (permalink / raw)
  To: Bing Zhao; +Cc: linux-wireless

From: Jason Plum <max@warheads.net>

Author: Jason Plum <max@warheads.net>
Date:   Mon Apr 23 23:54:47 2012 -0400

    mwifiex: add support for SD8786 sdio

        modified:   drivers/net/wireless/mwifiex/Kconfig
        - notate additional chipset
        modified:   drivers/net/wireless/mwifiex/sdio.c
        - add definition of id (0x9116)
        - add to switch for firmware load
        - add MODULE_FIRMWARE
        modified:   drivers/net/wireless/mwifiex/sdio.h
        - add definition of default firmware name

    Signed-off-by: Jason Plum <max@warheads.net>
---

Prior transmittal was truncated.


diff --git a/drivers/net/wireless/mwifiex/Kconfig
b/drivers/net/wireless/mwifiex/Kconfig
index 2a078ce..48c4c32 100644
--- a/drivers/net/wireless/mwifiex/Kconfig
+++ b/drivers/net/wireless/mwifiex/Kconfig
@@ -10,12 +10,12 @@ config MWIFIEX
          mwifiex.

 config MWIFIEX_SDIO
-       tristate "Marvell WiFi-Ex Driver for SD8787/SD8797"
+       tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797"
        depends on MWIFIEX && MMC
        select FW_LOADER
        ---help---
          This adds support for wireless adapters based on Marvell
-         8787/8797 chipsets with SDIO interface.
+         8786/8787/8797 chipsets with SDIO interface.

          If you choose to build it as a module, it will be called
          mwifiex_sdio.
diff --git a/drivers/net/wireless/mwifiex/sdio.c
b/drivers/net/wireless/mwifiex/sdio.c
index f8012e2..74981ab 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -250,6 +250,8 @@ static int mwifiex_sdio_resume(struct device *dev)
        return 0;
 }

+/* Device ID for SD8786 */
+#define SDIO_DEVICE_ID_MARVELL_8786   (0x9116)
 /* Device ID for SD8787 */
 #define SDIO_DEVICE_ID_MARVELL_8787   (0x9119)
 /* Device ID for SD8797 */
@@ -257,6 +259,7 @@ static int mwifiex_sdio_resume(struct device *dev)

 /* WLAN IDs */
 static const struct sdio_device_id mwifiex_ids[] = {
+       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8786)},
        {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787)},
        {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797)},
        {},
@@ -1596,6 +1599,9 @@ static int mwifiex_register_dev(struct
mwifiex_adapter *adapter)
        adapter->dev = &func->dev;

        switch (func->device) {
+       case SDIO_DEVICE_ID_MARVELL_8786:
+               strcpy(adapter->fw_name, SD8786_DEFAULT_FW_NAME);
+               break;
        case SDIO_DEVICE_ID_MARVELL_8797:
                strcpy(adapter->fw_name, SD8797_DEFAULT_FW_NAME);
                break;
@@ -1804,5 +1810,6 @@ MODULE_AUTHOR("Marvell International Ltd.");
 MODULE_DESCRIPTION("Marvell WiFi-Ex SDIO Driver version " SDIO_VERSION);
 MODULE_VERSION(SDIO_VERSION);
 MODULE_LICENSE("GPL v2");
+MODULE_FIRMWARE(SD8786_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(SD8787_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(SD8797_DEFAULT_FW_NAME);
diff --git a/drivers/net/wireless/mwifiex/sdio.h
b/drivers/net/wireless/mwifiex/sdio.h
index a3fb322..572d7dd 100644
--- a/drivers/net/wireless/mwifiex/sdio.h
+++ b/drivers/net/wireless/mwifiex/sdio.h
@@ -28,6 +28,7 @@

 #include "main.h"

+#define SD8786_DEFAULT_FW_NAME "mrvl/sd8786_uapsta.bin"
 #define SD8787_DEFAULT_FW_NAME "mrvl/sd8787_uapsta.bin"
 #define SD8797_DEFAULT_FW_NAME "mrvl/sd8797_uapsta.bin"

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-04-24 18:35 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-24  4:41 [PATCH 3.4-rc4 1/1] mwifiex: add support for SD8786 sdio Jason Plum
2012-04-24  5:00 ` Julian Calaby
2012-04-24 11:37   ` Jason Plum
2012-04-24 11:43 Jason Plum
2012-04-24 18:34 ` Bing Zhao

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.