Skip to content

Commit

Permalink
MIPS: BMIPS: Use interrupt-controller node name
Browse files Browse the repository at this point in the history 
Changes node names of the interrupt-controller device nodes to
interrupt-controller instead of label strings.

Signed-off-by: Jaedon 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: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Jaedon Shin authored and Ralf Baechle committed Oct 6, 2016
1 parent cfc8be0 commit a2c510a
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 38 deletions.
8 changes: 4 additions & 4 deletions arch/mips/boot/dts/brcm/bcm7125.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
uart0 = &uart0;
};

cpu_intc: cpu_intc {
cpu_intc: interrupt-controller {
#address-cells = <0>;
compatible = "mti,cpu-interrupt-controller";

Expand Down Expand Up @@ -55,7 +55,7 @@
compatible = "simple-bus";
ranges = <0 0x10000000 0x01000000>;

periph_intc: periph_intc@441400 {
periph_intc: interrupt-controller@441400 {
compatible = "brcm,bcm7038-l1-intc";
reg = <0x441400 0x30>, <0x441600 0x30>;

Expand All @@ -66,7 +66,7 @@
interrupts = <2>, <3>;
};

sun_l2_intc: sun_l2_intc@401800 {
sun_l2_intc: interrupt-controller@401800 {
compatible = "brcm,l2-intc";
reg = <0x401800 0x30>;
interrupt-controller;
Expand All @@ -87,7 +87,7 @@
"avd_0", "jtag_0";
};

upg_irq0_intc: upg_irq0_intc@406780 {
upg_irq0_intc: interrupt-controller@406780 {
compatible = "brcm,bcm7120-l2-intc";
reg = <0x406780 0x8>;

Expand Down
10 changes: 5 additions & 5 deletions arch/mips/boot/dts/brcm/bcm7346.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
uart0 = &uart0;
};

cpu_intc: cpu_intc {
cpu_intc: interrupt-controller {
#address-cells = <0>;
compatible = "mti,cpu-interrupt-controller";

Expand Down Expand Up @@ -55,7 +55,7 @@
compatible = "simple-bus";
ranges = <0 0x10000000 0x01000000>;

periph_intc: periph_intc@411400 {
periph_intc: interrupt-controller@411400 {
compatible = "brcm,bcm7038-l1-intc";
reg = <0x411400 0x30>, <0x411600 0x30>;

Expand All @@ -66,7 +66,7 @@
interrupts = <2>, <3>;
};

sun_l2_intc: sun_l2_intc@403000 {
sun_l2_intc: interrupt-controller@403000 {
compatible = "brcm,l2-intc";
reg = <0x403000 0x30>;
interrupt-controller;
Expand All @@ -87,7 +87,7 @@
"jtag_0", "svd_0";
};

upg_irq0_intc: upg_irq0_intc@406780 {
upg_irq0_intc: interrupt-controller@406780 {
compatible = "brcm,bcm7120-l2-intc";
reg = <0x406780 0x8>;

Expand All @@ -102,7 +102,7 @@
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";
reg = <0x408b80 0x8>;

Expand Down
10 changes: 5 additions & 5 deletions arch/mips/boot/dts/brcm/bcm7358.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
uart0 = &uart0;
};

cpu_intc: cpu_intc {
cpu_intc: interrupt-controller {
#address-cells = <0>;
compatible = "mti,cpu-interrupt-controller";

Expand Down Expand Up @@ -49,7 +49,7 @@
compatible = "simple-bus";
ranges = <0 0x10000000 0x01000000>;

periph_intc: periph_intc@411400 {
periph_intc: interrupt-controller@411400 {
compatible = "brcm,bcm7038-l1-intc";
reg = <0x411400 0x30>;

Expand All @@ -60,7 +60,7 @@
interrupts = <2>;
};

sun_l2_intc: sun_l2_intc@403000 {
sun_l2_intc: interrupt-controller@403000 {
compatible = "brcm,l2-intc";
reg = <0x403000 0x30>;
interrupt-controller;
Expand All @@ -81,7 +81,7 @@
"avd_0", "jtag_0";
};

upg_irq0_intc: upg_irq0_intc@406600 {
upg_irq0_intc: interrupt-controller@406600 {
compatible = "brcm,bcm7120-l2-intc";
reg = <0x406600 0x8>;

Expand All @@ -96,7 +96,7 @@
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";
reg = <0x408b80 0x8>;

Expand Down
10 changes: 5 additions & 5 deletions arch/mips/boot/dts/brcm/bcm7360.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
uart0 = &uart0;
};

cpu_intc: cpu_intc {
cpu_intc: interrupt-controller {
#address-cells = <0>;
compatible = "mti,cpu-interrupt-controller";

Expand Down Expand Up @@ -49,7 +49,7 @@
compatible = "simple-bus";
ranges = <0 0x10000000 0x01000000>;

periph_intc: periph_intc@411400 {
periph_intc: interrupt-controller@411400 {
compatible = "brcm,bcm7038-l1-intc";
reg = <0x411400 0x30>;

Expand All @@ -60,7 +60,7 @@
interrupts = <2>;
};

sun_l2_intc: sun_l2_intc@403000 {
sun_l2_intc: interrupt-controller@403000 {
compatible = "brcm,l2-intc";
reg = <0x403000 0x30>;
interrupt-controller;
Expand All @@ -81,7 +81,7 @@
"avd_0", "jtag_0";
};

upg_irq0_intc: upg_irq0_intc@406600 {
upg_irq0_intc: interrupt-controller@406600 {
compatible = "brcm,bcm7120-l2-intc";
reg = <0x406600 0x8>;

Expand All @@ -96,7 +96,7 @@
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";
reg = <0x408b80 0x8>;

Expand Down
10 changes: 5 additions & 5 deletions arch/mips/boot/dts/brcm/bcm7362.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
uart0 = &uart0;
};

cpu_intc: cpu_intc {
cpu_intc: interrupt-controller {
#address-cells = <0>;
compatible = "mti,cpu-interrupt-controller";

Expand Down Expand Up @@ -55,7 +55,7 @@
compatible = "simple-bus";
ranges = <0 0x10000000 0x01000000>;

periph_intc: periph_intc@411400 {
periph_intc: interrupt-controller@411400 {
compatible = "brcm,bcm7038-l1-intc";
reg = <0x411400 0x30>, <0x411600 0x30>;

Expand All @@ -66,7 +66,7 @@
interrupts = <2>, <3>;
};

sun_l2_intc: sun_l2_intc@403000 {
sun_l2_intc: interrupt-controller@403000 {
compatible = "brcm,l2-intc";
reg = <0x403000 0x30>;
interrupt-controller;
Expand All @@ -87,7 +87,7 @@
"avd_0", "jtag_0";
};

upg_irq0_intc: upg_irq0_intc@406600 {
upg_irq0_intc: interrupt-controller@406600 {
compatible = "brcm,bcm7120-l2-intc";
reg = <0x406600 0x8>;

Expand All @@ -102,7 +102,7 @@
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";
reg = <0x408b80 0x8>;

Expand Down
8 changes: 4 additions & 4 deletions arch/mips/boot/dts/brcm/bcm7420.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
uart0 = &uart0;
};

cpu_intc: cpu_intc {
cpu_intc: interrupt-controller {
#address-cells = <0>;
compatible = "mti,cpu-interrupt-controller";

Expand Down Expand Up @@ -55,7 +55,7 @@
compatible = "simple-bus";
ranges = <0 0x10000000 0x01000000>;

periph_intc: periph_intc@441400 {
periph_intc: interrupt-controller@441400 {
compatible = "brcm,bcm7038-l1-intc";
reg = <0x441400 0x30>, <0x441600 0x30>;

Expand All @@ -66,7 +66,7 @@
interrupts = <2>, <3>;
};

sun_l2_intc: sun_l2_intc@401800 {
sun_l2_intc: interrupt-controller@401800 {
compatible = "brcm,l2-intc";
reg = <0x401800 0x30>;
interrupt-controller;
Expand All @@ -88,7 +88,7 @@
"jtag_0";
};

upg_irq0_intc: upg_irq0_intc@406780 {
upg_irq0_intc: interrupt-controller@406780 {
compatible = "brcm,bcm7120-l2-intc";
reg = <0x406780 0x8>;

Expand Down
10 changes: 5 additions & 5 deletions arch/mips/boot/dts/brcm/bcm7425.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
uart0 = &uart0;
};

cpu_intc: cpu_intc {
cpu_intc: interrupt-controller {
#address-cells = <0>;
compatible = "mti,cpu-interrupt-controller";

Expand Down Expand Up @@ -55,7 +55,7 @@
compatible = "simple-bus";
ranges = <0 0x10000000 0x01000000>;

periph_intc: periph_intc@41a400 {
periph_intc: interrupt-controller@41a400 {
compatible = "brcm,bcm7038-l1-intc";
reg = <0x41a400 0x30>, <0x41a600 0x30>;

Expand All @@ -66,7 +66,7 @@
interrupts = <2>, <3>;
};

sun_l2_intc: sun_l2_intc@403000 {
sun_l2_intc: interrupt-controller@403000 {
compatible = "brcm,l2-intc";
reg = <0x403000 0x30>;
interrupt-controller;
Expand All @@ -89,7 +89,7 @@
"vice_0";
};

upg_irq0_intc: upg_irq0_intc@406780 {
upg_irq0_intc: interrupt-controller@406780 {
compatible = "brcm,bcm7120-l2-intc";
reg = <0x406780 0x8>;

Expand All @@ -104,7 +104,7 @@
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";
reg = <0x409480 0x8>;

Expand Down
10 changes: 5 additions & 5 deletions arch/mips/boot/dts/brcm/bcm7435.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
uart0 = &uart0;
};

cpu_intc: cpu_intc {
cpu_intc: interrupt-controller {
#address-cells = <0>;
compatible = "mti,cpu-interrupt-controller";

Expand Down Expand Up @@ -67,7 +67,7 @@
compatible = "simple-bus";
ranges = <0 0x10000000 0x01000000>;

periph_intc: periph_intc@41b500 {
periph_intc: interrupt-controller@41b500 {
compatible = "brcm,bcm7038-l1-intc";
reg = <0x41b500 0x40>, <0x41b600 0x40>,
<0x41b700 0x40>, <0x41b800 0x40>;
Expand All @@ -79,7 +79,7 @@
interrupts = <2>, <3>, <2>, <3>;
};

sun_l2_intc: sun_l2_intc@403000 {
sun_l2_intc: interrupt-controller@403000 {
compatible = "brcm,l2-intc";
reg = <0x403000 0x30>;
interrupt-controller;
Expand All @@ -104,7 +104,7 @@
"scpu";
};

upg_irq0_intc: upg_irq0_intc@406780 {
upg_irq0_intc: interrupt-controller@406780 {
compatible = "brcm,bcm7120-l2-intc";
reg = <0x406780 0x8>;

Expand All @@ -119,7 +119,7 @@
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";
reg = <0x409480 0x8>;

Expand Down

0 comments on commit a2c510a

Please sign in to comment.