[src/trunk]: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip Merg...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/51393bc228a5
branches:  trunk
changeset: 999188:51393bc228a5
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu May 23 21:37:55 2019 +0000

description:
Merge the following commits from upstream:

arm64: dts: rockchip: enable usb-host regulators at boot on rk3328-rock64
https://github.com/torvalds/linux/commit/26e2d7b03ea7ff254bf78305aa44dda62e70b78e

arm64: dts: rockchip: Fix vcc_host1_5v GPIO polarity on rk3328-rock64
https://github.com/torvalds/linux/commit/a8772e5d826d0f61f8aa9c284b3ab49035d5273d

diffstat:

 sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 0709fdcad0ea -r 51393bc228a5 sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
--- a/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts Thu May 23 21:36:26 2019 +0000
+++ b/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts Thu May 23 21:37:55 2019 +0000
@@ -40,17 +40,18 @@
                pinctrl-0 = <&usb30_host_drv>;
                regulator-name = "vcc_host_5v";
                regulator-always-on;
+               regulator-boot-on;
                vin-supply = <&vcc_sys>;
        };
 
        vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator {
                compatible = "regulator-fixed";
-               enable-active-high;
-               gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb20_host_drv>;
                regulator-name = "vcc_host1_5v";
                regulator-always-on;
+               regulator-boot-on;
                vin-supply = <&vcc_sys>;
        };