commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=aebeaf155feeb4bce22e0fdc42689841b405ae29 branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
Signed-off-by: Bob Liu <[email protected]> --- drivers/usb/musb/musb_dma.h | 2 +- drivers/usb/musb/musb_gadget.c | 2 +- drivers/usb/musb/musbhsdma.c | 2 +- drivers/usb/musb/musbhsdma.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/musb/musb_dma.h b/drivers/usb/musb/musb_dma.h index 3a97c4e..8357407 100644 --- a/drivers/usb/musb/musb_dma.h +++ b/drivers/usb/musb/musb_dma.h @@ -84,7 +84,7 @@ struct musb_hw_ep; * Only allow DMA mode 1 to be used when the USB will actually generate the * interrupts we expect. */ -#ifdef CONFIG_BLACKFIN +#if defined(CONFIG_BLACKFIN) && !defined(CONFIG_BF60x) # undef USE_MODE1 # if !ANOMALY_05000456 # define USE_MODE1 diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index 0e24d5f..a50761d 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -363,7 +363,7 @@ static void txstate(struct musb *musb, struct musb_request *req) size_t request_size; /* setup DMA, then program endpoint CSR */ -#if !defined(CONFIG_BLACKFIN) || defined(USE_MODE1) +#if !defined(CONFIG_BLACKFIN) || defined(USE_MODE1) || defined(CONFIG_BF60x) request_size = min_t(size_t, request->length - request->actual, musb_ep->dma->max_len); #else diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c index 57a6085..25379bc 100644 --- a/drivers/usb/musb/musbhsdma.c +++ b/drivers/usb/musb/musbhsdma.c @@ -269,7 +269,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) int_hsdma = musb_readb(mbase, MUSB_HSDMA_INTR); -#ifdef CONFIG_BLACKFIN +#if defined(CONFIG_BLACKFIN) && !defined(CONFIG_BF60x) /* Clear DMA interrupt flags */ musb_writeb(mbase, MUSB_HSDMA_INTR, int_hsdma); #endif diff --git a/drivers/usb/musb/musbhsdma.h b/drivers/usb/musb/musbhsdma.h index 320fd4a..f971d07 100644 --- a/drivers/usb/musb/musbhsdma.h +++ b/drivers/usb/musb/musbhsdma.h @@ -35,7 +35,7 @@ #include "omap2430.h" #endif -#ifndef CONFIG_BLACKFIN +#if !defined(CONFIG_BLACKFIN) || defined(CONFIG_BF60x) #define MUSB_HSDMA_BASE 0x200 #define MUSB_HSDMA_INTR (MUSB_HSDMA_BASE + 0)
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
