diff options
| author | David S. Miller | 2015-06-09 05:06:56 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-06-09 05:06:56 +0200 |
| commit | 941742f49762ba4c908510f036b09a46c1b14513 (patch) | |
| tree | aafb7a72c2072f98889406668003234bed56df02 /drivers/phy/phy-rcar-gen2.c | |
| parent | net: phy: dp83867: Fix device tree entries (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-941742f49762ba4c908510f036b09a46c1b14513.tar.gz kernel-qcow2-linux-941742f49762ba4c908510f036b09a46c1b14513.tar.xz kernel-qcow2-linux-941742f49762ba4c908510f036b09a46c1b14513.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/phy/phy-rcar-gen2.c')
| -rw-r--r-- | drivers/phy/phy-rcar-gen2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/phy/phy-rcar-gen2.c b/drivers/phy/phy-rcar-gen2.c index 778276aba3aa..97d45f47d1ad 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 |