Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
arm
/
boot
/
dts
/
imx31.dtsi
diff --git
a/kernel/arch/arm/boot/dts/imx31.dtsi
b/kernel/arch/arm/boot/dts/imx31.dtsi
index
5fdb222
..
cbe5fd5
100644
(file)
--- a/
kernel/arch/arm/boot/dts/imx31.dtsi
+++ b/
kernel/arch/arm/boot/dts/imx31.dtsi
@@
-30,11
+30,11
@@
};
};
};
};
- avic:
avic-interrupt-controller@60
000000 {
+ avic:
interrupt-controller@68
000000 {
compatible = "fsl,imx31-avic", "fsl,avic";
interrupt-controller;
#interrupt-cells = <1>;
compatible = "fsl,imx31-avic", "fsl,avic";
interrupt-controller;
#interrupt-cells = <1>;
- reg = <0x6
0
000000 0x100000>;
+ reg = <0x6
8
000000 0x100000>;
};
soc {
};
soc {
@@
-110,13
+110,6
@@
interrupts = <19>;
clocks = <&clks 25>;
};
interrupts = <19>;
clocks = <&clks 25>;
};
-
- clks: ccm@53f80000{
- compatible = "fsl,imx31-ccm";
- reg = <0x53f80000 0x4000>;
- interrupts = <0 31 0x04 0 53 0x04>;
- #clock-cells = <1>;
- };
};
aips@53f00000 { /* AIPS2 */
};
aips@53f00000 { /* AIPS2 */
@@
-126,6
+119,13
@@
reg = <0x53f00000 0x100000>;
ranges;
reg = <0x53f00000 0x100000>;
ranges;
+ clks: ccm@53f80000{
+ compatible = "fsl,imx31-ccm";
+ reg = <0x53f80000 0x4000>;
+ interrupts = <31>, <53>;
+ #clock-cells = <1>;
+ };
+
gpt: timer@53f90000 {
compatible = "fsl,imx31-gpt";
reg = <0x53f90000 0x4000>;
gpt: timer@53f90000 {
compatible = "fsl,imx31-gpt";
reg = <0x53f90000 0x4000>;