git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'amlogic-dt64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun8i-v40-bananapi-m2-berry.dts
diff --git
a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts
b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts
index a26d72c3f9b58e7fb635619a123f5894ad515002..35859d8f3267fd2a1d6fa7e716e97094895f3530 100644
(file)
--- a/
arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts
+++ b/
arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts
@@
-87,6
+87,11
@@
};
};
+&ehci1 {
+ /* Terminus Tech FE 1.1s 4-port USB 2.0 hub here */
+ status = "okay";
+};
+
&i2c0 {
status = "okay";
@@
-170,3
+175,8
@@
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
+
+&usbphy {
+ usb1_vbus-supply = <®_vcc5v0>;
+ status = "okay";
+};