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 remote-tracking branch 'asoc/fix/rcar' into asoc-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
dm814x.dtsi
diff --git
a/arch/arm/boot/dts/dm814x.dtsi
b/arch/arm/boot/dts/dm814x.dtsi
index 9708157f5daf6f7c84a76e521aae8d27e5684d68..681f5487406e39f7bdad2c793754149c0ab189d3 100644
(file)
--- a/
arch/arm/boot/dts/dm814x.dtsi
+++ b/
arch/arm/boot/dts/dm814x.dtsi
@@
-75,6
+75,7
@@
reg = <0x47401300 0x100>;
reg-names = "phy";
ti,ctrl_mod = <&usb_ctrl_mod>;
+ #phy-cells = <0>;
};
usb0: usb@47401000 {
@@
-385,6
+386,7
@@
reg = <0x1b00 0x100>;
reg-names = "phy";
ti,ctrl_mod = <&usb_ctrl_mod>;
+ #phy-cells = <0>;
};
};