openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: renesas_usbhs: expand USB-DMAC channels for R-Car Gen2 

This patch expands USB-DMAC channels for R-Car Gen2 SoCs. The SoCs
have 4 channels. If d{2,3}_{t,x}x_id are not set, this driver never
uses the expanded USB-DMAC channels.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Yoshihiro Shimoda 2014-11-10 20:02:47 +09:00 committed by Felipe Balbi
parent 53e734b1ec
commit d3cf6a4b01
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/renesas_usbhs/common.h
View File

@ -102,6 +102,10 @@ struct usbhs_priv;
#define DEVADD8 0x00E0 #define DEVADD8 0x00E0
#define DEVADD9 0x00E2 #define DEVADD9 0x00E2
#define DEVADDA 0x00E4 #define DEVADDA 0x00E4
#define D2FIFOSEL 0x00F0 /* for R-Car Gen2 */
#define D2FIFOCTR 0x00F2 /* for R-Car Gen2 */
#define D3FIFOSEL 0x00F4 /* for R-Car Gen2 */
#define D3FIFOCTR 0x00F6 /* for R-Car Gen2 */
/* SYSCFG */ /* SYSCFG */
#define SCKE (1 << 10) /* USB Module Clock Enable */ #define SCKE (1 << 10) /* USB Module Clock Enable */

2
drivers/usb/renesas_usbhs/fifo.c
View File

@ -1234,6 +1234,8 @@ int usbhs_fifo_probe(struct usbhs_priv *priv)
/* DFIFO */ /* DFIFO */
USBHS_DFIFO_INIT(priv, fifo, 0); USBHS_DFIFO_INIT(priv, fifo, 0);
USBHS_DFIFO_INIT(priv, fifo, 1); USBHS_DFIFO_INIT(priv, fifo, 1);
USBHS_DFIFO_INIT_NO_PORT(priv, fifo, 2);
USBHS_DFIFO_INIT_NO_PORT(priv, fifo, 3);
return 0; return 0;
} }

2
drivers/usb/renesas_usbhs/fifo.h
View File

@ -38,7 +38,7 @@ struct usbhs_fifo {
struct sh_dmae_slave rx_slave; struct sh_dmae_slave rx_slave;
}; };
#define USBHS_MAX_NUM_DFIFO 2 #define USBHS_MAX_NUM_DFIFO 4
struct usbhs_fifo_info { struct usbhs_fifo_info {
struct usbhs_fifo cfifo; struct usbhs_fifo cfifo;
struct usbhs_fifo dfifo[USBHS_MAX_NUM_DFIFO]; struct usbhs_fifo dfifo[USBHS_MAX_NUM_DFIFO];

4
include/linux/usb/renesas_usbhs.h
View File

@ -145,6 +145,10 @@ struct renesas_usbhs_driver_param {
int d0_rx_id; int d0_rx_id;
int d1_tx_id; int d1_tx_id;
int d1_rx_id; int d1_rx_id;
int d2_tx_id;
int d2_rx_id;
int d3_tx_id;
int d3_rx_id;
/* /*
* option: * option: