Skip to content

L
linux
Commit a2c510a2 authored by Jaedon Shin's avatar Jaedon Shin Committed by Ralf Baechle
Browse files
Options

MIPS: BMIPS: Use interrupt-controller node name 

Changes node names of the interrupt-controller device nodes to
interrupt-controller instead of label strings.
Signed-off-by: default avatarJaedon Shin <jaedon.shin@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Jonas Gorski <jonas.gorski@gmail.com>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: MIPS Mailing List <linux-mips@linux-mips.org>
Cc: devicetree@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14004/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent cfc8be04
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
arch/mips/boot/dts/brcm/bcm7125.dtsi
View file @ a2c510a2
...@@ -26,7 +26,7 @@ aliases { ...@@ -26,7 +26,7 @@ aliases {
uart0 = &uart0; uart0 = &uart0;
}; };
cpu_intc: cpu_intc { cpu_intc: interrupt-controller {
#address-cells = <0>; #address-cells = <0>;
compatible = "mti,cpu-interrupt-controller"; compatible = "mti,cpu-interrupt-controller";
...@@ -55,7 +55,7 @@ rdb { ...@@ -55,7 +55,7 @@ rdb {
compatible = "simple-bus"; compatible = "simple-bus";
ranges = <0 0x10000000 0x01000000>; ranges = <0 0x10000000 0x01000000>;
periph_intc: periph_intc@441400 { periph_intc: interrupt-controller@441400 {
compatible = "brcm,bcm7038-l1-intc"; compatible = "brcm,bcm7038-l1-intc";
reg = <0x441400 0x30>, <0x441600 0x30>; reg = <0x441400 0x30>, <0x441600 0x30>;
...@@ -66,7 +66,7 @@ periph_intc: periph_intc@441400 { ...@@ -66,7 +66,7 @@ periph_intc: periph_intc@441400 {
interrupts = <2>, <3>; interrupts = <2>, <3>;
}; };
sun_l2_intc: sun_l2_intc@401800 { sun_l2_intc: interrupt-controller@401800 {
compatible = "brcm,l2-intc"; compatible = "brcm,l2-intc";
reg = <0x401800 0x30>; reg = <0x401800 0x30>;
interrupt-controller; interrupt-controller;
...@@ -87,7 +87,7 @@ gisb-arb@400000 { ...@@ -87,7 +87,7 @@ gisb-arb@400000 {
"avd_0", "jtag_0"; "avd_0", "jtag_0";
}; };
upg_irq0_intc: upg_irq0_intc@406780 { upg_irq0_intc: interrupt-controller@406780 {
compatible = "brcm,bcm7120-l2-intc"; compatible = "brcm,bcm7120-l2-intc";
reg = <0x406780 0x8>; reg = <0x406780 0x8>;
......
arch/mips/boot/dts/brcm/bcm7346.dtsi
View file @ a2c510a2
...@@ -26,7 +26,7 @@ aliases { ...@@ -26,7 +26,7 @@ aliases {
uart0 = &uart0; uart0 = &uart0;
}; };
cpu_intc: cpu_intc { cpu_intc: interrupt-controller {
#address-cells = <0>; #address-cells = <0>;
compatible = "mti,cpu-interrupt-controller"; compatible = "mti,cpu-interrupt-controller";
...@@ -55,7 +55,7 @@ rdb { ...@@ -55,7 +55,7 @@ rdb {
compatible = "simple-bus"; compatible = "simple-bus";
ranges = <0 0x10000000 0x01000000>; ranges = <0 0x10000000 0x01000000>;
periph_intc: periph_intc@411400 { periph_intc: interrupt-controller@411400 {
compatible = "brcm,bcm7038-l1-intc"; compatible = "brcm,bcm7038-l1-intc";
reg = <0x411400 0x30>, <0x411600 0x30>; reg = <0x411400 0x30>, <0x411600 0x30>;
...@@ -66,7 +66,7 @@ periph_intc: periph_intc@411400 { ...@@ -66,7 +66,7 @@ periph_intc: periph_intc@411400 {
interrupts = <2>, <3>; interrupts = <2>, <3>;
}; };
sun_l2_intc: sun_l2_intc@403000 { sun_l2_intc: interrupt-controller@403000 {
compatible = "brcm,l2-intc"; compatible = "brcm,l2-intc";
reg = <0x403000 0x30>; reg = <0x403000 0x30>;
interrupt-controller; interrupt-controller;
...@@ -87,7 +87,7 @@ gisb-arb@400000 { ...@@ -87,7 +87,7 @@ gisb-arb@400000 {
"jtag_0", "svd_0"; "jtag_0", "svd_0";
}; };
upg_irq0_intc: upg_irq0_intc@406780 { upg_irq0_intc: interrupt-controller@406780 {
compatible = "brcm,bcm7120-l2-intc"; compatible = "brcm,bcm7120-l2-intc";
reg = <0x406780 0x8>; reg = <0x406780 0x8>;
...@@ -102,7 +102,7 @@ upg_irq0_intc: upg_irq0_intc@406780 { ...@@ -102,7 +102,7 @@ upg_irq0_intc: upg_irq0_intc@406780 {
interrupt-names = "upg_main", "upg_bsc"; interrupt-names = "upg_main", "upg_bsc";
}; };
upg_aon_irq0_intc: upg_aon_irq0_intc@408b80 { upg_aon_irq0_intc: interrupt-controller@408b80 {
compatible = "brcm,bcm7120-l2-intc"; compatible = "brcm,bcm7120-l2-intc";
reg = <0x408b80 0x8>; reg = <0x408b80 0x8>;
......
arch/mips/boot/dts/brcm/bcm7358.dtsi
View file @ a2c510a2
...@@ -20,7 +20,7 @@ aliases { ...@@ -20,7 +20,7 @@ aliases {
uart0 = &uart0; uart0 = &uart0;
}; };
cpu_intc: cpu_intc { cpu_intc: interrupt-controller {
#address-cells = <0>; #address-cells = <0>;
compatible = "mti,cpu-interrupt-controller"; compatible = "mti,cpu-interrupt-controller";
...@@ -49,7 +49,7 @@ rdb { ...@@ -49,7 +49,7 @@ rdb {
compatible = "simple-bus"; compatible = "simple-bus";
ranges = <0 0x10000000 0x01000000>; ranges = <0 0x10000000 0x01000000>;
periph_intc: periph_intc@411400 { periph_intc: interrupt-controller@411400 {
compatible = "brcm,bcm7038-l1-intc"; compatible = "brcm,bcm7038-l1-intc";
reg = <0x411400 0x30>; reg = <0x411400 0x30>;
...@@ -60,7 +60,7 @@ periph_intc: periph_intc@411400 { ...@@ -60,7 +60,7 @@ periph_intc: periph_intc@411400 {
interrupts = <2>; interrupts = <2>;
}; };
sun_l2_intc: sun_l2_intc@403000 { sun_l2_intc: interrupt-controller@403000 {
compatible = "brcm,l2-intc"; compatible = "brcm,l2-intc";
reg = <0x403000 0x30>; reg = <0x403000 0x30>;
interrupt-controller; interrupt-controller;
...@@ -81,7 +81,7 @@ gisb-arb@400000 { ...@@ -81,7 +81,7 @@ gisb-arb@400000 {
"avd_0", "jtag_0"; "avd_0", "jtag_0";
}; };
upg_irq0_intc: upg_irq0_intc@406600 { upg_irq0_intc: interrupt-controller@406600 {
compatible = "brcm,bcm7120-l2-intc"; compatible = "brcm,bcm7120-l2-intc";
reg = <0x406600 0x8>; reg = <0x406600 0x8>;
...@@ -96,7 +96,7 @@ upg_irq0_intc: upg_irq0_intc@406600 { ...@@ -96,7 +96,7 @@ upg_irq0_intc: upg_irq0_intc@406600 {
interrupt-names = "upg_main", "upg_bsc"; interrupt-names = "upg_main", "upg_bsc";
}; };
upg_aon_irq0_intc: upg_aon_irq0_intc@408b80 { upg_aon_irq0_intc: interrupt-controller@408b80 {
compatible = "brcm,bcm7120-l2-intc"; compatible = "brcm,bcm7120-l2-intc";
reg = <0x408b80 0x8>; reg = <0x408b80 0x8>;
......
arch/mips/boot/dts/brcm/bcm7360.dtsi
View file @ a2c510a2
...@@ -20,7 +20,7 @@ aliases { ...@@ -20,7 +20,7 @@ aliases {
uart0 = &uart0; uart0 = &uart0;
}; };
cpu_intc: cpu_intc { cpu_intc: interrupt-controller {
#address-cells = <0>; #address-cells = <0>;
compatible = "mti,cpu-interrupt-controller"; compatible = "mti,cpu-interrupt-controller";
...@@ -49,7 +49,7 @@ rdb { ...@@ -49,7 +49,7 @@ rdb {
compatible = "simple-bus"; compatible = "simple-bus";
ranges = <0 0x10000000 0x01000000>; ranges = <0 0x10000000 0x01000000>;
periph_intc: periph_intc@411400 { periph_intc: interrupt-controller@411400 {
compatible = "brcm,bcm7038-l1-intc"; compatible = "brcm,bcm7038-l1-intc";
reg = <0x411400 0x30>; reg = <0x411400 0x30>;
...@@ -60,7 +60,7 @@ periph_intc: periph_intc@411400 { ...@@ -60,7 +60,7 @@ periph_intc: periph_intc@411400 {
interrupts = <2>; interrupts = <2>;
}; };
sun_l2_intc: sun_l2_intc@403000 { sun_l2_intc: interrupt-controller@403000 {
compatible = "brcm,l2-intc"; compatible = "brcm,l2-intc";
reg = <0x403000 0x30>; reg = <0x403000 0x30>;
interrupt-controller; interrupt-controller;
...@@ -81,7 +81,7 @@ gisb-arb@400000 { ...@@ -81,7 +81,7 @@ gisb-arb@400000 {
"avd_0", "jtag_0"; "avd_0", "jtag_0";
}; };
upg_irq0_intc: upg_irq0_intc@406600 { upg_irq0_intc: interrupt-controller@406600 {
compatible = "brcm,bcm7120-l2-intc"; compatible = "brcm,bcm7120-l2-intc";
reg = <0x406600 0x8>; reg = <0x406600 0x8>;
...@@ -96,7 +96,7 @@ upg_irq0_intc: upg_irq0_intc@406600 { ...@@ -96,7 +96,7 @@ upg_irq0_intc: upg_irq0_intc@406600 {
interrupt-names = "upg_main", "upg_bsc"; interrupt-names = "upg_main", "upg_bsc";
}; };
upg_aon_irq0_intc: upg_aon_irq0_intc@408b80 { upg_aon_irq0_intc: interrupt-controller@408b80 {
compatible = "brcm,bcm7120-l2-intc"; compatible = "brcm,bcm7120-l2-intc";
reg = <0x408b80 0x8>; reg = <0x408b80 0x8>;
......
arch/mips/boot/dts/brcm/bcm7362.dtsi
View file @ a2c510a2
...@@ -26,7 +26,7 @@ aliases { ...@@ -26,7 +26,7 @@ aliases {
uart0 = &uart0; uart0 = &uart0;
}; };
cpu_intc: cpu_intc { cpu_intc: interrupt-controller {
#address-cells = <0>; #address-cells = <0>;
compatible = "mti,cpu-interrupt-controller"; compatible = "mti,cpu-interrupt-controller";
...@@ -55,7 +55,7 @@ rdb { ...@@ -55,7 +55,7 @@ rdb {
compatible = "simple-bus"; compatible = "simple-bus";
ranges = <0 0x10000000 0x01000000>; ranges = <0 0x10000000 0x01000000>;
periph_intc: periph_intc@411400 { periph_intc: interrupt-controller@411400 {
compatible = "brcm,bcm7038-l1-intc"; compatible = "brcm,bcm7038-l1-intc";
reg = <0x411400 0x30>, <0x411600 0x30>; reg = <0x411400 0x30>, <0x411600 0x30>;
...@@ -66,7 +66,7 @@ periph_intc: periph_intc@411400 { ...@@ -66,7 +66,7 @@ periph_intc: periph_intc@411400 {
interrupts = <2>, <3>; interrupts = <2>, <3>;
}; };
sun_l2_intc: sun_l2_intc@403000 { sun_l2_intc: interrupt-controller@403000 {
compatible = "brcm,l2-intc"; compatible = "brcm,l2-intc";
reg = <0x403000 0x30>; reg = <0x403000 0x30>;
interrupt-controller; interrupt-controller;
...@@ -87,7 +87,7 @@ gisb-arb@400000 { ...@@ -87,7 +87,7 @@ gisb-arb@400000 {
"avd_0", "jtag_0"; "avd_0", "jtag_0";
}; };
upg_irq0_intc: upg_irq0_intc@406600 { upg_irq0_intc: interrupt-controller@406600 {
compatible = "brcm,bcm7120-l2-intc"; compatible = "brcm,bcm7120-l2-intc";
reg = <0x406600 0x8>; reg = <0x406600 0x8>;
...@@ -102,7 +102,7 @@ upg_irq0_intc: upg_irq0_intc@406600 { ...@@ -102,7 +102,7 @@ upg_irq0_intc: upg_irq0_intc@406600 {
interrupt-names = "upg_main", "upg_bsc"; interrupt-names = "upg_main", "upg_bsc";
}; };
upg_aon_irq0_intc: upg_aon_irq0_intc@408b80 { upg_aon_irq0_intc: interrupt-controller@408b80 {
compatible = "brcm,bcm7120-l2-intc"; compatible = "brcm,bcm7120-l2-intc";
reg = <0x408b80 0x8>; reg = <0x408b80 0x8>;
......
arch/mips/boot/dts/brcm/bcm7420.dtsi
View file @ a2c510a2
...@@ -26,7 +26,7 @@ aliases { ...@@ -26,7 +26,7 @@ aliases {
uart0 = &uart0; uart0 = &uart0;
}; };
cpu_intc: cpu_intc { cpu_intc: interrupt-controller {
#address-cells = <0>; #address-cells = <0>;
compatible = "mti,cpu-interrupt-controller"; compatible = "mti,cpu-interrupt-controller";
...@@ -55,7 +55,7 @@ rdb { ...@@ -55,7 +55,7 @@ rdb {
compatible = "simple-bus"; compatible = "simple-bus";
ranges = <0 0x10000000 0x01000000>; ranges = <0 0x10000000 0x01000000>;
periph_intc: periph_intc@441400 { periph_intc: interrupt-controller@441400 {
compatible = "brcm,bcm7038-l1-intc"; compatible = "brcm,bcm7038-l1-intc";
reg = <0x441400 0x30>, <0x441600 0x30>; reg = <0x441400 0x30>, <0x441600 0x30>;
...@@ -66,7 +66,7 @@ periph_intc: periph_intc@441400 { ...@@ -66,7 +66,7 @@ periph_intc: periph_intc@441400 {
interrupts = <2>, <3>; interrupts = <2>, <3>;
}; };
sun_l2_intc: sun_l2_intc@401800 { sun_l2_intc: interrupt-controller@401800 {
compatible = "brcm,l2-intc"; compatible = "brcm,l2-intc";
reg = <0x401800 0x30>; reg = <0x401800 0x30>;
interrupt-controller; interrupt-controller;
...@@ -88,7 +88,7 @@ gisb-arb@400000 { ...@@ -88,7 +88,7 @@ gisb-arb@400000 {
"jtag_0"; "jtag_0";
}; };
upg_irq0_intc: upg_irq0_intc@406780 { upg_irq0_intc: interrupt-controller@406780 {
compatible = "brcm,bcm7120-l2-intc"; compatible = "brcm,bcm7120-l2-intc";
reg = <0x406780 0x8>; reg = <0x406780 0x8>;
......
arch/mips/boot/dts/brcm/bcm7425.dtsi
View file @ a2c510a2
...@@ -26,7 +26,7 @@ aliases { ...@@ -26,7 +26,7 @@ aliases {
uart0 = &uart0; uart0 = &uart0;
}; };
cpu_intc: cpu_intc { cpu_intc: interrupt-controller {
#address-cells = <0>; #address-cells = <0>;
compatible = "mti,cpu-interrupt-controller"; compatible = "mti,cpu-interrupt-controller";
...@@ -55,7 +55,7 @@ rdb { ...@@ -55,7 +55,7 @@ rdb {
compatible = "simple-bus"; compatible = "simple-bus";
ranges = <0 0x10000000 0x01000000>; ranges = <0 0x10000000 0x01000000>;
periph_intc: periph_intc@41a400 { periph_intc: interrupt-controller@41a400 {
compatible = "brcm,bcm7038-l1-intc"; compatible = "brcm,bcm7038-l1-intc";
reg = <0x41a400 0x30>, <0x41a600 0x30>; reg = <0x41a400 0x30>, <0x41a600 0x30>;
...@@ -66,7 +66,7 @@ periph_intc: periph_intc@41a400 { ...@@ -66,7 +66,7 @@ periph_intc: periph_intc@41a400 {
interrupts = <2>, <3>; interrupts = <2>, <3>;
}; };
sun_l2_intc: sun_l2_intc@403000 { sun_l2_intc: interrupt-controller@403000 {
compatible = "brcm,l2-intc"; compatible = "brcm,l2-intc";
reg = <0x403000 0x30>; reg = <0x403000 0x30>;
interrupt-controller; interrupt-controller;
...@@ -89,7 +89,7 @@ gisb-arb@400000 { ...@@ -89,7 +89,7 @@ gisb-arb@400000 {
"vice_0"; "vice_0";
}; };
upg_irq0_intc: upg_irq0_intc@406780 { upg_irq0_intc: interrupt-controller@406780 {
compatible = "brcm,bcm7120-l2-intc"; compatible = "brcm,bcm7120-l2-intc";
reg = <0x406780 0x8>; reg = <0x406780 0x8>;
...@@ -104,7 +104,7 @@ upg_irq0_intc: upg_irq0_intc@406780 { ...@@ -104,7 +104,7 @@ upg_irq0_intc: upg_irq0_intc@406780 {
interrupt-names = "upg_main", "upg_bsc"; interrupt-names = "upg_main", "upg_bsc";
}; };
upg_aon_irq0_intc: upg_aon_irq0_intc@409480 { upg_aon_irq0_intc: interrupt-controller@409480 {
compatible = "brcm,bcm7120-l2-intc"; compatible = "brcm,bcm7120-l2-intc";
reg = <0x409480 0x8>; reg = <0x409480 0x8>;
......
arch/mips/boot/dts/brcm/bcm7435.dtsi
View file @ a2c510a2
...@@ -38,7 +38,7 @@ aliases { ...@@ -38,7 +38,7 @@ aliases {
uart0 = &uart0; uart0 = &uart0;
}; };
cpu_intc: cpu_intc { cpu_intc: interrupt-controller {
#address-cells = <0>; #address-cells = <0>;
compatible = "mti,cpu-interrupt-controller"; compatible = "mti,cpu-interrupt-controller";
...@@ -67,7 +67,7 @@ rdb { ...@@ -67,7 +67,7 @@ rdb {
compatible = "simple-bus"; compatible = "simple-bus";
ranges = <0 0x10000000 0x01000000>; ranges = <0 0x10000000 0x01000000>;
periph_intc: periph_intc@41b500 { periph_intc: interrupt-controller@41b500 {
compatible = "brcm,bcm7038-l1-intc"; compatible = "brcm,bcm7038-l1-intc";
reg = <0x41b500 0x40>, <0x41b600 0x40>, reg = <0x41b500 0x40>, <0x41b600 0x40>,
<0x41b700 0x40>, <0x41b800 0x40>; <0x41b700 0x40>, <0x41b800 0x40>;
...@@ -79,7 +79,7 @@ periph_intc: periph_intc@41b500 { ...@@ -79,7 +79,7 @@ periph_intc: periph_intc@41b500 {
interrupts = <2>, <3>, <2>, <3>; interrupts = <2>, <3>, <2>, <3>;
}; };
sun_l2_intc: sun_l2_intc@403000 { sun_l2_intc: interrupt-controller@403000 {
compatible = "brcm,l2-intc"; compatible = "brcm,l2-intc";
reg = <0x403000 0x30>; reg = <0x403000 0x30>;
interrupt-controller; interrupt-controller;
...@@ -104,7 +104,7 @@ gisb-arb@400000 { ...@@ -104,7 +104,7 @@ gisb-arb@400000 {
"scpu"; "scpu";
}; };
upg_irq0_intc: upg_irq0_intc@406780 { upg_irq0_intc: interrupt-controller@406780 {
compatible = "brcm,bcm7120-l2-intc"; compatible = "brcm,bcm7120-l2-intc";
reg = <0x406780 0x8>; reg = <0x406780 0x8>;
...@@ -119,7 +119,7 @@ upg_irq0_intc: upg_irq0_intc@406780 { ...@@ -119,7 +119,7 @@ upg_irq0_intc: upg_irq0_intc@406780 {
interrupt-names = "upg_main", "upg_bsc"; interrupt-names = "upg_main", "upg_bsc";
}; };
upg_aon_irq0_intc: upg_aon_irq0_intc@409480 { upg_aon_irq0_intc: interrupt-controller@409480 {
compatible = "brcm,bcm7120-l2-intc"; compatible = "brcm,bcm7120-l2-intc";
reg = <0x409480 0x8>; reg = <0x409480 0x8>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7