From a5610f6fc47c582e43f32896ac9a82d4113a2ac9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 20 Sep 2008 11:53:08 +0000 Subject: linux-omap git: apply keypad irq fix for omap3evm, switch musb to host --- .../OMAP3EVM_TWL4030-Keypad-irq-error-fix.patch | 32 ++++++++++++++++++++++ packages/linux/linux-omap/omap3evm/defconfig | 13 +++++---- packages/linux/linux-omap_git.bb | 3 +- 3 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 packages/linux/linux-omap/omap3evm/OMAP3EVM_TWL4030-Keypad-irq-error-fix.patch (limited to 'packages') diff --git a/packages/linux/linux-omap/omap3evm/OMAP3EVM_TWL4030-Keypad-irq-error-fix.patch b/packages/linux/linux-omap/omap3evm/OMAP3EVM_TWL4030-Keypad-irq-error-fix.patch new file mode 100644 index 0000000000..aac1151b78 --- /dev/null +++ b/packages/linux/linux-omap/omap3evm/OMAP3EVM_TWL4030-Keypad-irq-error-fix.patch @@ -0,0 +1,32 @@ +without this the below error messages were coming continuously + +TWL4030 module irq 369 is disabled but can't be masked! +<2>TWL4030 module irq 369 is disabled but can't be masked! + +Signed-off-by: Arun C +--- + arch/arm/mach-omap2/board-omap3evm.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3evm.c +b/arch/arm/mach-omap2/board-omap3evm.c +index 92f70ce..f9fd06b 100644 +--- a/arch/arm/mach-omap2/board-omap3evm.c ++++ b/arch/arm/mach-omap2/board-omap3evm.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -176,6 +177,7 @@ static struct omap_kp_platform_data omap3evm_kp_data = { + .keymap = omap3evm_keymap, + .keymapsize = ARRAY_SIZE(omap3evm_keymap), + .rep = 1, ++ .irq = TWL4030_MODIRQ_KEYPAD, + }; + + static struct platform_device omap3evm_kp_device = { + diff --git a/packages/linux/linux-omap/omap3evm/defconfig b/packages/linux/linux-omap/omap3evm/defconfig index 294324561e..89de12e765 100644 --- a/packages/linux/linux-omap/omap3evm/defconfig +++ b/packages/linux/linux-omap/omap3evm/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.27-rc6-omap1 -# Wed Sep 17 11:04:13 2008 +# Sat Sep 20 13:46:37 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1414,7 +1414,7 @@ CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICE_CLASS=y # CONFIG_USB_DYNAMIC_MINORS is not set CONFIG_USB_SUSPEND=y -CONFIG_USB_OTG=y +# CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set CONFIG_USB_MON=y @@ -1439,10 +1439,10 @@ CONFIG_USB_MUSB_SOC=y # # OMAP 343x high speed USB support # -# CONFIG_USB_MUSB_HOST is not set +CONFIG_USB_MUSB_HOST=y # CONFIG_USB_MUSB_PERIPHERAL is not set -CONFIG_USB_MUSB_OTG=y -CONFIG_USB_GADGET_MUSB_HDRC=y +# CONFIG_USB_MUSB_OTG is not set +# CONFIG_USB_GADGET_MUSB_HDRC is not set CONFIG_USB_MUSB_HDRC_HCD=y # CONFIG_MUSB_PIO_ONLY is not set CONFIG_USB_INVENTRA_DMA=y @@ -1579,7 +1579,8 @@ CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_FSL_USB2 is not set # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA25X is not set -# CONFIG_USB_GADGET_M66592 is not set +CONFIG_USB_GADGET_M66592=y +CONFIG_USB_M66592=y # CONFIG_USB_GADGET_PXA27X is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb index f4a064f595..05448f1c23 100644 --- a/packages/linux/linux-omap_git.bb +++ b/packages/linux/linux-omap_git.bb @@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard| SRCREV = "de1121fdb899f762" PV = "2.6.26+2.6.27-rc6+${PR}+git${SRCREV}" -PR = "r4" +PR = "r5" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -42,6 +42,7 @@ SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ " SRC_URI_append_omap3evm = " \ + file://OMAP3EVM_TWL4030-Keypad-irq-error-fix.patch;patch=1 \ " S = "${WORKDIR}/git" -- cgit v1.2.3