Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 259215
b: refs/heads/master
c: e73a989
h: refs/heads/master
i:
  259213: 90f98dd
  259211: e544fab
  259207: 9b5d10e
  259199: d8610c7
v: v3
  • Loading branch information
Kuninori Morimoto authored and Greg Kroah-Hartman committed Jun 7, 2011
1 parent 073312c commit c69d8bc
Show file tree
Hide file tree
Showing 9 changed files with 534 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0cb7e61d16ac68a2c5dd73a00e211287848d16e7
refs/heads/master: e73a9891b3a1c9fc0970e0c9dbe2cc47933ad752
2 changes: 2 additions & 0 deletions trunk/drivers/usb/renesas_usbhs/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,8 @@ static int __devinit usbhs_probe(struct platform_device *pdev)
priv->dparam->pipe_type = usbhsc_default_pipe_type;
priv->dparam->pipe_size = ARRAY_SIZE(usbhsc_default_pipe_type);
}
if (!priv->dparam->pio_dma_border)
priv->dparam->pio_dma_border = 64; /* 64byte */

/* FIXME */
/* runtime power control ? */
Expand Down
35 changes: 35 additions & 0 deletions trunk/drivers/usb/renesas_usbhs/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ struct usbhs_priv;
#define CFIFO 0x0014
#define CFIFOSEL 0x0020
#define CFIFOCTR 0x0022
#define D0FIFO 0x0100
#define D0FIFOSEL 0x0028
#define D0FIFOCTR 0x002A
#define D1FIFO 0x0120
#define D1FIFOSEL 0x002C
#define D1FIFOCTR 0x002E
#define INTENB0 0x0030
#define INTENB1 0x0032
#define BRDYENB 0x0036
Expand All @@ -60,6 +66,30 @@ struct usbhs_priv;
#define PIPEMAXP 0x006C
#define PIPEPERI 0x006E
#define PIPEnCTR 0x0070
#define PIPE1TRE 0x0090
#define PIPE1TRN 0x0092
#define PIPE2TRE 0x0094
#define PIPE2TRN 0x0096
#define PIPE3TRE 0x0098
#define PIPE3TRN 0x009A
#define PIPE4TRE 0x009C
#define PIPE4TRN 0x009E
#define PIPE5TRE 0x00A0
#define PIPE5TRN 0x00A2
#define PIPEBTRE 0x00A4
#define PIPEBTRN 0x00A6
#define PIPECTRE 0x00A8
#define PIPECTRN 0x00AA
#define PIPEDTRE 0x00AC
#define PIPEDTRN 0x00AE
#define PIPEETRE 0x00B0
#define PIPEETRN 0x00B2
#define PIPEFTRE 0x00B4
#define PIPEFTRN 0x00B6
#define PIPE9TRE 0x00B8
#define PIPE9TRN 0x00BA
#define PIPEATRE 0x00BC
#define PIPEATRN 0x00BE

/* SYSCFG */
#define SCKE (1 << 10) /* USB Module Clock Enable */
Expand All @@ -78,6 +108,7 @@ struct usbhs_priv;
#define RHST_HIGH_SPEED 3 /* High-speed connection */

/* CFIFOSEL */
#define DREQE (1 << 12) /* DMA Transfer Request Enable */
#define MBW_32 (0x2 << 10) /* CFIFO Port Access Bit Width */

/* CFIFOCTR */
Expand Down Expand Up @@ -164,6 +195,10 @@ struct usbhs_priv;

#define CCPL (1 << 2) /* Control Transfer End Enable */

/* PIPEnTRE */
#define TRENB (1 << 9) /* Transaction Counter Enable */
#define TRCLR (1 << 8) /* Transaction Counter Clear */

/* FRMNUM */
#define FRNM_MASK (0x7FF)

Expand Down
Loading

0 comments on commit c69d8bc

Please sign in to comment.