[PATCH 3/4] mips: bmips: dts: fix qspi interrupt order

Jonas Gorski
2025-12-25T10:26:20Z

The binding for brcm,spi-bcm-qspi requires the interrupt-names in a
certain order, so reorder the interrupts to match it.

Fixes warnings like:

arch/mips/boot/dts/brcm/bcm97435svmb.dtb: spi@41d200 (brcm,spi-brcmstb-qspi): interrupt-names: 'oneOf' conditional failed, one must be fixed:
['spi_lr_fullness_reached', 'spi_lr_session_aborted', 'spi_lr_impatient', 'spi_lr_session_done', 'spi_lr_overread', 'mspi_done', 'mspi_halted'] is too long
'mspi_done' was expected
'spi_l1_intr' was expected
'mspi_halted' was expected
'spi_lr_fullness_reached' was expected
'spi_lr_session_aborted' was expected
'spi_lr_impatient' was expected
'spi_lr_session_done' was expected
'spi_lr_overread' was expected
from schema $id: http://devicetree.org/schemas/spi/brcm,spi-bcm-qspi.yaml

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
---
arch/mips/boot/dts/brcm/bcm7125.dtsi | 10 +++++-----
arch/mips/boot/dts/brcm/bcm7346.dtsi | 10 +++++-----
arch/mips/boot/dts/brcm/bcm7358.dtsi | 10 +++++-----
arch/mips/boot/dts/brcm/bcm7360.dtsi | 10 +++++-----
arch/mips/boot/dts/brcm/bcm7362.dtsi | 10 +++++-----
arch/mips/boot/dts/brcm/bcm7420.dtsi | 10 +++++-----
arch/mips/boot/dts/brcm/bcm7425.dtsi | 10 +++++-----
arch/mips/boot/dts/brcm/bcm7435.dtsi | 10 +++++-----
8 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/arch/mips/boot/dts/brcm/bcm7125.dtsi b/arch/mips/boot/dts/brcm/bcm7125.dtsi
index 92963a1998b7..dd1cc3cda694 100644
--- a/arch/mips/boot/dts/brcm/bcm7125.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7125.dtsi
@@ -252,15 +252,15 @@ qspi: spi@443000 {
clocks = <&upg_clk>;
reg = <0x440920 0x4 0x443200 0x188 0x443000 0x50>;
reg-names = "cs_reg", "hif_mspi", "bspi";
- interrupts = <0x0 0x1 0x2 0x3 0x4 0x5 0x6>;
+ interrupts = <0x5 0x6 0x0 0x1 0x2 0x3 0x4>;
interrupt-parent = <&spi_l2_intc>;
- interrupt-names = "spi_lr_fullness_reached",
+ interrupt-names = "mspi_done",
+ "mspi_halted",
+ "spi_lr_fullness_reached",
"spi_lr_session_aborted",
"spi_lr_impatient",
"spi_lr_session_done",
- "spi_lr_overread",
- "mspi_done",
- "mspi_halted";
+ "spi_lr_overread";
status = "disabled";
};

diff --git a/arch/mips/boot/dts/brcm/bcm7346.dtsi b/arch/mips/boot/dts/brcm/bcm7346.dtsi
index 42125684b523..21c7418aaf0d 100644
--- a/arch/mips/boot/dts/brcm/bcm7346.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7346.dtsi
@@ -476,15 +476,15 @@ qspi: spi@413000 {
clocks = <&upg_clk>;
reg = <0x410920 0x4 0x413200 0x188 0x413000 0x50>;
reg-names = "cs_reg", "hif_mspi", "bspi";
- interrupts = <0x0 0x1 0x2 0x3 0x4 0x5 0x6>;
+ interrupts = <0x5 0x6 0x0 0x1 0x2 0x3 0x4>;
interrupt-parent = <&spi_l2_intc>;
- interrupt-names = "spi_lr_fullness_reached",
+ interrupt-names = "mspi_done",
+ "mspi_halted",
+ "spi_lr_fullness_reached",
"spi_lr_session_aborted",
"spi_lr_impatient",
"spi_lr_session_done",
- "spi_lr_overread",
- "mspi_done",
- "mspi_halted";
+ "spi_lr_overread";
status = "disabled";
};

diff --git a/arch/mips/boot/dts/brcm/bcm7358.dtsi b/arch/mips/boot/dts/brcm/bcm7358.dtsi
index fdc52acab8c8..63b3a42a8dc6 100644
--- a/arch/mips/boot/dts/brcm/bcm7358.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7358.dtsi
@@ -344,15 +344,15 @@ qspi: spi@413000 {
clocks = <&upg_clk>;
reg = <0x410920 0x4 0x413200 0x188 0x413000 0x50>;
reg-names = "cs_reg", "hif_mspi", "bspi";
- interrupts = <0x0 0x1 0x2 0x3 0x4 0x5 0x6>;
+ interrupts = <0x5 0x6 0x0 0x1 0x2 0x3 0x4>;
interrupt-parent = <&spi_l2_intc>;
- interrupt-names = "spi_lr_fullness_reached",
+ interrupt-names = "mspi_done",
+ "mspi_halted",
+ "spi_lr_fullness_reached",
"spi_lr_session_aborted",
"spi_lr_impatient",
"spi_lr_session_done",
- "spi_lr_overread",
- "mspi_done",
- "mspi_halted";
+ "spi_lr_overread";
status = "disabled";
};

