debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

[x86] Staging: Enable R8712U as module (r8712u, replacing r8192s_usb) 

svn path=/dists/trunk/linux-2.6/; revision=16757
This commit is contained in:
Ben Hutchings 2011-01-04 00:26:32 +00:00
parent 22c3fd660c
commit 291ea8476f
5 changed files with 110 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -6,6 +6,8 @@ linux-2.6 (2.6.37~rc8-1~experimental.1) UNRELEASED; urgency=low
* i2c-i801: Include <linux/slab.h> (fixes FTBFS on alpha)
* starfire: Fix dma_addr_t size test for MIPS (fixes FTBFS)
* watchdog: Improve failure message and documentation (Closes: #608138)
* [x86] Staging: Enable R8712U as module (r8712u, replacing r8192s_usb)
- Enable loading external firmware, thanks to Stefan Lippers-Hollmann
-- Ben Hutchings <ben@decadent.org.uk> Tue, 28 Dec 2010 03:15:05 +0000

10
debian/config/kernelarch-x86/config vendored
View File

@ -1135,16 +1135,16 @@ CONFIG_R8187SE=m
##
CONFIG_RTL8192E=m
##
## file: drivers/staging/rtl8192su/Kconfig
##
CONFIG_RTL8192SU=m
##
## file: drivers/staging/rtl8192u/Kconfig
##
CONFIG_RTL8192U=m
##
## file: drivers/staging/rtl8712/Kconfig
##
CONFIG_R8712U=m
##
## file: drivers/staging/samsung-laptop/Kconfig
##

33
debian/patches/features/all/r8712u-Fix-external-firmware-loading.patch vendored Normal file
View File

@ -0,0 +1,33 @@
From: "Stefan Lippers-Hollmann" <s.L-H@gmx.de>
Subject: staging: r8712u: Fix external firmware loading
Date: Fri, 29 Oct 2010 22:03:36 +0200
* select FW_LOADER
* declare MODULE_FIRMWARE for r8712u
Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
---
drivers/staging/rtl8712/Kconfig | 1 +
drivers/staging/rtl8712/hal_init.c | 1 +
2 files changed, 2 insertions(+)
--- a/drivers/staging/rtl8712/Kconfig
+++ b/drivers/staging/rtl8712/Kconfig
@@ -3,6 +3,7 @@ config R8712U
depends on WLAN && USB
select WIRELESS_EXT
select WEXT_PRIV
+ select FW_LOADER
default N
---help---
This option adds the Realtek RTL8712 USB device such as the D-Link DWA-130.
--- a/drivers/staging/rtl8712/hal_init.c
+++ b/drivers/staging/rtl8712/hal_init.c
@@ -58,6 +58,7 @@ static u32 rtl871x_open_fw(struct _adapt
*ppmappedfw = (u8 *)((*praw)->data);
return (*praw)->size;
}
+MODULE_FIRMWARE("rtl8712u/rtl8712u.bin");
static void fill_fwpriv(struct _adapter *padapter, struct fw_priv *pfwpriv)
{

68
debian/patches/features/all/r8712u-Switch-driver-to-use-external-firmware.patch vendored Normal file
View File

@ -0,0 +1,68 @@
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Tue, 26 Oct 2010 10:59:11 -0500
Subject: [PATCH 1/2] staging: r8712u: Switch driver to use external firmware from linux-firmware
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
drivers/staging/rtl8712/TODO | 2 --
drivers/staging/rtl8712/hal_init.c | 22 +++++++++++++++++-----
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8712/TODO b/drivers/staging/rtl8712/TODO
index 5c88821..ed22b0b 100644
--- a/drivers/staging/rtl8712/TODO
+++ b/drivers/staging/rtl8712/TODO
@@ -4,8 +4,6 @@ TODO:
- switch to use MAC80211
- checkpatch.pl fixes - only a few remain
- sparse fixes
-- switch from large inline firmware file to use the firmware interface
- and add the file to the linux-firmware package.
Please send any patches to Greg Kroah-Hartman <greg@kroah.com>,
Larry Finger <Larry.Finger@lwfinger.net> and
diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c
index 32088a6..014fbbc 100644
--- a/drivers/staging/rtl8712/hal_init.c
+++ b/drivers/staging/rtl8712/hal_init.c
@@ -31,7 +31,6 @@
#include "osdep_service.h"
#include "drv_types.h"
#include "rtl871x_byteorder.h"
-#include "farray.h"
#include "usb_osintf.h"
#define FWBUFF_ALIGN_SZ 512
@@ -40,11 +39,24 @@
static u32 rtl871x_open_fw(struct _adapter *padapter, void **pphfwfile_hdl,
const u8 **ppmappedfw)
{
- u32 len;
+ int rc;
+ const char firmware_file[] = "rtl8712u/rtl8712u.bin";
+ const struct firmware **praw = (const struct firmware **)
+ (pphfwfile_hdl);
+ struct dvobj_priv *pdvobjpriv = (struct dvobj_priv *)
+ (&padapter->dvobjpriv);
+ struct usb_device *pusbdev = pdvobjpriv->pusbdev;
- *ppmappedfw = f_array;
- len = sizeof(f_array);
- return len;
+ printk(KERN_INFO "r8712u: Loading firmware from \"%s\"\n",
+ firmware_file);
+ rc = request_firmware(praw, firmware_file, &pusbdev->dev);
+ if (rc < 0) {
+ printk(KERN_ERR "r8712u: Unable to load firmware\n");
+ printk(KERN_ERR "r8712u: Install latest linux-firmware\n");
+ return 0;
+ }
+ *ppmappedfw = (u8 *)((*praw)->data);
+ return (*praw)->size;
}
static void fill_fwpriv(struct _adapter *padapter, struct fw_priv *pfwpriv)
--
1.7.1

2
debian/patches/series/base vendored
View File

@ -47,3 +47,5 @@
+ bugfix/all/i2c-i801-Include-linux-slab.h.patch
+ bugfix/mips/starfire-Fix-dma_addr_t-size-test-for-MIPS.patch
+ features/all/watchdog-Improve-failure-message-and-documentation.patch
+ features/all/r8712u-Switch-driver-to-use-external-firmware.patch
+ features/all/r8712u-Fix-external-firmware-loading.patch