From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3AC1931A572 for ; Thu, 25 Dec 2025 10:26:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766658383; cv=none; b=ZNwQ6P5nG4XVd/pv0JGGhZk12sanBPDS9fftxErYz9DRaj7hxPD3Ky5uJVkUx87p3VcnGDMPJ1rcZZ/k7DIxbker76eJ4fkbdwlLaMMYo/Q/lPkUm7Zvb2FX9xhtiDAPsnI6sTJIdwz3AjX6NIeq7RQqVqI5uWvsFZ5IB7xv5JE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766658383; c=relaxed/simple; bh=0SCMMhLFUL8eSdcIdgKvcOi5bla/TKQvmrbo34ohGaQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K4/Q/LX21TponJ/awu3hBEkQyVkOmqhnWB6DHxdES6Ytl4TbxTYnZLlgqNUX09+2UC7gUOVgZAl7cq2IMfO5N2YdyB3bae97R+QPOISW6F3gjekk7oRnoiuhFbhpZfIH/AtsHMKhGP7dTGcxJ2//UfFVYSJykR8IOzMtULV1kus= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dKrLGr+j; arc=none smtp.client-ip=209.85.218.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dKrLGr+j" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-b7cf4a975d2so958702366b.2 for ; Thu, 25 Dec 2025 02:26:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766658377; x=1767263177; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=k2++FgtnfO3AA5+lDQwKDweGeQ+SKknf+ji2k3HfukE=; b=dKrLGr+jH/arDPgwLUsqivCF3lj71yDaok8/Pm3314Co4LajuqKCysYkDJsb7skOgQ +UYfRVisCtB+qOCTWJWBzStomR9tbWpdSocCWZoroafvv1C2neCW5UwwQhrR8m3YaMun hpVivDK/1FOPPwHmJr9/E0GcrFyYML2OXbUGAsREplXcuZh1jPfZj+lyWSOy2auApZy0 NtU8vE3nT2prUBT8kuK5a8GHeO0sBFUSCRMAEelmLY0ZxbtJupxk/PUVB+ez2sUq6yHP tCCYIs6RUfQg7f41v5rPkAehXAgTjr31ReEzTlwr2eUlkzYxSG7a5lDxbIsGPtcJNM0e EZiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766658377; x=1767263177; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=k2++FgtnfO3AA5+lDQwKDweGeQ+SKknf+ji2k3HfukE=; b=uxcYTPKmNJJ0aFmIYdc2k8ngHUVBPb+VGS6rHgbL+xVJ/812vaXnTsDoH74/quOEKV zNSfV9cr2oHBPPCH911fp3Oq2hdKGovBvGHGYxh5+8X9FqWTvCJ4jRQyCiK3aquMm3FY eWt1YS9eARKHACfRVs7AaLZUlsXyu+L5eKMCGIT43tlYExnQjGPfhs0u3UckEIrXOHfG JupE/pe1tupWe8al7Nlehn54ExpBtFkV51YTNmRrlkdL8545SZAG2/RCZEktx8X5VgIi m9m547Pt7ah2DySjBRNSaCZaUe0AY++RgMU6HdRmG28b3Fx5NftVAhH4oOby7/yxaOEi im8A== X-Forwarded-Encrypted: i=1; AJvYcCX2fH9zV0i6wDXDNRxlCa8KMilOHRJv5m/2CWe5Bk2MPz38DEA5Ec+tzgyEwzpyeYPBz2Vq549hxEA=@vger.kernel.org X-Gm-Message-State: AOJu0YzipMbB4c2ezSxnFSi1PsybhIRUf9Vd19Dl/6Gv1fpqacvdfjyh d9ANHswKduP1GYYu3pTJGrjQf4dVu5uHtv2xN6oYwP/dZHrRXGlrndGF X-Gm-Gg: AY/fxX43F77zQ8hMLKBDGJGpk3EgKmWIr1UVk1pXfDGTfo2l7/TF6c8my+mBPFEarnW Eg1XCJStTwBnU594KWXJUry67pbn8GWj5kMGMTqWCzjpzHvO84sW/+0rEN0DITTSYQh2fwDvaYg 8Pak2GTnTQ35HgX2S1vZZnqqtTcAsSVZT5YfmHDlSk9PhhdbDodRhTU1x+AJTQni3RajAZk0Cr5 hmSchZb4nU11shbIcpED0m3VRlaDGHgcU3YEDZaj0vC2Mxa20K6wyhz5JOJyVaW4JA2CPkXeZ+Y 8Ob9JlAKdgmQAACbDbfL/q1uGHQQJVf8NN+qp+X1YbU7XqIvC7NgsbLORUw4t9R09wnma9uU7oR nOhYOw0+pW1VHoQl41SO+5oS0KseE9Osm3eofdadXgNIpXv6DupfsB81iNIWRYogF4bEzGnustG ADVl5X6w2YFBPqKuD/9sPR998JFIISfaUzk0bt4RCXx4JvlO8lldZthGXBnTHiwoeWmbUrFrg/n SIlrA== X-Google-Smtp-Source: AGHT+IHJV5bDP8x6sjTalbPe1zBoWepD9Og5siig6WOHvYmmjUzMB0zVBYec1xGuONiy2xODt5Lhrg== X-Received: by 2002:a17:907:7ea2:b0:b7a:6c39:8e73 with SMTP id a640c23a62f3a-b8036f12f2cmr1830270366b.23.1766658377314; Thu, 25 Dec 2025 02:26:17 -0800 (PST) Received: from localhost (dslb-002-205-018-238.002.205.pools.vodafone-ip.de. [2.205.18.238]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-64b916b372esm19689909a12.32.2025.12.25.02.26.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Dec 2025 02:26:16 -0800 (PST) From: Jonas Gorski To: Kamal Dasu , Broadcom internal kernel review list , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Thomas Bogendoerfer , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Cc: Kamal Dasu , 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 Message-ID: <20251225102533.30772-3-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251225102533.30772-1-jonas.gorski@gmail.com> References: <20251225102533.30772-1-jonas.gorski@gmail.com> Precedence: bulk X-Mailing-List: linux-spi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- 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