Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git]
/
kernel
/
arch
/
arm
/
boot
/
dts
/
imx35.dtsi
diff --git
a/kernel/arch/arm/boot/dts/imx35.dtsi
b/kernel/arch/arm/boot/dts/imx35.dtsi
index
b6478e9
..
e6540b5
100644
(file)
--- a/
kernel/arch/arm/boot/dts/imx35.dtsi
+++ b/
kernel/arch/arm/boot/dts/imx35.dtsi
@@
-286,8
+286,8
@@
can1: can@53fe4000 {
compatible = "fsl,imx35-flexcan", "fsl,p1010-flexcan";
reg = <0x53fe4000 0x1000>;
can1: can@53fe4000 {
compatible = "fsl,imx35-flexcan", "fsl,p1010-flexcan";
reg = <0x53fe4000 0x1000>;
- clocks = <&clks 33>;
- clock-names = "ipg";
+ clocks = <&clks 33>
, <&clks 33>
;
+ clock-names = "ipg"
, "per"
;
interrupts = <43>;
status = "disabled";
};
interrupts = <43>;
status = "disabled";
};
@@
-295,8
+295,8
@@
can2: can@53fe8000 {
compatible = "fsl,imx35-flexcan", "fsl,p1010-flexcan";
reg = <0x53fe8000 0x1000>;
can2: can@53fe8000 {
compatible = "fsl,imx35-flexcan", "fsl,p1010-flexcan";
reg = <0x53fe8000 0x1000>;
- clocks = <&clks 34>;
- clock-names = "ipg";
+ clocks = <&clks 34>
, <&clks 34>
;
+ clock-names = "ipg"
, "per"
;
interrupts = <44>;
status = "disabled";
};
interrupts = <44>;
status = "disabled";
};