diff --git a/arch/mips/boot/dts/brcm/bcm7360.dtsi b/arch/mips/boot/dts/brcm/bcm7360.dtsi
index e8b0b0ff7588..9d89da400104 100644
--- a/arch/mips/boot/dts/brcm/bcm7360.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7360.dtsi
@@ -395,15 +395,15 @@ qspi: spi@413000 {
clocks = <&upg_clk>;
reg = <0x410920 0x4 0x413200 0x188 0x413000 0x50>;
reg-names = "cs_reg", "hif_mspi", "bspi";
- interrupts = <0x0 0x1 0x2 0x3 0x4 0x5 0x6>;
+ interrupts = <0x5 0x6 0x0 0x1 0x2 0x3 0x4>;
interrupt-parent = <&spi_l2_intc>;
- interrupt-names = "spi_lr_fullness_reached",
+ interrupt-names = "mspi_done",
+ "mspi_halted",
+ "spi_lr_fullness_reached",
"spi_lr_session_aborted",
"spi_lr_impatient",
"spi_lr_session_done",
- "spi_lr_overread",
- "mspi_done",
- "mspi_halted";
+ "spi_lr_overread";
status = "disabled";
};

diff --git a/arch/mips/boot/dts/brcm/bcm7362.dtsi b/arch/mips/boot/dts/brcm/bcm7362.dtsi
index a1ed0b193389..a0d15fcd3b81 100644
--- a/arch/mips/boot/dts/brcm/bcm7362.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7362.dtsi
@@ -391,15 +391,15 @@ qspi: spi@413000 {
clocks = <&upg_clk>;
reg = <0x410920 0x4 0x413200 0x188 0x413000 0x50>;
reg-names = "cs_reg", "hif_mspi", "bspi";
- interrupts = <0x0 0x1 0x2 0x3 0x4 0x5 0x6>;
+ interrupts = <0x5 0x6 0x0 0x1 0x2 0x3 0x4>;
interrupt-parent = <&spi_l2_intc>;
- interrupt-names = "spi_lr_fullness_reached",
+ interrupt-names = "mspi_done",
+ "mspi_halted",
+ "spi_lr_fullness_reached",
"spi_lr_session_aborted",
"spi_lr_impatient",
"spi_lr_session_done",
- "spi_lr_overread",
- "mspi_done",
- "mspi_halted";
+ "spi_lr_overread";
status = "disabled";
};

diff --git a/arch/mips/boot/dts/brcm/bcm7420.dtsi b/arch/mips/boot/dts/brcm/bcm7420.dtsi
index 62e7e1602d4e..a38041451faf 100644
--- a/arch/mips/boot/dts/brcm/bcm7420.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7420.dtsi
@@ -313,15 +313,15 @@ qspi: spi@443000 {
clocks = <&upg_clk>;
reg = <0x440920 0x4 0x443200 0x188 0x443000 0x50>;
reg-names = "cs_reg", "hif_mspi", "bspi";
- interrupts = <0x0 0x1 0x2 0x3 0x4 0x5 0x6>;
+ interrupts = <0x5 0x6 0x0 0x1 0x2 0x3 0x4>;
interrupt-parent = <&spi_l2_intc>;
- interrupt-names = "spi_lr_fullness_reached",
+ interrupt-names = "mspi_done",
+ "mspi_halted",
+ "spi_lr_fullness_reached",
"spi_lr_session_aborted",
"spi_lr_impatient",
"spi_lr_session_done",
- "spi_lr_overread",
- "mspi_done",
- "mspi_halted";
+ "spi_lr_overread";
status = "disabled";
};

diff --git a/arch/mips/boot/dts/brcm/bcm7425.dtsi b/arch/mips/boot/dts/brcm/bcm7425.dtsi
index 71422fd2ecc9..c2b3ea21410d 100644
--- a/arch/mips/boot/dts/brcm/bcm7425.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7425.dtsi
@@ -487,15 +487,15 @@ qspi: spi@41c000 {
clocks = <&upg_clk>;
reg = <0x419920 0x4 0x41c200 0x188 0x41c000 0x50>;
reg-names = "cs_reg", "hif_mspi", "bspi";
- interrupts = <0x0 0x1 0x2 0x3 0x4 0x5 0x6>;
+ interrupts = <0x5 0x6 0x0 0x1 0x2 0x3 0x4>;
interrupt-parent = <&spi_l2_intc>;
- interrupt-names = "spi_lr_fullness_reached",
+ interrupt-names = "mspi_done",
+ "mspi_halted",
+ "spi_lr_fullness_reached",
"spi_lr_session_aborted",
"spi_lr_impatient",
"spi_lr_session_done",
- "spi_lr_overread",
- "mspi_done",
- "mspi_halted";
+ "spi_lr_overread";
status = "disabled";
};

diff --git a/arch/mips/boot/dts/brcm/bcm7435.dtsi b/arch/mips/boot/dts/brcm/bcm7435.dtsi
index 38eea5373b66..826731515f0b 100644
--- a/arch/mips/boot/dts/brcm/bcm7435.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7435.dtsi
@@ -503,15 +503,15 @@ qspi: spi@41d200 {
clocks = <&upg_clk>;
reg = <0x41a920 0x4 0x41d400 0x188 0x41d200 0x50>;
reg-names = "cs_reg", "hif_mspi", "bspi";
- interrupts = <0x0 0x1 0x2 0x3 0x4 0x5 0x6>;
+ interrupts = <0x5 0x6 0x0 0x1 0x2 0x3 0x4>;
interrupt-parent = <&spi_l2_intc>;
- interrupt-names = "spi_lr_fullness_reached",
+ interrupt-names = "mspi_done",
+ "mspi_halted",
+ "spi_lr_fullness_reached",
"spi_lr_session_aborted",
"spi_lr_impatient",
"spi_lr_session_done",
- "spi_lr_overread",
- "mspi_done",
- "mspi_halted";
+ "spi_lr_overread";
status = "disabled";
};

--
2.43.0