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 'drm-intel-next-fixes-2016-08-05' of git://anongit.freedesktop.org/drm...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
animeo_ip.dts
diff --git
a/arch/arm/boot/dts/animeo_ip.dts
b/arch/arm/boot/dts/animeo_ip.dts
index
0962f2f
..
9cc372b
100644
(file)
--- a/
arch/arm/boot/dts/animeo_ip.dts
+++ b/
arch/arm/boot/dts/animeo_ip.dts
@@
-32,15
+32,6
@@
};
clocks {
};
clocks {
- #address-cells = <1>;
- #size-cells = <1>;
- ranges;
-
- main_clock: clock@0 {
- compatible = "atmel,osc", "fixed-clock";
- clock-frequency = <18432000>;
- };
-
slow_xtal {
clock-frequency = <32768>;
};
slow_xtal {
clock-frequency = <32768>;
};
@@
-114,7
+105,7
@@
};
};
};
};
- usb0: ohci@
00
500000 {
+ usb0: ohci@500000 {
num-ports = <2>;
atmel,vbus-gpio = <&pioB 15 GPIO_ACTIVE_LOW>;
status = "okay";
num-ports = <2>;
atmel,vbus-gpio = <&pioB 15 GPIO_ACTIVE_LOW>;
status = "okay";