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 git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
uniphier-ld6b-ref.dts
diff --git
a/arch/arm/boot/dts/uniphier-ld6b-ref.dts
b/arch/arm/boot/dts/uniphier-ld6b-ref.dts
index a0a44a422e1259a8688051c978f9cd68ecedc3d5..3d9080ee7aef73b5a1642757d5931b5345e698a6 100644
(file)
--- a/
arch/arm/boot/dts/uniphier-ld6b-ref.dts
+++ b/
arch/arm/boot/dts/uniphier-ld6b-ref.dts
@@
-65,6
+65,10
@@
status = "okay";
};
+&sd {
+ status = "okay";
+};
+
ð {
status = "okay";
phy-handle = <ðphy>;
@@
-76,6
+80,14
@@
};
};
+&usb0 {
+ status = "okay";
+};
+
+&usb1 {
+ status = "okay";
+};
+
&nand {
status = "okay";
};