From: Jonas Gorski <jonas.gorski@gmail.com>
To: "Kamal Dasu" <kamal.dasu@broadcom.com>,
"Broadcom internal kernel review list"
<bcm-kernel-feedback-list@broadcom.com>,
"Mark Brown" <broonie@kernel.org>,
"Rob Herring" <robh@kernel.org>,
"Krzysztof Kozlowski" <krzk+dt@kernel.org>,
"Conor Dooley" <conor+dt@kernel.org>,
"Florian Fainelli" <florian.fainelli@broadcom.com>,
"Thomas Bogendoerfer" <tsbogend@alpha.franken.de>,
"Rafał Miłecki" <rafal@milecki.pl>
Cc: Kamal Dasu <kdasu.kdev@gmail.com>,
linux-spi@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org
Subject: [PATCH 2/4] mips: bmips: dts: fix {m,q}spi compatible order
Date: Thu, 25 Dec 2025 11:25:31 +0100 [thread overview]
Message-ID: <20251225102533.30772-3-jonas.gorski@gmail.com> (raw)
In-Reply-To: <20251225102533.30772-1-jonas.gorski@gmail.com>
The compatible order should be from most specific to least specific, but
the {m,q}spi controller nodes had theirs reversed.
The actual order does not matter, as the brcmmstb-qspi driver matches
both, which than calls bcm_qspi_probe(), which only checks for the
presence of the *-qspi compatible.
Fixes warnings like:
arch/mips/boot/dts/brcm/bcm97425svmb.dtb: spi@409200 (brcm,spi-bcm-qspi): compatible: 'oneOf' conditional failed, one must be fixed:
['brcm,spi-bcm-qspi', 'brcm,spi-brcmstb-mspi'] is too short
'brcm,spi-bcm-qspi' is not one of ['brcm,spi-bcm7425-qspi', 'brcm,spi-bcm7429-qspi', 'brcm,spi-bcm7435-qspi', 'brcm,spi-bcm7445-qspi', 'brcm,spi-bcm7216-qspi', 'brcm,spi-bcm7278-qspi']
'brcm,spi-bcm-qspi' is not one of ['brcm,spi-brcmstb-qspi', 'brcm,spi-brcmstb-mspi', 'brcm,spi-nsp-qspi', 'brcm,spi-ns2-qspi']
'brcm,spi-bcm-qspi' 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 | 8 ++++----
arch/mips/boot/dts/brcm/bcm7346.dtsi | 8 ++++----
arch/mips/boot/dts/brcm/bcm7358.dtsi | 8 ++++----
arch/mips/boot/dts/brcm/bcm7360.dtsi | 8 ++++----
arch/mips/boot/dts/brcm/bcm7362.dtsi | 8 ++++----
arch/mips/boot/dts/brcm/bcm7420.dtsi | 8 ++++----
arch/mips/boot/dts/brcm/bcm7425.dtsi | 8 ++++----
arch/mips/boot/dts/brcm/bcm7435.dtsi | 8 ++++----
8 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/arch/mips/boot/dts/brcm/bcm7125.dtsi b/arch/mips/boot/dts/brcm/bcm7125.dtsi
index 5bf77b6fcceb..92963a1998b7 100644
--- a/arch/mips/boot/dts/brcm/bcm7125.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7125.dtsi
@@ -247,8 +247,8 @@ spi_l2_intc: interrupt-controller@411d00 {
qspi: spi@443000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
- compatible = "brcm,spi-bcm-qspi",
- "brcm,spi-brcmstb-qspi";
+ compatible = "brcm,spi-brcmstb-qspi",
+ "brcm,spi-bcm-qspi";
clocks = <&upg_clk>;
reg = <0x440920 0x4 0x443200 0x188 0x443000 0x50>;
reg-names = "cs_reg", "hif_mspi", "bspi";
@@ -267,8 +267,8 @@ qspi: spi@443000 {
mspi: spi@406400 {
#address-cells = <1>;
#size-cells = <0>;
- compatible = "brcm,spi-bcm-qspi",
- "brcm,spi-brcmstb-mspi";
+ compatible = "brcm,spi-brcmstb-mspi",
+ "brcm,spi-bcm-qspi";
clocks = <&upg_clk>;
reg = <0x406400 0x180>;
reg-names = "mspi";
diff --git a/arch/mips/boot/dts/brcm/bcm7346.dtsi b/arch/mips/boot/dts/brcm/bcm7346.dtsi
index 9d6f97e02ff9..42125684b523 100644
--- a/arch/mips/boot/dts/brcm/bcm7346.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7346.dtsi
@@ -471,8 +471,8 @@ spi_l2_intc: interrupt-controller@411d00 {
qspi: spi@413000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
- compatible = "brcm,spi-bcm-qspi",
- "brcm,spi-brcmstb-qspi";
+ compatible = "brcm,spi-brcmstb-qspi",
+ "brcm,spi-bcm-qspi";
clocks = <&upg_clk>;
reg = <0x410920 0x4 0x413200 0x188 0x413000 0x50>;
reg-names = "cs_reg", "hif_mspi", "bspi";
@@ -491,8 +491,8 @@ qspi: spi@413000 {
mspi: spi@408a00 {
#address-cells = <1>;
#size-cells = <0>;
- compatible = "brcm,spi-bcm-qspi",
- "brcm,spi-brcmstb-mspi";
+ compatible = "brcm,spi-brcmstb-mspi",
+ "brcm,spi-bcm-qspi";
clocks = <&upg_clk>;
reg = <0x408a00 0x180>;
reg-names = "mspi";
diff --git a/arch/mips/boot/dts/brcm/bcm7358.dtsi b/arch/mips/boot/dts/brcm/bcm7358.dtsi
index 6375fc77f389..fdc52acab8c8 100644
--- a/arch/mips/boot/dts/brcm/bcm7358.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7358.dtsi
@@ -339,8 +339,8 @@ spi_l2_intc: interrupt-controller@411d00 {
qspi: spi@413000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
- compatible = "brcm,spi-bcm-qspi",
- "brcm,spi-brcmstb-qspi";
+ compatible = "brcm,spi-brcmstb-qspi",
+ "brcm,spi-bcm-qspi";
clocks = <&upg_clk>;
reg = <0x410920 0x4 0x413200 0x188 0x413000 0x50>;
reg-names = "cs_reg", "hif_mspi", "bspi";
@@ -359,8 +359,8 @@ qspi: spi@413000 {
mspi: spi@408a00 {
#address-cells = <1>;
#size-cells = <0>;
- compatible = "brcm,spi-bcm-qspi",
- "brcm,spi-brcmstb-mspi";
+ compatible = "brcm,spi-brcmstb-mspi",
+ "brcm,spi-bcm-qspi";
clocks = <&upg_clk>;
reg = <0x408a00 0x180>;
reg-names = "mspi";
diff --git a/arch/mips/boot/dts/brcm/bcm7360.dtsi b/arch/mips/boot/dts/brcm/bcm7360.dtsi
index a7f60f059e50..e8b0b0ff7588 100644
--- a/arch/mips/boot/dts/brcm/bcm7360.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7360.dtsi
@@ -390,8 +390,8 @@ spi_l2_intc: interrupt-controller@411d00 {
qspi: spi@413000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
- compatible = "brcm,spi-bcm-qspi",
- "brcm,spi-brcmstb-qspi";
+ compatible = "brcm,spi-brcmstb-qspi",
+ "brcm,spi-bcm-qspi";
clocks = <&upg_clk>;
reg = <0x410920 0x4 0x413200 0x188 0x413000 0x50>;
reg-names = "cs_reg", "hif_mspi", "bspi";
@@ -410,8 +410,8 @@ qspi: spi@413000 {
mspi: spi@408a00 {
#address-cells = <1>;
#size-cells = <0>;
- compatible = "brcm,spi-bcm-qspi",
- "brcm,spi-brcmstb-mspi";
+ compatible = "brcm,spi-brcmstb-mspi",
+ "brcm,spi-bcm-qspi";
clocks = <&upg_clk>;
reg = <0x408a00 0x180>;
reg-names = "mspi";
diff --git a/arch/mips/boot/dts/brcm/bcm7362.dtsi b/arch/mips/boot/dts/brcm/bcm7362.dtsi
index 2d483cbf254f..a1ed0b193389 100644
--- a/arch/mips/boot/dts/brcm/bcm7362.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7362.dtsi
@@ -386,8 +386,8 @@ spi_l2_intc: interrupt-controller@411d00 {
qspi: spi@413000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
- compatible = "brcm,spi-bcm-qspi",
- "brcm,spi-brcmstb-qspi";
+ compatible = "brcm,spi-brcmstb-qspi",
+ "brcm,spi-bcm-qspi";
clocks = <&upg_clk>;
reg = <0x410920 0x4 0x413200 0x188 0x413000 0x50>;
reg-names = "cs_reg", "hif_mspi", "bspi";
@@ -406,8 +406,8 @@ qspi: spi@413000 {
mspi: spi@408a00 {
#address-cells = <1>;
#size-cells = <0>;
- compatible = "brcm,spi-bcm-qspi",
- "brcm,spi-brcmstb-mspi";
+ compatible = "brcm,spi-brcmstb-mspi",
+ "brcm,spi-bcm-qspi";
clocks = <&upg_clk>;
reg = <0x408a00 0x180>;
reg-names = "mspi";
diff --git a/arch/mips/boot/dts/brcm/bcm7420.dtsi b/arch/mips/boot/dts/brcm/bcm7420.dtsi
index 9540c27f12e7..62e7e1602d4e 100644
--- a/arch/mips/boot/dts/brcm/bcm7420.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7420.dtsi
@@ -308,8 +308,8 @@ spi_l2_intc: interrupt-controller@411d00 {
qspi: spi@443000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
- compatible = "brcm,spi-bcm-qspi",
- "brcm,spi-brcmstb-qspi";
+ compatible = "brcm,spi-brcmstb-qspi",
+ "brcm,spi-bcm-qspi";
clocks = <&upg_clk>;
reg = <0x440920 0x4 0x443200 0x188 0x443000 0x50>;
reg-names = "cs_reg", "hif_mspi", "bspi";
@@ -328,8 +328,8 @@ qspi: spi@443000 {
mspi: spi@406400 {
#address-cells = <1>;
#size-cells = <0>;
- compatible = "brcm,spi-bcm-qspi",
- "brcm,spi-brcmstb-mspi";
+ compatible = "brcm,spi-brcmstb-mspi",
+ "brcm,spi-bcm-qspi";
clocks = <&upg_clk>;
reg = <0x406400 0x180>;
reg-names = "mspi";
diff --git a/arch/mips/boot/dts/brcm/bcm7425.dtsi b/arch/mips/boot/dts/brcm/bcm7425.dtsi
index c3bb020ff2b5..71422fd2ecc9 100644
--- a/arch/mips/boot/dts/brcm/bcm7425.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7425.dtsi
@@ -482,8 +482,8 @@ spi_l2_intc: interrupt-controller@41ad00 {
qspi: spi@41c000 {
#address-cells = <0x1>;
#size-cells = <0x0>;
- compatible = "brcm,spi-bcm-qspi",
- "brcm,spi-brcmstb-qspi";
+ compatible = "brcm,spi-brcmstb-qspi",
+ "brcm,spi-bcm-qspi";
clocks = <&upg_clk>;
reg = <0x419920 0x4 0x41c200 0x188 0x41c000 0x50>;
reg-names = "cs_reg", "hif_mspi", "bspi";
@@ -502,8 +502,8 @@ qspi: spi@41c000 {
mspi: spi@409200 {
#address-cells = <1>;
#size-cells = <0>;
- compatible = "brcm,spi-bcm-qspi",
- "brcm,spi-brcmstb-mspi";
+ compatible = "brcm,spi-brcmstb-mspi",
+ "brcm,spi-bcm-qspi";
clocks = <&upg_clk>;
reg = <0x409200 0x180>;
reg-names = "mspi";
diff --git a/arch/mips/boot/dts/brcm/bcm7435.dtsi b/arch/mips/boot/dts/brcm/bcm7435.dtsi
index 60cfa4074cce..38eea5373b66 100644
--- a/arch/mips/boot/dts/brcm/bcm7435.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7435.dtsi
@@ -498,8 +498,8 @@ spi_l2_intc: interrupt-controller@41bd00 {
qspi: spi@41d200 {
#address-cells = <0x1>;
#size-cells = <0x0>;
- compatible = "brcm,spi-bcm-qspi",
- "brcm,spi-brcmstb-qspi";
+ compatible = "brcm,spi-brcmstb-qspi",
+ "brcm,spi-bcm-qspi";
clocks = <&upg_clk>;
reg = <0x41a920 0x4 0x41d400 0x188 0x41d200 0x50>;
reg-names = "cs_reg", "hif_mspi", "bspi";
@@ -518,8 +518,8 @@ qspi: spi@41d200 {
mspi: spi@409200 {
#address-cells = <1>;
#size-cells = <0>;
- compatible = "brcm,spi-bcm-qspi",
- "brcm,spi-brcmstb-mspi";
+ compatible = "brcm,spi-brcmstb-mspi",
+ "brcm,spi-bcm-qspi";
clocks = <&upg_clk>;
reg = <0x409200 0x180>;
reg-names = "mspi";
--
2.43.0
next prev parent reply other threads:[~2025-12-25 10:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-25 10:25 [PATCH 0/4] mips: bmips: fix brcm,spi-bcm-qspi devicetree usage Jonas Gorski
2025-12-25 10:25 ` [PATCH 1/4] dt-bindings: brcm,spi-bcm-qspi: allow hif_mspi as alternative for mspi Jonas Gorski
2025-12-25 12:32 ` Krzysztof Kozlowski
2025-12-25 12:34 ` Krzysztof Kozlowski
2025-12-25 10:25 ` Jonas Gorski [this message]
2025-12-25 10:25 ` [PATCH 3/4] mips: bmips: dts: fix qspi interrupt order Jonas Gorski
2025-12-25 10:25 ` [PATCH 4/4] mips: bmips: dts: fix qspi register order Jonas Gorski
2025-12-25 12:35 ` Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251225102533.30772-3-jonas.gorski@gmail.com \
--to=jonas.gorski@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=florian.fainelli@broadcom.com \
--cc=kamal.dasu@broadcom.com \
--cc=kdasu.kdev@gmail.com \
--cc=krzk+dt@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=rafal@milecki.pl \
--cc=robh@kernel.org \
--cc=tsbogend@alpha.franken.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox