projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-3.12-rc1' of git://gitorious.org/linux-pwm/linux-pwm
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-evmsk.dts
diff --git
a/arch/arm/boot/dts/am335x-evmsk.dts
b/arch/arm/boot/dts/am335x-evmsk.dts
index
62124c7
..
4f339fa
100644
(file)
--- a/
arch/arm/boot/dts/am335x-evmsk.dts
+++ b/
arch/arm/boot/dts/am335x-evmsk.dts
@@
-208,6
+208,22
@@
};
};
+ musb: usb@47400000 {
+ status = "okay";
+
+ control@44e10000 {
+ status = "okay";
+ };
+
+ usb-phy@47401300 {
+ status = "okay";
+ };
+
+ usb@47401000 {
+ status = "okay";
+ };
+ };
+
epwmss2: epwmss@48304000 {
status = "okay";