On Mon, Mar 03, 2014 at 09:06:13PM -0600, dingu...@altera.com wrote: > From: Dinh Nguyen <dingu...@altera.com> > > In preparation of combining the dwc2/s3c-hsotg driver in a single DRD driver, > the defines in dwc2/hw.h needs to get updated so that the s3c-hsotg driver can > use them. > > Signed-off-by: Dinh Nguyen <dingu...@altera.com> > Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> > Cc: Paul Zimmerman <pa...@synopsys.com> > Cc: Felipe Balbi <ba...@ti.com> > Cc: Ben Dooks <ben-li...@fluff.org> > Cc: Matt Porter <mpor...@linaro.org> > Cc: Kukjin Kim <kgene....@samsung.com> > Cc: Stephen Warren <swar...@wwwdotorg.org> > Cc: Matthijs Kooijman <matth...@stdin.nl> > Cc: Jingoo Han <jg1....@samsung.com> > Cc: Sachin Kamat <sachin.ka...@linaro.org> > Cc: Robert Baldyga <r.bald...@samsung.com> > --- > v2: > - No need to redo the GRXSTS_PKTSTS defines > - Add a FIFOSIZE_DEPTH_GET macro > --- > drivers/usb/dwc2/hw.h | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/dwc2/hw.h b/drivers/usb/dwc2/hw.h > index 9c92a3c..18e19cd 100644 > --- a/drivers/usb/dwc2/hw.h > +++ b/drivers/usb/dwc2/hw.h > @@ -109,6 +109,7 @@ > #define GUSBCFG_FSINTF (1 << 5) > #define GUSBCFG_ULPI_UTMI_SEL (1 << 4) > #define GUSBCFG_PHYIF16 (1 << 3) > +#define GUSBCFG_PHYIF8 (0 << 3) > #define GUSBCFG_TOUTCAL_MASK (0x7 << 0) > #define GUSBCFG_TOUTCAL_SHIFT 0 > #define GUSBCFG_TOUTCAL_LIMIT 0x7 > @@ -403,6 +404,7 @@ > #define FIFOSIZE_DEPTH_SHIFT 16 > #define FIFOSIZE_STARTADDR_MASK (0xffff << 0) > #define FIFOSIZE_STARTADDR_SHIFT 0 > +#define FIFOSIZE_DEPTH_GET(_x) (((_x) >> 16) & 0xffff) > > /* Device mode registers */ > > @@ -520,10 +522,11 @@ > #define DXEPCTL_SNP (1 << 20) > #define DXEPCTL_EPTYPE_MASK (0x3 << 18) > #define DXEPCTL_EPTYPE_SHIFT 18
you can remove this now, if there are still any uses, remove them. -- balbi
signature.asc
Description: Digital signature
