diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-02-11 08:01:50 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-02-11 08:01:50 +0100 |
commit | c9ba7560c550fe6c1f4a8f0666bea41d2a349d1d (patch) | |
tree | b15d53e69f73b160b4625e91187cd436c5a3e683 /arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts | |
parent | f6783319737f28e4436a69611853a5a098cbe974 (diff) | |
parent | d13937116f1e82bf508a6325111b322c30c85eb9 (diff) |
Merge tag 'v5.0-rc6' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts')
-rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts index b0c64f75792c..8974b5a1d3b1 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts @@ -188,6 +188,7 @@ reg = <0x3a3>; interrupt-parent = <&r_intc>; interrupts = <0 IRQ_TYPE_LEVEL_LOW>; + x-powers,drive-vbus-en; /* set N_VBUSEN as output pin */ }; }; |