dts: x86: Move ioapic node out of cpu container
The IOAPIC node shouldn't have been in the cpu container, especially
since the cpu container does:
#address-cells = <1>;
#size-cells = <0>;
So the reg field of the IOAPIC would be treated as 2 registers instead
of a register and size. Move IOAPIC node out of the CPU node fixes this
issue.
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
diff --git a/dts/x86/apollo_lake.dtsi b/dts/x86/apollo_lake.dtsi
index cbb9d8f..020de99 100644
--- a/dts/x86/apollo_lake.dtsi
+++ b/dts/x86/apollo_lake.dtsi
@@ -20,12 +20,6 @@
reg = <0>;
};
- intc: ioapic@fec00000 {
- compatible = "intel,ioapic";
- reg = <0xfec00000 0x100000>;
- interrupt-controller;
- #interrupt-cells = <3>;
- };
};
flash0: flash@100000{
@@ -39,6 +33,12 @@
reg = <0x00400000 DT_SRAM_SIZE>;
};
+ intc: ioapic@fec00000 {
+ compatible = "intel,ioapic";
+ reg = <0xfec00000 0x100000>;
+ interrupt-controller;
+ #interrupt-cells = <3>;
+ };
soc {
#address-cells = <1>;
diff --git a/dts/x86/atom.dtsi b/dts/x86/atom.dtsi
index ddeebd1..af65b50 100644
--- a/dts/x86/atom.dtsi
+++ b/dts/x86/atom.dtsi
@@ -17,13 +17,6 @@
compatible = "atom";
reg = <0>;
};
-
- intc: ioapic@fec00000 {
- compatible = "intel,ioapic";
- reg = <0xfec00000 0x100000>;
- interrupt-controller;
- #interrupt-cells = <3>;
- };
};
flash0: flash@100000{
@@ -37,6 +30,12 @@
reg = <0x00400000 DT_SRAM_SIZE>;
};
+ intc: ioapic@fec00000 {
+ compatible = "intel,ioapic";
+ reg = <0xfec00000 0x100000>;
+ interrupt-controller;
+ #interrupt-cells = <3>;
+ };
soc {
#address-cells = <1>;
diff --git a/dts/x86/intel_curie.dtsi b/dts/x86/intel_curie.dtsi
index dca80d2..6501911 100644
--- a/dts/x86/intel_curie.dtsi
+++ b/dts/x86/intel_curie.dtsi
@@ -25,13 +25,6 @@
compatible = "arc";
reg = <1>;
};
-
- intc: ioapic@fec00000 {
- compatible = "intel,ioapic";
- reg = <0xfec00000 0x100000>;
- interrupt-controller;
- #interrupt-cells = <3>;
- };
};
flash0: flash@40010000 {
@@ -50,6 +43,13 @@
reg = <0xa8007000 DT_SRAM_SIZE>;
};
+ intc: ioapic@fec00000 {
+ compatible = "intel,ioapic";
+ reg = <0xfec00000 0x100000>;
+ interrupt-controller;
+ #interrupt-cells = <3>;
+ };
+
soc {
#address-cells = <1>;
#size-cells = <1>;
diff --git a/dts/x86/quark_x1000.dtsi b/dts/x86/quark_x1000.dtsi
index d926fea..e7d6180 100644
--- a/dts/x86/quark_x1000.dtsi
+++ b/dts/x86/quark_x1000.dtsi
@@ -19,13 +19,6 @@
compatible = "quark_x1000";
reg = <0>;
};
-
- intc: ioapic@fec00000 {
- compatible = "intel,ioapic";
- reg = <0xfec00000 0x100000>;
- interrupt-controller;
- #interrupt-cells = <3>;
- };
};
flash0: flash@100000{
@@ -39,6 +32,12 @@
reg = <0x00400000 DT_SRAM_SIZE>;
};
+ intc: ioapic@fec00000 {
+ compatible = "intel,ioapic";
+ reg = <0xfec00000 0x100000>;
+ interrupt-controller;
+ #interrupt-cells = <3>;
+ };
soc {
#address-cells = <1>;
