summaryrefslogtreecommitdiff
path: root/drivers/phy/phy-rcar-gen2.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-06-08 20:57:51 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-06-08 20:57:51 +0300
commit19915e623458004547c1c2490b09bb923fe69337 (patch)
treeb794a81ddf083ed08a5bb32820c2dd0121ed74b2 /drivers/phy/phy-rcar-gen2.c
parent4e47dcf78d2fa0b6316b6d563a055fdcc93bd222 (diff)
parentd4a4f75cd8f29cd9464a5a32e9224a91571d6649 (diff)
downloadlinux-19915e623458004547c1c2490b09bb923fe69337.tar.xz
Merge 4.1-rc7 into usb-next
This resolves a merge issue in musb_core.c and we want the fixes that were in Linus's tree in this branch as well for testing. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/phy/phy-rcar-gen2.c')
-rw-r--r--drivers/phy/phy-rcar-gen2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/phy/phy-rcar-gen2.c b/drivers/phy/phy-rcar-gen2.c
index 0050301dce7a..39d9b2995435 100644
--- a/drivers/phy/phy-rcar-gen2.c
+++ b/drivers/phy/phy-rcar-gen2.c
@@ -23,7 +23,7 @@
#define USBHS_LPSTS 0x02
#define USBHS_UGCTRL 0x80
#define USBHS_UGCTRL2 0x84
-#define USBHS_UGSTS 0x88 /* The manuals have 0x90 */
+#define USBHS_UGSTS 0x88 /* From technical update */
/* Low Power Status register (LPSTS) */
#define USBHS_LPSTS_SUSPM 0x4000
@@ -41,7 +41,7 @@
#define USBHS_UGCTRL2_USB0SEL_HS_USB 0x00000030
/* USB General status register (UGSTS) */
-#define USBHS_UGSTS_LOCK 0x00000300 /* The manuals have 0x3 */
+#define USBHS_UGSTS_LOCK 0x00000100 /* From technical update */
#define PHYS_PER_CHANNEL 2