archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-03-19 00:21:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/linux to 3.1.10-9

Browse source
This commit is contained in:
Kevin Mihelich 2012-04-21 14:39:52 -04:00
parent 1f00e06e89
commit dfd44376f5
4 changed files with 267 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/linux/PKGBUILD
View file

@ -10,7 +10,7 @@ pkgname=('linux' 'linux-headers')
_kernelname=${pkgname#linux}
_basekernel=3.1
pkgver=${_basekernel}.10
pkgrel=8
pkgrel=9
cryptover=1.4
arch=('arm')
url="http://www.kernel.org/"
@ -32,14 +32,14 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2
"http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz")
md5sums=('8d43453f8159b2332ad410b19d86a931'
'a8e1c25a93a685ec2a1c3a808715fe9d'
'6cbe87056f5b821470afb5b1dd4e4403'
'ba4db0041cbc38efedafe5892c05ee2a'
'f5d3635da03cb45904bedd69b47133de'
'3f64ed9d71499fe9293dc671f4e4087e'
'29628745258df910abfb8cb24ca3ccd9'
'c9e6e8bb0774a89f7f9bd30a13be7532'
'55b04499a4578e586cf5a4d0b69fc5aa'
'e3cd152f2bed3fc34036115c5541a707'
'60d351d9833470d35765c75c5ba97359'
'a42c888e3f031a8b17c764d14759a99a'
'd59e3abd4d9eef1d6b359bf6f90845c2'
'9d3c56a4b999c8bfbd4018089a62f662'
'd00814b57448895e65fbbc800e8a58ba'
'7b0ac1c0a88d8fbe7316db02f21666e6')

288
core/linux/archlinuxarm.patch
View file

