فهرست منبع

修正“matser和zhonghong分支USB驱动不一致”问题。

之前合并master到zhonghong时,git merge指令导致合并错误,导致master和zhonghong分支USB驱动不一致!
lixh 3 سال پیش
والد
کامیت
b54b41a7e0
2فایلهای تغییر یافته به همراه2 افزوده شده و 10 حذف شده
  1. 1 9
      linux/drivers/usb/musb/musb_host.c
  2. 1 1
      linux/drivers/usb/musb/musbhsdma.c

+ 1 - 9
linux/drivers/usb/musb/musb_host.c

@@ -409,19 +409,11 @@ static u16 musb_h_flush_rxfifo(struct musb_hw_ep *hw_ep, u16 csr)
 	 * ignore dma (various models),
 	 * leave toggle alone (may not have been saved yet)
 	 */
-#if NICHOLAS_ADD
-	csr |= MUSB_RXCSR_FLUSHFIFO;
-	musb_writew(hw_ep->regs, MUSB_RXCSR, csr);
-	csr &= ~(MUSB_RXCSR_H_REQPKT
-		| MUSB_RXCSR_H_AUTOREQ
-		| MUSB_RXCSR_AUTOCLEAR
-		| MUSB_RXCSR_RXPKTRDY);
-#else
 	csr |= MUSB_RXCSR_FLUSHFIFO | MUSB_RXCSR_RXPKTRDY;
 	csr &= ~(MUSB_RXCSR_H_REQPKT
 		| MUSB_RXCSR_H_AUTOREQ
 		| MUSB_RXCSR_AUTOCLEAR);
-#endif
+
 	/* write 2x to allow double buffering */
 	musb_writew(hw_ep->regs, MUSB_RXCSR, csr);
 	musb_writew(hw_ep->regs, MUSB_RXCSR, csr);

+ 1 - 1
linux/drivers/usb/musb/musbhsdma.c

@@ -120,7 +120,7 @@ static struct dma_channel *dma_channel_allocate(struct dma_controller *c,
 			channel = &(musb_channel->channel);
 			channel->private_data = musb_channel;
 			channel->status = MUSB_DMA_STATUS_FREE;
-			channel->max_len = 0x200;
+			channel->max_len = 0x400;
 			/* Tx => mode 1; Rx => mode 0 */
 			channel->desired_mode = transmit;
 			channel->actual_len = 0;