diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-10-19 12:11:42 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-10-19 12:56:22 +0200 |
commit | c052b8f61be6c1fb74a9d0d6b5f1d90101ba9047 (patch) | |
tree | ec30037fca5a8c9bded35c28082e4bf6717a5b72 /recipes-kernel/linux/linux-3.0 | |
parent | d1323b5641fdac38bb21880fbd491dacbe45b708 (diff) | |
download | meta-ti-c052b8f61be6c1fb74a9d0d6b5f1d90101ba9047.tar.gz |
linux 3.0: enable more usb wifi cards for beagleboard, fix write protect pin
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-kernel/linux/linux-3.0')
-rw-r--r-- | recipes-kernel/linux/linux-3.0/beagle/0001-ARM-OMAP2-beagleboard-fix-mmc-write-protect-pin-when.patch | 26 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-3.0/beagleboard/defconfig | 25 |
2 files changed, 44 insertions, 7 deletions
diff --git a/recipes-kernel/linux/linux-3.0/beagle/0001-ARM-OMAP2-beagleboard-fix-mmc-write-protect-pin-when.patch b/recipes-kernel/linux/linux-3.0/beagle/0001-ARM-OMAP2-beagleboard-fix-mmc-write-protect-pin-when.patch new file mode 100644 index 00000000..1d4e34f7 --- /dev/null +++ b/recipes-kernel/linux/linux-3.0/beagle/0001-ARM-OMAP2-beagleboard-fix-mmc-write-protect-pin-when.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 0ba8efcdee682cd230dd2de3deb6438c0f7585f8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Wed, 19 Oct 2011 12:44:14 +0200 | ||
4 | Subject: [PATCH] ARM: OMAP2+: beagleboard: fix mmc write protect pin when using the wilink expansion board | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | --- | ||
8 | arch/arm/mach-omap2/board-omap3beagle.c | 2 +- | ||
9 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
10 | |||
11 | diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c | ||
12 | index 6e2f10e..24de67b 100644 | ||
13 | --- a/arch/arm/mach-omap2/board-omap3beagle.c | ||
14 | +++ b/arch/arm/mach-omap2/board-omap3beagle.c | ||
15 | @@ -280,7 +280,7 @@ static struct omap2_hsmmc_info mmcbbt[] = { | ||
16 | { | ||
17 | .mmc = 1, | ||
18 | .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, | ||
19 | - .gpio_wp = 29, | ||
20 | + .gpio_wp = -EINVAL, | ||
21 | }, | ||
22 | { | ||
23 | .name = "wl1271", | ||
24 | -- | ||
25 | 1.6.6.1 | ||
26 | |||
diff --git a/recipes-kernel/linux/linux-3.0/beagleboard/defconfig b/recipes-kernel/linux/linux-3.0/beagleboard/defconfig index c7501a10..0b150c5c 100644 --- a/recipes-kernel/linux/linux-3.0/beagleboard/defconfig +++ b/recipes-kernel/linux/linux-3.0/beagleboard/defconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux/arm 3.0.6 Kernel Configuration | 3 | # Linux/arm 3.0.7 Kernel Configuration |
4 | # | 4 | # |
5 | CONFIG_ARM=y | 5 | CONFIG_ARM=y |
6 | CONFIG_HAVE_PWM=y | 6 | CONFIG_HAVE_PWM=y |
@@ -1366,9 +1366,15 @@ CONFIG_USB_NET_RNDIS_WLAN=m | |||
1366 | CONFIG_RTL8187=m | 1366 | CONFIG_RTL8187=m |
1367 | CONFIG_RTL8187_LEDS=y | 1367 | CONFIG_RTL8187_LEDS=y |
1368 | # CONFIG_MAC80211_HWSIM is not set | 1368 | # CONFIG_MAC80211_HWSIM is not set |
1369 | # CONFIG_ATH_COMMON is not set | 1369 | CONFIG_ATH_COMMON=m |
1370 | # CONFIG_ATH_DEBUG is not set | ||
1371 | # CONFIG_ATH9K is not set | ||
1372 | # CONFIG_ATH9K_HTC is not set | ||
1373 | CONFIG_CARL9170=m | ||
1374 | CONFIG_CARL9170_LEDS=y | ||
1375 | CONFIG_CARL9170_WPC=y | ||
1370 | CONFIG_B43=m | 1376 | CONFIG_B43=m |
1371 | # CONFIG_B43_SDIO is not set | 1377 | CONFIG_B43_SDIO=y |
1372 | CONFIG_B43_PIO=y | 1378 | CONFIG_B43_PIO=y |
1373 | CONFIG_B43_PHY_N=y | 1379 | CONFIG_B43_PHY_N=y |
1374 | CONFIG_B43_PHY_LP=y | 1380 | CONFIG_B43_PHY_LP=y |
@@ -1382,7 +1388,7 @@ CONFIG_HOSTAP_FIRMWARE_NVRAM=y | |||
1382 | # CONFIG_IWM is not set | 1388 | # CONFIG_IWM is not set |
1383 | CONFIG_LIBERTAS=m | 1389 | CONFIG_LIBERTAS=m |
1384 | CONFIG_LIBERTAS_USB=m | 1390 | CONFIG_LIBERTAS_USB=m |
1385 | # CONFIG_LIBERTAS_SDIO is not set | 1391 | CONFIG_LIBERTAS_SDIO=m |
1386 | # CONFIG_LIBERTAS_SPI is not set | 1392 | # CONFIG_LIBERTAS_SPI is not set |
1387 | # CONFIG_LIBERTAS_DEBUG is not set | 1393 | # CONFIG_LIBERTAS_DEBUG is not set |
1388 | # CONFIG_LIBERTAS_MESH is not set | 1394 | # CONFIG_LIBERTAS_MESH is not set |
@@ -1393,14 +1399,19 @@ CONFIG_P54_LEDS=y | |||
1393 | CONFIG_RT2X00=m | 1399 | CONFIG_RT2X00=m |
1394 | CONFIG_RT2500USB=m | 1400 | CONFIG_RT2500USB=m |
1395 | CONFIG_RT73USB=m | 1401 | CONFIG_RT73USB=m |
1396 | # CONFIG_RT2800USB is not set | 1402 | CONFIG_RT2800USB=m |
1403 | CONFIG_RT2800USB_RT33XX=y | ||
1404 | CONFIG_RT2800USB_RT35XX=y | ||
1405 | CONFIG_RT2800USB_RT53XX=y | ||
1406 | CONFIG_RT2800USB_UNKNOWN=y | ||
1407 | CONFIG_RT2800_LIB=m | ||
1397 | CONFIG_RT2X00_LIB_USB=m | 1408 | CONFIG_RT2X00_LIB_USB=m |
1398 | CONFIG_RT2X00_LIB=m | 1409 | CONFIG_RT2X00_LIB=m |
1399 | CONFIG_RT2X00_LIB_FIRMWARE=y | 1410 | CONFIG_RT2X00_LIB_FIRMWARE=y |
1400 | CONFIG_RT2X00_LIB_CRYPTO=y | 1411 | CONFIG_RT2X00_LIB_CRYPTO=y |
1401 | CONFIG_RT2X00_LIB_LEDS=y | 1412 | CONFIG_RT2X00_LIB_LEDS=y |
1402 | # CONFIG_RT2X00_DEBUG is not set | 1413 | # CONFIG_RT2X00_DEBUG is not set |
1403 | # CONFIG_RTL8192SE is not set | 1414 | CONFIG_RTL8192SE=m |
1404 | CONFIG_RTL8192CU=m | 1415 | CONFIG_RTL8192CU=m |
1405 | CONFIG_RTLWIFI=m | 1416 | CONFIG_RTLWIFI=m |
1406 | CONFIG_RTL8192C_COMMON=m | 1417 | CONFIG_RTL8192C_COMMON=m |
@@ -1922,7 +1933,7 @@ CONFIG_SSB_POSSIBLE=y | |||
1922 | CONFIG_SSB=y | 1933 | CONFIG_SSB=y |
1923 | CONFIG_SSB_BLOCKIO=y | 1934 | CONFIG_SSB_BLOCKIO=y |
1924 | CONFIG_SSB_SDIOHOST_POSSIBLE=y | 1935 | CONFIG_SSB_SDIOHOST_POSSIBLE=y |
1925 | # CONFIG_SSB_SDIOHOST is not set | 1936 | CONFIG_SSB_SDIOHOST=y |
1926 | # CONFIG_SSB_SILENT is not set | 1937 | # CONFIG_SSB_SILENT is not set |
1927 | # CONFIG_SSB_DEBUG is not set | 1938 | # CONFIG_SSB_DEBUG is not set |
1928 | CONFIG_BCMA_POSSIBLE=y | 1939 | CONFIG_BCMA_POSSIBLE=y |