@ -1,6 +1,6 @@
diff -urN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
--- a/arch/arm/mach-kirkwood/dockstar-setup.c 2011-10-24 07:10:05.000000000 +0000
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2012-04-04 02:41:53.853843526 +0000
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2012-04-19 02:08:10.013036076 +0000
@@ -19,7 +19,6 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@ -54,7 +54,7 @@ diff -urN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/doc
diff -urN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/goflexhome-setup.c
--- a/arch/arm/mach-kirkwood/goflexhome-setup.c 1970-01-01 00:00:00.000000000 +0000
+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c 2012-04-04 02:41:53.853843526 +0000
+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c 2012-04-19 02:08:10.013036076 +0000
@@ -0,0 +1,123 @@
+/*
+ * arch/arm/mach-kirkwood/goflexhome-setup.c
@ -181,7 +181,7 @@ diff -urN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g
+
diff -urN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/goflexnet-setup.c
--- a/arch/arm/mach-kirkwood/goflexnet-setup.c 1970-01-01 00:00:00.000000000 +0000
+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c 2012-04-04 02:41:53.853843526 +0000
+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c 2012-04-19 02:08:10.013036076 +0000
@@ -0,0 +1,176 @@
+/*
+ * arch/arm/mach-kirkwood/goflexnet-setup.c
@ -361,7 +361,7 @@ diff -urN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/go
+
diff -urN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
--- a/arch/arm/mach-kirkwood/guruplug-setup.c 2011-10-24 07:10:05.000000000 +0000
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2012-04-04 02:41:53.853843526 +0000
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2012-04-19 02:08:10.013036076 +0000
@@ -57,22 +57,24 @@
static struct gpio_led guruplug_led_pins[] = {
@ -393,7 +393,7 @@ diff -urN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur
},
diff -urN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/iconnect-setup.c
--- a/arch/arm/mach-kirkwood/iconnect-setup.c 1970-01-01 00:00:00.000000000 +0000
+++ b/arch/arm/mach-kirkwood/iconnect-setup.c 2012-04-04 02:41:53.861656297 +0000
+++ b/arch/arm/mach-kirkwood/iconnect-setup.c 2012-04-19 02:08:10.013036076 +0000
@@ -0,0 +1,203 @@
+/*
+ * arch/arm/mach-kirkwood/iconnect-setup.c
@ -600,8 +600,8 @@ diff -urN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/ico
+MACHINE_END
diff -urN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
--- a/arch/arm/mach-kirkwood/Kconfig 2011-10-24 07:10:05.000000000 +0000
+++ b/arch/arm/mach-kirkwood/Kconfig 2012-04-04 02:41:53.861656297 +0000
@@ -64,6 +64,42 @@
+++ b/arch/arm/mach-kirkwood/Kconfig 2012-04-19 02:14:53.573056073 +0000
@@ -64,6 +64,48 @@
Say 'Y' here if you want your kernel to support the
Seagate FreeAgent DockStar.
@ -640,14 +640,20 @@ diff -urN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
+ help
+ Say 'Y' here if you want your kernel to support the
+ RaidSonic ICY BOX IB-NAS6210 device.
+
+config MACH_TOPKICK
+ bool "USI Topkick"
+ help
+ Say 'Y' here if you want your kernel to support the
+ USI Topkick.
+
config MACH_OPENRD
bool
diff -urN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
--- a/arch/arm/mach-kirkwood/Makefile 2011-10-24 07:10:05.000000000 +0000
+++ b/arch/arm/mach-kirkwood/Makefile 2012-04-04 02:41:53.861656297 +0000
@@ -8,6 +8,12 @@
+++ b/arch/arm/mach-kirkwood/Makefile 2012-04-19 02:13:01.397531110 +0000
@@ -8,6 +8,13 @@
obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o
obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o
obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o
@ -657,12 +663,13 @@ diff -urN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
+obj-$(CONFIG_MACH_POGOPLUGV4) += pogoplugv4-setup.o
+obj-$(CONFIG_MACH_POGO_E02) += pogo_e02-setup.o
+obj-$(CONFIG_MACH_NAS6210) += nas6210-setup.o
+obj-$(CONFIG_MACH_TOPKICK) += topkick-setup.o
obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o
obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o
obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o
diff -urN a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
--- a/arch/arm/mach-kirkwood/mpp.h 2011-10-24 07:10:05.000000000 +0000
+++ b/arch/arm/mach-kirkwood/mpp.h 2012-04-04 02:41:53.861656297 +0000
+++ b/arch/arm/mach-kirkwood/mpp.h 2012-04-19 02:08:10.028661484 +0000
@@ -102,6 +102,7 @@
#define MPP11_SATA0_ACTn MPP( 11, 0x5, 0, 1, 0, 1, 1, 1, 1 )
@ -673,7 +680,7 @@ diff -urN a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
#define MPP12_SPI_MOSI MPP( 12, 0xb, 0, 1, 0, 0, 0, 0, 1 )
diff -urN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6210-setup.c
--- a/arch/arm/mach-kirkwood/nas6210-setup.c 1970-01-01 00:00:00.000000000 +0000
+++ b/arch/arm/mach-kirkwood/nas6210-setup.c 2012-04-04 02:41:53.869469069 +0000
+++ b/arch/arm/mach-kirkwood/nas6210-setup.c 2012-04-19 02:08:10.028661484 +0000
@@ -0,0 +1,185 @@
+/*
+ * arch/arm/mach-kirkwood/nas6210-setup.c
@ -862,7 +869,7 @@ diff -urN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6
+MACHINE_END
diff -urN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pogo_e02-setup.c
--- a/arch/arm/mach-kirkwood/pogo_e02-setup.c 1970-01-01 00:00:00.000000000 +0000
+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c 2012-04-04 02:41:53.869469069 +0000
+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c 2012-04-19 02:08:10.028661484 +0000
@@ -0,0 +1,114 @@
+/*
+ * arch/arm/mach-kirkwood/pogo_e02-setup.c
@ -980,7 +987,7 @@ diff -urN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pog
+MACHINE_END
diff -urN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/pogoplugv4-setup.c
--- a/arch/arm/mach-kirkwood/pogoplugv4-setup.c 1970-01-01 00:00:00.000000000 +0000
+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c 2012-04-04 02:41:53.869469069 +0000
+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c 2012-04-19 02:08:10.028661484 +0000
@@ -0,0 +1,194 @@
+/*
+ * arch/arm/mach-kirkwood/pogoplugv4-setup.c
@ -1178,7 +1185,7 @@ diff -urN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/p
+MACHINE_END
diff -urN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c 2011-10-24 07:10:05.000000000 +0000
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2012-04-04 02:41:53.869469069 +0000
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2012-04-19 02:08:10.028661484 +0000
@@ -43,7 +43,7 @@
.phy_addr = MV643XX_ETH_PHY_ADDR(0),
};
@ -1262,9 +1269,177 @@ diff -urN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/s
else
kirkwood_sdio_init(&sheevaplug_mvsdio_data);
diff -urN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topkick-setup.c
--- a/arch/arm/mach-kirkwood/topkick-setup.c 1970-01-01 00:00:00.000000000 +0000
+++ b/arch/arm/mach-kirkwood/topkick-setup.c 2012-04-19 03:35:41.873757106 +0000
@@ -0,0 +1,164 @@
+/*
+ * arch/arm/mach-kirkwood/topkick-setup.c
+ *
+ * USI Topkick Setup
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/ata_platform.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mv643xx_eth.h>
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <linux/leds.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <mach/kirkwood.h>
+#include <plat/mvsdio.h>
+#include "common.h"
+#include "mpp.h"
+
+static struct mtd_partition topkick_nand_parts[] = {
+ {
+ .name = "u-boot",
+ .offset = 0,
+ .size = 0x180000
+ }, {
+ .name = "u-boot-env",
+ .offset = 0x180000,
+ .size = 128 * 1024
+ }, {
+ .name = "uImage",
+ .offset = 2 * 1024 * 1024,
+ .size = 6 * 1024 * 1024
+ }, {
+ .name = "rootfs",
+ .offset = MTDPART_OFS_NXTBLK,
+ .size = MTDPART_SIZ_FULL
+ },
+};
+
+static struct mv643xx_eth_platform_data topkick_ge00_data = {
+ .phy_addr = MV643XX_ETH_PHY_ADDR(0),
+};
+
+static struct mv_sata_platform_data topkick_sata_data = {
+ .n_ports = 1,
+};
+
+static struct mvsdio_platform_data topkick_mvsdio_data = {
+ .gpio_card_detect = 47, /* MPP47 used as SD card detect */
+};
+
+
+static struct gpio_led topkick_led_pins[] = {
+ {
+ .name = "status:blue:disk",
+ .default_trigger = "none",
+ .gpio = 21,
+ .active_low = 1,
+ },
+ {
+ .name = "status:red:fault",
+ .default_trigger = "none",
+ .gpio = 37,
+ .active_low = 1,
+ },
+ {
+ .name = "status:blue:health",
+ .default_trigger = "default-on",
+ .gpio = 38,
+ .active_low = 1,
+ },
+ {
+ .name = "status:green:misc",
+ .default_trigger = "none",
+ .gpio = 39,
+ .active_low = 1,
+ },
+ {
+ .name = "status:orange:misc",
+ .default_trigger = "none",
+ .gpio = 48,
+ .active_low = 1,
+ },
+};
+
+static struct gpio_led_platform_data topkick_led_data = {
+ .leds = topkick_led_pins,
+ .num_leds = ARRAY_SIZE(topkick_led_pins),
+};
+
+static struct platform_device topkick_leds = {
+ .name = "leds-gpio",
+ .id = -1,
+ .dev = {
+ .platform_data = &topkick_led_data,
+ }
+};
+
+static unsigned int topkick_mpp_config[] __initdata = {
+ MPP12_SD_CLK, /* SDIO Clock */
+ MPP13_SD_CMD, /* SDIO Cmd */
+ MPP14_SD_D0, /* SDIO Data 0 */
+ MPP15_SD_D1, /* SDIO Data 1 */
+ MPP16_SD_D2, /* SDIO Data 2 */
+ MPP17_SD_D3, /* SDIO Data 3 */
+ MPP21_GPIO, /* LED Blue SATA */
+ MPP35_GPIO, /* USB Power Enable */
+ MPP36_GPIO, /* SATA Power Enable */
+ MPP37_GPIO, /* LED Red System */
+ MPP38_GPIO, /* LED Blue System */
+ MPP39_GPIO, /* LED Green Misc/WiFi */
+ MPP43_GPIO, /* WOL Eth WOL */
+ MPP44_GPIO, /* SW GW Mode */
+ MPP45_GPIO, /* SW AP Mode */
+ MPP46_GPIO, /* SW Power Off */
+ MPP47_GPIO, /* SDIO Detect */
+ MPP48_GPIO, /* LED Orange Misc/WiFi */
+ 0
+};
+
+static void __init topkick_init(void)
+{
+ /*
+ * Basic setup. Needs to be called early.
+ */
+ kirkwood_init();
+
+ /* setup gpio pin select */
+ kirkwood_mpp_conf(topkick_mpp_config);
+
+ kirkwood_uart0_init();
+ kirkwood_nand_init(ARRAY_AND_SIZE(topkick_nand_parts), 40);
+
+ if (gpio_request(35, "USB Power Enable") != 0 ||
+ gpio_direction_output(35, 1) != 0)
+ printk(KERN_ERR "can't set up GPIO 35 (USB Power Enable)\n");
+ if (gpio_request(36, "SATA Power Enable") != 0 ||
+ gpio_direction_output(36, 1) != 0)
+ printk(KERN_ERR "can't set up GPIO 36 (SATA Power Enable)\n");
+ kirkwood_ge00_init(&topkick_ge00_data);
+ kirkwood_ehci_init();
+ kirkwood_sata_init(&topkick_sata_data);
+ kirkwood_sdio_init(&topkick_mvsdio_data);
+
+ platform_device_register(&topkick_leds);
+}
+
+MACHINE_START(TOPKICK, "USI Topkick")
+ /* Maintainer: Mike Brown <mbrown@archlinuxarm.org> */
+ .boot_params = 0x00000100,
+ .init_machine = topkick_init,
+ .map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
+ .init_irq = kirkwood_init_irq,
+ .timer = &kirkwood_timer,
+MACHINE_END
diff -urN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
--- a/arch/arm/plat-orion/common.c 2011-10-24 07:10:05.000000000 +0000
+++ b/arch/arm/plat-orion/common.c 2012-04-04 02:41:53.885094613 +0000
+++ b/arch/arm/plat-orion/common.c 2012-04-19 02:08:10.036474256 +0000
@@ -223,7 +223,9 @@
/*****************************************************************************
* GE00
@ -1278,7 +1453,7 @@ diff -urN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
{
diff -urN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
--- a/drivers/mmc/core/core.c 2011-10-24 07:10:05.000000000 +0000
+++ b/drivers/mmc/core/core.c 2012-04-04 02:42:21.354798571 +0000
+++ b/drivers/mmc/core/core.c 2012-04-19 02:08:10.036474256 +0000
@@ -399,9 +399,9 @@
* The limit is really 250 ms, but that is
* insufficient for some crappy cards.
@ -1293,7 +1468,7 @@ diff -urN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
* SDHC cards always use these fixed values.
diff -urN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
--- a/drivers/mmc/core/sd.c 2011-10-24 07:10:05.000000000 +0000
+++ b/drivers/mmc/core/sd.c 2012-04-04 02:42:24.940860607 +0000
+++ b/drivers/mmc/core/sd.c 2012-04-19 02:08:10.036474256 +0000
@@ -388,6 +388,15 @@
return -ENOMEM;
}
@ -1312,7 +1487,7 @@ diff -urN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
goto out;
diff -urN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
--- a/drivers/mmc/host/mvsdio.c 2011-10-24 07:10:05.000000000 +0000
+++ b/drivers/mmc/host/mvsdio.c 2012-04-04 02:42:21.354798571 +0000
+++ b/drivers/mmc/host/mvsdio.c 2012-04-19 02:08:10.044287046 +0000
@@ -21,6 +21,7 @@
#include <linux/irq.h>
#include <linux/gpio.h>
@ -1331,7 +1506,7 @@ diff -urN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
diff -urN a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
--- a/drivers/net/wireless/Kconfig 2011-10-24 07:10:05.000000000 +0000
+++ b/drivers/net/wireless/Kconfig 2012-04-04 02:42:14.206112814 +0000
+++ b/drivers/net/wireless/Kconfig 2012-04-19 02:08:10.044287046 +0000
@@ -51,6 +51,12 @@
---help---
A driver for Marvell Libertas 8388 USB devices using thinfirm.
@ -1347,7 +1522,7 @@ diff -urN a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
depends on ISA_DMA_API && (PCI || BROKEN)
diff -urN a/drivers/net/wireless/libertas/Kconfig b/drivers/net/wireless/libertas/Kconfig
--- a/drivers/net/wireless/libertas/Kconfig 2011-10-24 07:10:05.000000000 +0000
+++ b/drivers/net/wireless/libertas/Kconfig 2012-04-04 02:42:06.323026552 +0000
+++ b/drivers/net/wireless/libertas/Kconfig 2012-04-19 02:08:10.044287046 +0000
@@ -3,6 +3,7 @@
depends on CFG80211
select WIRELESS_EXT
@ -1358,7 +1533,7 @@ diff -urN a/drivers/net/wireless/libertas/Kconfig b/drivers/net/wireless/liberta
---help---
diff -urN a/drivers/net/wireless/libertas_uap/Makefile b/drivers/net/wireless/libertas_uap/Makefile
--- a/drivers/net/wireless/libertas_uap/Makefile 1970-01-01 00:00:00.000000000 +0000
+++ b/drivers/net/wireless/libertas_uap/Makefile 2012-04-04 02:42:14.206112814 +0000
+++ b/drivers/net/wireless/libertas_uap/Makefile 2012-04-19 02:08:10.044287046 +0000
@@ -0,0 +1,6 @@
+obj-$(CONFIG_LIBERTAS_UAP) += uap8xxx.o
+
@ -1368,7 +1543,7 @@ diff -urN a/drivers/net/wireless/libertas_uap/Makefile b/drivers/net/wireless/li
+EXTRA_CFLAGS += -DFPNUM='"52"' -DPXA3XX_DMA_ALIGN -DDEBUG_LEVEL1
diff -urN a/drivers/net/wireless/libertas_uap/uap_debug.c b/drivers/net/wireless/libertas_uap/uap_debug.c
--- a/drivers/net/wireless/libertas_uap/uap_debug.c 1970-01-01 00:00:00.000000000 +0000
+++ b/drivers/net/wireless/libertas_uap/uap_debug.c 2012-04-04 02:42:14.213925585 +0000
+++ b/drivers/net/wireless/libertas_uap/uap_debug.c 2012-04-19 02:08:10.052099815 +0000
@@ -0,0 +1,261 @@
+/** @file uap_debug.c
+ * @brief This file contains functions for debug proc file.
@ -1633,7 +1808,7 @@ diff -urN a/drivers/net/wireless/libertas_uap/uap_debug.c b/drivers/net/wireless
+#endif
diff -urN a/drivers/net/wireless/libertas_uap/uap_drv.h b/drivers/net/wireless/libertas_uap/uap_drv.h
--- a/drivers/net/wireless/libertas_uap/uap_drv.h 1970-01-01 00:00:00.000000000 +0000
+++ b/drivers/net/wireless/libertas_uap/uap_drv.h 2012-04-04 02:42:14.221738356 +0000
+++ b/drivers/net/wireless/libertas_uap/uap_drv.h 2012-04-19 02:08:10.052099815 +0000
@@ -0,0 +1,667 @@
+/** @file uap_drv.h
+ * @brief This file contains Linux OS related definitions and
@ -2304,7 +2479,7 @@ diff -urN a/drivers/net/wireless/libertas_uap/uap_drv.h b/drivers/net/wireless/l
+#endif /* _UAP_DRV_H */
diff -urN a/drivers/net/wireless/libertas_uap/uap_fw.h b/drivers/net/wireless/libertas_uap/uap_fw.h
--- a/drivers/net/wireless/libertas_uap/uap_fw.h 1970-01-01 00:00:00.000000000 +0000
+++ b/drivers/net/wireless/libertas_uap/uap_fw.h 2012-04-04 02:42:14.221738356 +0000
+++ b/drivers/net/wireless/libertas_uap/uap_fw.h 2012-04-19 02:08:10.059912576 +0000
@@ -0,0 +1,359 @@
+/** @file uap_fw.h
+ *
@ -2667,7 +2842,7 @@ diff -urN a/drivers/net/wireless/libertas_uap/uap_fw.h b/drivers/net/wireless/li
+#endif /* _UAP_FW_H */
diff -urN a/drivers/net/wireless/libertas_uap/uap_headers.h b/drivers/net/wireless/libertas_uap/uap_headers.h
--- a/drivers/net/wireless/libertas_uap/uap_headers.h 1970-01-01 00:00:00.000000000 +0000
+++ b/drivers/net/wireless/libertas_uap/uap_headers.h 2012-04-04 02:42:14.221738356 +0000
+++ b/drivers/net/wireless/libertas_uap/uap_headers.h 2012-04-19 02:08:10.059912576 +0000
@@ -0,0 +1,64 @@
+/** @file uap_headers.h
+ *
@ -2735,7 +2910,7 @@ diff -urN a/drivers/net/wireless/libertas_uap/uap_headers.h b/drivers/net/wirele
+#endif /* _UAP_HEADERS_H */
diff -urN a/drivers/net/wireless/libertas_uap/uap_main.c b/drivers/net/wireless/libertas_uap/uap_main.c
--- a/drivers/net/wireless/libertas_uap/uap_main.c 1970-01-01 00:00:00.000000000 +0000
+++ b/drivers/net/wireless/libertas_uap/uap_main.c 2012-04-04 02:42:14.237363899 +0000
+++ b/drivers/net/wireless/libertas_uap/uap_main.c 2012-04-19 02:08:10.091163558 +0000
@@ -0,0 +1,1830 @@
+/** @file uap_main.c
+ * @brief This file contains the major functions in uAP
@ -4569,7 +4744,7 @@ diff -urN a/drivers/net/wireless/libertas_uap/uap_main.c b/drivers/net/wireless/
+MODULE_LICENSE("GPL");
diff -urN a/drivers/net/wireless/libertas_uap/uap_proc.c b/drivers/net/wireless/libertas_uap/uap_proc.c
--- a/drivers/net/wireless/libertas_uap/uap_proc.c 1970-01-01 00:00:00.000000000 +0000
+++ b/drivers/net/wireless/libertas_uap/uap_proc.c 2012-04-04 02:42:14.245176671 +0000
+++ b/drivers/net/wireless/libertas_uap/uap_proc.c 2012-04-19 02:08:10.091163558 +0000
@@ -0,0 +1,296 @@
+/** @file uap_proc.c
+ * @brief This file contains functions for proc file.
@ -4869,7 +5044,7 @@ diff -urN a/drivers/net/wireless/libertas_uap/uap_proc.c b/drivers/net/wireless/
+#endif
diff -urN a/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c b/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c
--- a/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c 1970-01-01 00:00:00.000000000 +0000
+++ b/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c 2012-04-04 02:42:14.252989443 +0000
+++ b/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c 2012-04-19 02:08:10.106789075 +0000
@@ -0,0 +1,1428 @@
+/** @file uap_sdio_mmc.c
+ * @brief This file contains SDIO IF (interface) module
@ -6301,7 +6476,7 @@ diff -urN a/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c b/drivers/net/wirel
+}
diff -urN a/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h b/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h
--- a/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h 1970-01-01 00:00:00.000000000 +0000
+++ b/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h 2012-04-04 02:42:14.252989443 +0000
+++ b/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h 2012-04-19 02:08:10.106789075 +0000
@@ -0,0 +1,136 @@
+/** @file uap_sdio_mmc.h
+ * @brief This file contains SDIO IF (interface) module
@ -6441,7 +6616,7 @@ diff -urN a/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h b/drivers/net/wirel
+#endif /* _UAP_SDIO_MMC_H */
diff -urN a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
--- a/drivers/net/wireless/Makefile 2011-10-24 07:10:05.000000000 +0000
+++ b/drivers/net/wireless/Makefile 2012-04-04 02:42:14.206112814 +0000
+++ b/drivers/net/wireless/Makefile 2012-04-19 02:08:10.106789075 +0000
@@ -37,6 +37,8 @@
obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/
@ -6451,3 +6626,56 @@ diff -urN a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
obj-$(CONFIG_ADM8211) += adm8211.o
obj-$(CONFIG_MWL8K) += mwl8k.o
diff -urN a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
--- a/drivers/net/wireless/mwifiex/sdio.c 2011-10-24 07:10:05.000000000 +0000
+++ b/drivers/net/wireless/mwifiex/sdio.c 2012-04-19 01:33:53.789650491 +0000
@@ -253,11 +253,14 @@
return 0;
}
+/* Device ID for SD8786 */
+#define SDIO_DEVICE_ID_MARVELL_8786 (0x9116)
/* Device ID for SD8787 */
#define SDIO_DEVICE_ID_MARVELL_8787 (0x9119)
/* 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)},
{},
};
@@ -1570,7 +1573,15 @@
sdio_set_drvdata(func, card);
adapter->dev = &func->dev;
- strcpy(adapter->fw_name, SD8787_DEFAULT_FW_NAME);
+ switch (func->device) {
+ case SDIO_DEVICE_ID_MARVELL_8786:
+ strcpy(adapter->fw_name, SD8786_DEFAULT_FW_NAME);
+ break;
+ case SDIO_DEVICE_ID_MARVELL_8787:
+ default:
+ strcpy(adapter->fw_name, SD8787_DEFAULT_FW_NAME);
+ break;
+ }
return 0;
@@ -1769,4 +1780,5 @@
MODULE_DESCRIPTION("Marvell WiFi-Ex SDIO Driver version " SDIO_VERSION);
MODULE_VERSION(SDIO_VERSION);
MODULE_LICENSE("GPL v2");
-MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");
+MODULE_FIRMWARE(SD8786_DEFAULT_FW_NAME);
+MODULE_FIRMWARE(SD8787_DEFAULT_FW_NAME);
diff -urN a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h
--- a/drivers/net/wireless/mwifiex/sdio.h 2011-10-24 07:10:05.000000000 +0000
+++ b/drivers/net/wireless/mwifiex/sdio.h 2012-04-19 01:34:15.915370689 +0000
@@ -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 BLOCK_MODE 1

6
core/linux/config
View file

@ -288,6 +288,7 @@ CONFIG_MACH_ICONNECT=y
CONFIG_MACH_POGOPLUGV4=y
CONFIG_MACH_POGO_E02=y
CONFIG_MACH_NAS6210=y
CONFIG_MACH_TOPKICK=y
CONFIG_MACH_OPENRD=y
CONFIG_MACH_OPENRD_BASE=y
CONFIG_MACH_OPENRD_CLIENT=y
@ -1586,12 +1587,13 @@ CONFIG_WL12XX_MENU=m
CONFIG_WL12XX=m
# CONFIG_WL12XX_HT is not set
# CONFIG_WL12XX_SPI is not set
# CONFIG_WL12XX_SDIO is not set
CONFIG_WL12XX_SDIO=m
# CONFIG_WL12XX_SDIO_TEST is not set
CONFIG_WL12XX_PLATFORM_DATA=y
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
CONFIG_MWIFIEX=m
# CONFIG_MWIFIEX_SDIO is not set
CONFIG_MWIFIEX_SDIO=m
#
# WiMAX Wireless Broadband devices

2
core/linux/linux.install
View file

@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
KERNEL_VERSION=3.1.10-7-ARCH
KERNEL_VERSION=3.1.10-9-ARCH
post_install () {
# updating module dependencies