diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-01-14 15:37:06 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-01-14 15:37:06 +0100 |
| commit | 58b921d5670af86a71cd50ada7520a2a7a9579ce (patch) | |
| tree | a37fc117a3fe9d11fc6344edf5cb5baf613352a5 /packages | |
| parent | ee252dee2abeb428795c680078152e4de2d955e7 (diff) | |
linux-omap 2.6.28: add patch for musb dma programming
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/linux-omap-2.6.28/musb-hsdma.diff | 28 | ||||
| -rw-r--r-- | packages/linux/linux-omap_2.6.28.bb | 3 |
2 files changed, 30 insertions, 1 deletions
diff --git a/packages/linux/linux-omap-2.6.28/musb-hsdma.diff b/packages/linux/linux-omap-2.6.28/musb-hsdma.diff new file mode 100644 index 0000000000..05de732ed0 --- /dev/null +++ b/packages/linux/linux-omap-2.6.28/musb-hsdma.diff @@ -0,0 +1,28 @@ +From: Ajay Kumar Gupta <ajay.gupta@ti.com> +Date: Tue, 13 Jan 2009 12:08:44 +0000 (+0200) +Subject: usb: musb: fix bug in musbhsdma programming +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftmlind%2Flinux-omap-2.6.git;a=commitdiff_plain;h=15f75b6226c2d3b82062bb721e7cb9a1d6f35efd + +usb: musb: fix bug in musbhsdma programming + +Mode bit should be set based on function parameter "mode" of +configure_channel() function. + +Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> +Acked-by: Felipe Balbi <felipe.balbi@nokia.com> +Signed-off-by: Tony Lindgren <tony@atomide.com> +--- + +diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c +index 75b15ce..4394bd3 100644 +--- a/drivers/usb/musb/musbhsdma.c ++++ b/drivers/usb/musb/musbhsdma.c +@@ -136,7 +136,7 @@ static void configure_channel(struct dma_channel *channel, + csr |= MUSB_HSDMA_BURSTMODE_INCR4; + + csr |= (musb_channel->epnum << MUSB_HSDMA_ENDPOINT_SHIFT) +- | MUSB_HSDMA_MODE1 ++ | (mode ? MUSB_HSDMA_MODE1 : 0) + | MUSB_HSDMA_ENABLE + | MUSB_HSDMA_IRQENABLE + | (musb_channel->transmit diff --git a/packages/linux/linux-omap_2.6.28.bb b/packages/linux/linux-omap_2.6.28.bb index b2cbb9a87d..fd0d5903a8 100644 --- a/packages/linux/linux-omap_2.6.28.bb +++ b/packages/linux/linux-omap_2.6.28.bb @@ -10,7 +10,7 @@ DEFAULT_PREFERENCE = "-1" SRCREV = "401b285465488f515290e0f9111872b94e1cf922" PV = "2.6.28" -PR = "r5" +PR = "r6" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -44,6 +44,7 @@ SRC_URI_append = " \ file://0011-DSS-OMAPFB-fix-GFX_SYNC-to-be-compatible-with-DSS1.patch;patch=1 \ file://0001-ASoC-Add-support-for-OMAP3-EVM.patch;patch=1 \ file://0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch;patch=1 \ + file://musb-hsdma.diff;patch=1 \ " |