git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
arm
/
boot
/
dts
/
imx53.dtsi
diff --git
a/arch/arm/boot/dts/imx53.dtsi
b/arch/arm/boot/dts/imx53.dtsi
index
552aed4
..
edc3f1e
100644
(file)
--- a/
arch/arm/boot/dts/imx53.dtsi
+++ b/
arch/arm/boot/dts/imx53.dtsi
@@
-492,7
+492,7
@@
compatible = "fsl,imx53-flexcan", "fsl,p1010-flexcan";
reg = <0x53fcc000 0x4000>;
interrupts = <83>;
- clocks = <&clks
158>, <&clks 157
>;
+ clocks = <&clks
87>, <&clks 86
>;
clock-names = "ipg", "per";
status = "disabled";
};