Avoid long lines in CVMX_USBCX macros. Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx> --- drivers/staging/octeon-usb/cvmx-usbcx-defs.h | 208 +++++++++++++++++++------- 1 file changed, 156 insertions(+), 52 deletions(-) diff --git a/drivers/staging/octeon-usb/cvmx-usbcx-defs.h b/drivers/staging/octeon-usb/cvmx-usbcx-defs.h index 2769d4e..56cc373 100644 --- a/drivers/staging/octeon-usb/cvmx-usbcx-defs.h +++ b/drivers/staging/octeon-usb/cvmx-usbcx-defs.h @@ -51,58 +51,162 @@ #ifndef __CVMX_USBCX_TYPEDEFS_H__ #define __CVMX_USBCX_TYPEDEFS_H__ -#define CVMX_USBCX_DAINT(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000818ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_DAINTMSK(block_id) (CVMX_ADD_IO_SEG(0x00016F001000081Cull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_DCFG(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000800ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_DCTL(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000804ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_DIEPCTLX(offset, block_id) (CVMX_ADD_IO_SEG(0x00016F0010000900ull) + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) -#define CVMX_USBCX_DIEPINTX(offset, block_id) (CVMX_ADD_IO_SEG(0x00016F0010000908ull) + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) -#define CVMX_USBCX_DIEPMSK(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000810ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_DIEPTSIZX(offset, block_id) (CVMX_ADD_IO_SEG(0x00016F0010000910ull) + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) -#define CVMX_USBCX_DOEPCTLX(offset, block_id) (CVMX_ADD_IO_SEG(0x00016F0010000B00ull) + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) -#define CVMX_USBCX_DOEPINTX(offset, block_id) (CVMX_ADD_IO_SEG(0x00016F0010000B08ull) + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) -#define CVMX_USBCX_DOEPMSK(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000814ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_DOEPTSIZX(offset, block_id) (CVMX_ADD_IO_SEG(0x00016F0010000B10ull) + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) -#define CVMX_USBCX_DPTXFSIZX(offset, block_id) (CVMX_ADD_IO_SEG(0x00016F0010000100ull) + (((offset) & 7) + ((block_id) & 1) * 0x40000000000ull) * 4) -#define CVMX_USBCX_DSTS(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000808ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_DTKNQR1(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000820ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_DTKNQR2(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000824ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_DTKNQR3(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000830ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_DTKNQR4(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000834ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GAHBCFG(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000008ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GHWCFG1(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000044ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GHWCFG2(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000048ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GHWCFG3(block_id) (CVMX_ADD_IO_SEG(0x00016F001000004Cull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GHWCFG4(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000050ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GINTMSK(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000018ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GINTSTS(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000014ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GNPTXFSIZ(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000028ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GNPTXSTS(block_id) (CVMX_ADD_IO_SEG(0x00016F001000002Cull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GOTGCTL(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000000ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GOTGINT(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000004ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GRSTCTL(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000010ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GRXFSIZ(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000024ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GRXSTSPD(block_id) (CVMX_ADD_IO_SEG(0x00016F0010040020ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GRXSTSPH(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000020ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GRXSTSRD(block_id) (CVMX_ADD_IO_SEG(0x00016F001004001Cull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GRXSTSRH(block_id) (CVMX_ADD_IO_SEG(0x00016F001000001Cull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GSNPSID(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000040ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_GUSBCFG(block_id) (CVMX_ADD_IO_SEG(0x00016F001000000Cull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_HAINT(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000414ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_HAINTMSK(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000418ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_HCCHARX(offset, block_id) (CVMX_ADD_IO_SEG(0x00016F0010000500ull) + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) -#define CVMX_USBCX_HCFG(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000400ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_HCINTMSKX(offset, block_id) (CVMX_ADD_IO_SEG(0x00016F001000050Cull) + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) -#define CVMX_USBCX_HCINTX(offset, block_id) (CVMX_ADD_IO_SEG(0x00016F0010000508ull) + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) -#define CVMX_USBCX_HCSPLTX(offset, block_id) (CVMX_ADD_IO_SEG(0x00016F0010000504ull) + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) -#define CVMX_USBCX_HCTSIZX(offset, block_id) (CVMX_ADD_IO_SEG(0x00016F0010000510ull) + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) -#define CVMX_USBCX_HFIR(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000404ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_HFNUM(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000408ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_HPRT(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000440ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_HPTXFSIZ(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000100ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_HPTXSTS(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000410ull) + ((block_id) & 1) * 0x100000000000ull) -#define CVMX_USBCX_NPTXDFIFOX(offset, block_id) (CVMX_ADD_IO_SEG(0x00016F0010001000ull) + (((offset) & 7) + ((block_id) & 1) * 0x100000000ull) * 4096) -#define CVMX_USBCX_PCGCCTL(block_id) (CVMX_ADD_IO_SEG(0x00016F0010000E00ull) + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_DAINT(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000818ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_DAINTMSK(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F001000081Cull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_DCFG(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000800ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_DCTL(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000804ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_DIEPCTLX(offset, block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000900ull) + \ + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) +#define CVMX_USBCX_DIEPINTX(offset, block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000908ull) + \ + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) +#define CVMX_USBCX_DIEPMSK(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000810ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_DIEPTSIZX(offset, block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000910ull) + \ + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) +#define CVMX_USBCX_DOEPCTLX(offset, block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000B00ull) + \ + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) +#define CVMX_USBCX_DOEPINTX(offset, block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000B08ull) + \ + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) +#define CVMX_USBCX_DOEPMSK(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000814ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_DOEPTSIZX(offset, block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000B10ull) + \ + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) +#define CVMX_USBCX_DPTXFSIZX(offset, block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000100ull) + \ + (((offset) & 7) + ((block_id) & 1) * 0x40000000000ull) * 4) +#define CVMX_USBCX_DSTS(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000808ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_DTKNQR1(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000820ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_DTKNQR2(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000824ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_DTKNQR3(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000830ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_DTKNQR4(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000834ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GAHBCFG(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000008ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GHWCFG1(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000044ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GHWCFG2(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000048ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GHWCFG3(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F001000004Cull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GHWCFG4(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000050ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GINTMSK(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000018ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GINTSTS(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000014ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GNPTXFSIZ(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000028ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GNPTXSTS(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F001000002Cull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GOTGCTL(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000000ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GOTGINT(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000004ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GRSTCTL(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000010ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GRXFSIZ(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000024ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GRXSTSPD(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010040020ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GRXSTSPH(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000020ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GRXSTSRD(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F001004001Cull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GRXSTSRH(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F001000001Cull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GSNPSID(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000040ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_GUSBCFG(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F001000000Cull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_HAINT(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000414ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_HAINTMSK(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000418ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_HCCHARX(offset, block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000500ull) + \ + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) +#define CVMX_USBCX_HCFG(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000400ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_HCINTMSKX(offset, block_id) \ + (CVMX_ADD_IO_SEG(0x00016F001000050Cull) + \ + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) +#define CVMX_USBCX_HCINTX(offset, block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000508ull) + \ + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) +#define CVMX_USBCX_HCSPLTX(offset, block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000504ull) + \ + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) +#define CVMX_USBCX_HCTSIZX(offset, block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000510ull) + \ + (((offset) & 7) + ((block_id) & 1) * 0x8000000000ull) * 32) +#define CVMX_USBCX_HFIR(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000404ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_HFNUM(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000408ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_HPRT(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000440ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_HPTXFSIZ(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000100ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_HPTXSTS(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000410ull) + \ + ((block_id) & 1) * 0x100000000000ull) +#define CVMX_USBCX_NPTXDFIFOX(offset, block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010001000ull) + \ + (((offset) & 7) + ((block_id) & 1) * 0x100000000ull) * 4096) +#define CVMX_USBCX_PCGCCTL(block_id) \ + (CVMX_ADD_IO_SEG(0x00016F0010000E00ull) + \ + ((block_id) & 1) * 0x100000000000ull) /** * cvmx_usbc#_daint -- 1.7.10.4
