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 @@ +From 0ba8efcdee682cd230dd2de3deb6438c0f7585f8 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Wed, 19 Oct 2011 12:44:14 +0200 +Subject: [PATCH] ARM: OMAP2+: beagleboard: fix mmc write protect pin when using the wilink expansion board + +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/board-omap3beagle.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 6e2f10e..24de67b 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -280,7 +280,7 @@ static struct omap2_hsmmc_info mmcbbt[] = { + { + .mmc = 1, + .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, +- .gpio_wp = 29, ++ .gpio_wp = -EINVAL, + }, + { + .name = "wl1271", +-- +1.6.6.1 + 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 @@ # # Automatically generated make config: don't edit -# Linux/arm 3.0.6 Kernel Configuration +# Linux/arm 3.0.7 Kernel Configuration # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -1366,9 +1366,15 @@ CONFIG_USB_NET_RNDIS_WLAN=m CONFIG_RTL8187=m CONFIG_RTL8187_LEDS=y # CONFIG_MAC80211_HWSIM is not set -# CONFIG_ATH_COMMON is not set +CONFIG_ATH_COMMON=m +# CONFIG_ATH_DEBUG is not set +# CONFIG_ATH9K is not set +# CONFIG_ATH9K_HTC is not set +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +CONFIG_CARL9170_WPC=y CONFIG_B43=m -# CONFIG_B43_SDIO is not set +CONFIG_B43_SDIO=y CONFIG_B43_PIO=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y @@ -1382,7 +1388,7 @@ CONFIG_HOSTAP_FIRMWARE_NVRAM=y # CONFIG_IWM is not set CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m -# CONFIG_LIBERTAS_SDIO is not set +CONFIG_LIBERTAS_SDIO=m # CONFIG_LIBERTAS_SPI is not set # CONFIG_LIBERTAS_DEBUG is not set # CONFIG_LIBERTAS_MESH is not set @@ -1393,14 +1399,19 @@ CONFIG_P54_LEDS=y CONFIG_RT2X00=m CONFIG_RT2500USB=m CONFIG_RT73USB=m -# CONFIG_RT2800USB is not set +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m CONFIG_RT2X00_LIB_USB=m CONFIG_RT2X00_LIB=m CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set -# CONFIG_RTL8192SE is not set +CONFIG_RTL8192SE=m CONFIG_RTL8192CU=m CONFIG_RTLWIFI=m CONFIG_RTL8192C_COMMON=m @@ -1922,7 +1933,7 @@ CONFIG_SSB_POSSIBLE=y CONFIG_SSB=y CONFIG_SSB_BLOCKIO=y CONFIG_SSB_SDIOHOST_POSSIBLE=y -# CONFIG_SSB_SDIOHOST is not set +CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set # CONFIG_SSB_DEBUG is not set CONFIG_BCMA_POSSIBLE=y diff --git a/recipes-kernel/linux/linux_3.0.bb b/recipes-kernel/linux/linux_3.0.bb index 887aff91..59dfb394 100644 --- a/recipes-kernel/linux/linux_3.0.bb +++ b/recipes-kernel/linux/linux_3.0.bb @@ -10,7 +10,7 @@ PV = "3.0.7" SRCREV_pn-${PN} = "62bf7928bfe312ec6cf829b06893eb5649ceaec5" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -MACHINE_KERNEL_PR_append = "a" +MACHINE_KERNEL_PR_append = "b" FILESPATH =. "${FILE_DIRNAME}/linux-3.0:${FILE_DIRNAME}/linux-3.0/${MACHINE}:" @@ -192,6 +192,7 @@ SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.gi file://beagle/0006-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch \ file://beagle/0007-OMAP2-add-cpu-id-register-to-MAC-address-helper.patch \ file://beagle/0008-HACK-OMAP2-BeagleBoard-Fix-up-random-or-missing-MAC-.patch \ + file://beagle/0001-ARM-OMAP2-beagleboard-fix-mmc-write-protect-pin-when.patch \ file://madc/0001-Enabling-Hwmon-driver-for-twl4030-madc.patch \ file://madc/0002-mfd-twl-core-enable-madc-clock.patch \ \