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 'nfs-for-4.14-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
clock
/
imx5-clock.txt
diff --git
a/Documentation/devicetree/bindings/clock/imx5-clock.txt
b/Documentation/devicetree/bindings/clock/imx5-clock.txt
index cadc4d29ada6663716c5135f78adcc3df902ee8e..a24ca9e582d2768380fef60819eb2e8820e6688c 100644
(file)
--- a/
Documentation/devicetree/bindings/clock/imx5-clock.txt
+++ b/
Documentation/devicetree/bindings/clock/imx5-clock.txt
@@
-25,5
+25,4
@@
can1: can@53fc8000 {
interrupts = <82>;
clocks = <&clks IMX5_CLK_CAN1_IPG_GATE>, <&clks IMX5_CLK_CAN1_SERIAL_GATE>;
clock-names = "ipg", "per";
- status = "disabled";
};