projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm64: dts: Fix broken architected timer interrupt trigger
[linux-2.6-block.git]
/
arch
/
arm64
/
boot
/
dts
/
apm
/
apm-storm.dtsi
diff --git
a/arch/arm64/boot/dts/apm/apm-storm.dtsi
b/arch/arm64/boot/dts/apm/apm-storm.dtsi
index 6bf7cbe2e72d502d3f417290245bd4c953c53511..c29dab9d18345100e17cd8f8db97a4db9e4427a2 100644
(file)
--- a/
arch/arm64/boot/dts/apm/apm-storm.dtsi
+++ b/
arch/arm64/boot/dts/apm/apm-storm.dtsi
@@
-110,10
+110,10
@@
timer {
compatible = "arm,armv8-timer";
timer {
compatible = "arm,armv8-timer";
- interrupts = <1 0 0xff0
1
>, /* Secure Phys IRQ */
- <1 13 0xff0
1
>, /* Non-secure Phys IRQ */
- <1 14 0xff0
1
>, /* Virt IRQ */
- <1 15 0xff0
1
>; /* Hyp IRQ */
+ interrupts = <1 0 0xff0
8
>, /* Secure Phys IRQ */
+ <1 13 0xff0
8
>, /* Non-secure Phys IRQ */
+ <1 14 0xff0
8
>, /* Virt IRQ */
+ <1 15 0xff0
8
>; /* Hyp IRQ */
clock-frequency = <50000000>;
};
clock-frequency = <50000000>;
};
@@
-199,16
+199,6
@@
clock-output-names = "sdioclk";
};
clock-output-names = "sdioclk";
};
- qmlclk: qmlclk {
- compatible = "apm,xgene-device-clock";
- #clock-cells = <1>;
- clocks = <&socplldiv2 0>;
- clock-names = "qmlclk";
- reg = <0x0 0x1703C000 0x0 0x1000>;
- reg-names = "csr-reg";
- clock-output-names = "qmlclk";
- };
-
ethclk: ethclk {
compatible = "apm,xgene-device-clock";
#clock-cells = <1>;
ethclk: ethclk {
compatible = "apm,xgene-device-clock";
#clock-cells = <1>;
@@
-226,7
+216,7
@@
compatible = "apm,xgene-device-clock";
#clock-cells = <1>;
clocks = <ðclk 0>;
compatible = "apm,xgene-device-clock";
#clock-cells = <1>;
clocks = <ðclk 0>;
- reg = <0x0 0x1702
C
000 0x0 0x1000>;
+ reg = <0x0 0x1702
c
000 0x0 0x1000>;
reg-names = "csr-reg";
clock-output-names = "menetclk";
};
reg-names = "csr-reg";
clock-output-names = "menetclk";
};
@@
-924,8
+914,8
@@
compatible = "apm,xgene-enet";
status = "disabled";
reg = <0x0 0x17020000 0x0 0xd100>,
compatible = "apm,xgene-enet";
status = "disabled";
reg = <0x0 0x17020000 0x0 0xd100>,
- <0x0 0
X17030000 0x0 0X
c300>,
- <0x0 0
X10000000 0x0 0X
200>;
+ <0x0 0
x17030000 0x0 0x
c300>,
+ <0x0 0
x10000000 0x0 0x
200>;
reg-names = "enet_csr", "ring_csr", "ring_cmd";
interrupts = <0x0 0x3c 0x4>;
dma-coherent;
reg-names = "enet_csr", "ring_csr", "ring_cmd";
interrupts = <0x0 0x3c 0x4>;
dma-coherent;
@@
-950,11
+940,11
@@
compatible = "apm,xgene1-sgenet";
status = "disabled";
reg = <0x0 0x1f210000 0x0 0xd100>,
compatible = "apm,xgene1-sgenet";
status = "disabled";
reg = <0x0 0x1f210000 0x0 0xd100>,
- <0x0 0x1f200000 0x0 0
X
c300>,
- <0x0 0x1
B000000 0x0 0X
200>;
+ <0x0 0x1f200000 0x0 0
x
c300>,
+ <0x0 0x1
b000000 0x0 0x
200>;
reg-names = "enet_csr", "ring_csr", "ring_cmd";
reg-names = "enet_csr", "ring_csr", "ring_cmd";
- interrupts = <0x0 0x
A
0 0x4>,
- <0x0 0x
A
1 0x4>;
+ interrupts = <0x0 0x
a
0 0x4>,
+ <0x0 0x
a
1 0x4>;
dma-coherent;
clocks = <&sge0clk 0>;
local-mac-address = [00 00 00 00 00 00];
dma-coherent;
clocks = <&sge0clk 0>;
local-mac-address = [00 00 00 00 00 00];
@@
-966,11
+956,11
@@
compatible = "apm,xgene1-sgenet";
status = "disabled";
reg = <0x0 0x1f210030 0x0 0xd100>,
compatible = "apm,xgene1-sgenet";
status = "disabled";
reg = <0x0 0x1f210030 0x0 0xd100>,
- <0x0 0x1f200000 0x0 0
X
c300>,
- <0x0 0x1
B000000 0x0 0X
8000>;
+ <0x0 0x1f200000 0x0 0
x
c300>,
+ <0x0 0x1
b000000 0x0 0x
8000>;
reg-names = "enet_csr", "ring_csr", "ring_cmd";
reg-names = "enet_csr", "ring_csr", "ring_cmd";
- interrupts = <0x0 0x
AC
0x4>,
- <0x0 0x
AD
0x4>;
+ interrupts = <0x0 0x
ac
0x4>,
+ <0x0 0x
ad
0x4>;
port-id = <1>;
dma-coherent;
local-mac-address = [00 00 00 00 00 00];
port-id = <1>;
dma-coherent;
local-mac-address = [00 00 00 00 00 00];
@@
-982,8
+972,8
@@
compatible = "apm,xgene1-xgenet";
status = "disabled";
reg = <0x0 0x1f610000 0x0 0xd100>,
compatible = "apm,xgene1-xgenet";
status = "disabled";
reg = <0x0 0x1f610000 0x0 0xd100>,
- <0x0 0x1f600000 0x0 0
X
c300>,
- <0x0 0x18000000 0x0 0
X
200>;
+ <0x0 0x1f600000 0x0 0
x
c300>,
+ <0x0 0x18000000 0x0 0
x
200>;
reg-names = "enet_csr", "ring_csr", "ring_cmd";
interrupts = <0x0 0x60 0x4>,
<0x0 0x61 0x4>,
reg-names = "enet_csr", "ring_csr", "ring_cmd";
interrupts = <0x0 0x60 0x4>,
<0x0 0x61 0x4>,
@@
-1005,11
+995,11
@@
compatible = "apm,xgene1-xgenet";
status = "disabled";
reg = <0x0 0x1f620000 0x0 0xd100>,
compatible = "apm,xgene1-xgenet";
status = "disabled";
reg = <0x0 0x1f620000 0x0 0xd100>,
- <0x0 0x1f600000 0x0 0
X
c300>,
- <0x0 0x18000000 0x0 0
X
8000>;
+ <0x0 0x1f600000 0x0 0
x
c300>,
+ <0x0 0x18000000 0x0 0
x
8000>;
reg-names = "enet_csr", "ring_csr", "ring_cmd";
reg-names = "enet_csr", "ring_csr", "ring_cmd";
- interrupts = <0x0 0x6
C
0x4>,
- <0x0 0x6
D
0x4>;
+ interrupts = <0x0 0x6
c
0x4>,
+ <0x0 0x6
d
0x4>;
port-id = <1>;
dma-coherent;
clocks = <&xge1clk 0>;
port-id = <1>;
dma-coherent;
clocks = <&xge1clk 0>;