Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[karo-tx-linux.git] / drivers / usb / renesas_usbhs / common.h

diff --git a/drivers/usb/renesas_usbhs/common.h b/drivers/usb/renesas_usbhs/common.h
index a7996da6a1bd19026be98e9d76e3d348c348ff7a..0427cdd1a483e7af890262537a0529ac0c5cf3b8 100644 (file)
--- a/drivers/usb/renesas_usbhs/common.h
+++ b/drivers/usb/renesas_usbhs/common.h
@@ -102,6 +102,10 @@ struct usbhs_priv;
 #define DEVADD8                0x00E0
 #define DEVADD9                0x00E2
 #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 */
 #define SCKE   (1 << 10)       /* USB Module Clock Enable */
@@ -269,7 +273,8 @@ struct usbhs_priv {
         */
        struct usbhs_fifo_info fifo_info;
 
-       struct usb_phy *phy;
+       struct usb_phy *usb_phy;
+       struct phy *phy;
 };
 
 /*