Module Name: src
Committed By: jmcneill
Date: Sun Aug 12 18:00:32 UTC 2018
Modified Files:
src/sys/arch/arm/rockchip: rk_usb.c
Log Message:
Fix USB2 on RK3399
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/rockchip/rk_usb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/rockchip/rk_usb.c
diff -u src/sys/arch/arm/rockchip/rk_usb.c:1.5 src/sys/arch/arm/rockchip/rk_usb.c:1.6
--- src/sys/arch/arm/rockchip/rk_usb.c:1.5 Sun Aug 12 17:46:49 2018
+++ src/sys/arch/arm/rockchip/rk_usb.c Sun Aug 12 18:00:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_usb.c,v 1.5 2018/08/12 17:46:49 jmcneill Exp $ */
+/* $NetBSD: rk_usb.c,v 1.6 2018/08/12 18:00:32 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_usb.c,v 1.5 2018/08/12 17:46:49 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_usb.c,v 1.6 2018/08/12 18:00:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -314,7 +314,7 @@ rk_usbphy_otg_enable(device_t dev, void
RK3399_GRF_USB20_PHY0_CON1_REG :
RK3399_GRF_USB20_PHY1_CON1_REG;
write_mask = (RK3399_USBPHY_SUSPEND_N|RK3399_USBPHY_UTMI_SEL) << 16;
- write_val = RK3399_USBPHY_UTMI_SEL;
+ write_val = enable ? 0 : RK3399_USBPHY_UTMI_SEL;
break;
default:
return ENXIO;
@@ -353,7 +353,7 @@ rk_usbphy_host_enable(device_t dev, void
RK3399_GRF_USB20_PHY0_CON2_REG :
RK3399_GRF_USB20_PHY1_CON2_REG;
write_mask = (RK3399_USBPHY_SUSPEND_N|RK3399_USBPHY_UTMI_SEL) << 16;
- write_val = RK3399_USBPHY_UTMI_SEL;
+ write_val = enable ? 0 : RK3399_USBPHY_UTMI_SEL;
break;
default:
return ENXIO;
