From nobody Sun Feb 8 04:12:53 2026 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (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 4B7FB314D10 for ; Thu, 25 Dec 2025 10:26:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766658379; cv=none; b=WtEHtw/5ACqRsz6mIdJtcGBGbXqLzxtjsrUv1EPHOO+zg5sKp96RC6jRAla8gGhEyvywvLFUWv4Ldts5yhXJAEBBlkDAklou9AgxgcO+SYiFGFLk8Tz2qqsZmztRqxX1LAQpaXsCd7SGoLJVAg66jT22cXOEar2KhxrIJsJbT4M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766658379; c=relaxed/simple; bh=E5s5dAa0VTQdMXpF2lnAVWKinAqcZz1UaWRSxHODcwA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iv5H31rRmxbw1rxKKKCtajD6WDS/nx4VOtXK52FdRHWyIGzZqPuF5OqI0iTLdj4of8JKYjkybtoI6WISzLHpWq9SYepV34r0BcsOje4EwrAdBzORsAr4KRmgsR97M9VUG2DDICSYglitmUaRacaOgG9FFih94LITiu1aVVXkIqY= 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=HZWoElh4; arc=none smtp.client-ip=209.85.208.52 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="HZWoElh4" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-64b921d9e67so8666754a12.3 for ; Thu, 25 Dec 2025 02:26:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766658375; x=1767263175; 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=JIaCuy0Yr5csM4hT0NvBc9MsbJrznZV2wGR+tUVj03k=; b=HZWoElh4UJ+ufUhtfwiNswtX2iLcH7BnPCkzs/s4OntDcqFfyfCqlHmrP8GIBz3sK2 /UFgAf0oErVO+tjsPSYZTnaDCj4uZ07wktkGeHqxmFEy5FsBiBCYr6CXApnTUWlIqCdr Im3kImTlJ4u3nkjgNSvB0DHgD16QNkvJl50KlXluiEZsmXGeANzyrYXbw2rKKu+Y0Stu /0sEQpdfpgxKCcMjnRNawxN9lEYYjVWpCi9WwfnsS4gRydmNnTC1uWRmJwzFdSkNs73H aGJyzl9SqOd6Jow+e07bWKnaApO9Wf6xYtwxOlg3VIrwNmHFtib93lT2eM0ivxsEEhkt 3wGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766658375; x=1767263175; 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=JIaCuy0Yr5csM4hT0NvBc9MsbJrznZV2wGR+tUVj03k=; b=FgzpXo4Kvmz1/VYa1G4pr/fJ0WyjCvqk24Z/dn8OC0t8CH3+H99Zl/QT5OPYvbPtDl mPug+ol4LdB3dINJHY59OP/xXPfeuDu1VCEmEWCXVUiqlpiI+NTCdsEPElYxkiuMecUT w/XWZFG3wjalE+wuh+9qeYZuu8rRa3/6aSHUD0uVPQXQcg5gnwrl46KIFAreu5rS3cEs 2v2DaON/mQVFwOZW6HITV3tQwbeFuK4fWBNCafSU/FsFhFfvfs15d17xTKOgyB6pQoez pjylAETkiNF5B9c5UkXloS7uXBkVPCZiS3bdI0yY8fQ6tS53lRAcElWM7ZhS6yUJo0UB XpRw== X-Forwarded-Encrypted: i=1; AJvYcCXrZyz8SQXtuVV1Pq5gtsPu4bDx5NoLhgd3xtr+OZQnAGFqFAZIz4CA661y11UrH/6QDwcqB3LA+KdiwX8=@vger.kernel.org X-Gm-Message-State: AOJu0Yx+NnckWjiLdMAnfAqiYWp04BLtZwKii8QI8jIIntvLL7/GdCig PZb2NTGIwYonCbuuilMCrG5LRHpixVTzQGAkX9yznuCwaPtlS4fAHeD9 X-Gm-Gg: AY/fxX7ncoGAJH4Xn7fvWYfJuijkHgGoYhd5JwddV9xxsiayLIKTgmRJkyvNiU4FL+X kgpfYFqJT4Hgz11AAedaOQSiBfzFSZCQDRkYN4L/fptl6L0xzjIOPUSnKitUb7Aqz/vRcrWuibo LWyOxwCfGPpCGCratcxt27dfBZi0Xh1IWJZrkHaJXjTD4rY7RG4M0oawCFMMlMKUFuq61foMOci yqkMLVx65aNG3RFwY3P+V3qm11KT3/a6puKb5WSlwT8NJG9WzpLl+nVT5HtF0C9/29YqZLnthGZ t59x9+B2ZkS4VI4vz1MQMLwZyvNcnsjkOBmRdk3z6DVg2NNjHPDFFW2Eqv2r/+QVwcCyim0jmiE UC/enoEjABRfEG+3rIjIQhjVF9INRGmm8gaiZT0D7Lxp0R63hegsp8/7KwjDsgKFb6biusBrJb9 yuU9Pr4VmvNKH9+upT2N8TljEaK88s4mXfkFRmRBmTjQecnmo3AbJGHLk6U0BDvLH9x10= X-Google-Smtp-Source: AGHT+IGTq+3+tIFc9OrOssc41kCs1BnvDhuOWslkFodTOLZK9xgo+B67Du+bLzTqEF27zfk+DrePnA== X-Received: by 2002:a17:907:6093:b0:b83:246c:c857 with SMTP id a640c23a62f3a-b83246ccc94mr173915466b.17.1766658375320; Thu, 25 Dec 2025 02:26:15 -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 a640c23a62f3a-b8056ff4925sm1570885166b.31.2025.12.25.02.26.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Dec 2025 02:26:14 -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 1/4] dt-bindings: brcm,spi-bcm-qspi: allow hif_mspi as alternative for mspi Date: Thu, 25 Dec 2025 11:25:30 +0100 Message-ID: <20251225102533.30772-2-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add "hif_mspi" as an alternative reg-name for brcm,spi-bcm-qspi, as it is in use by BCM7xxx (BMIPS) device trees. Signed-off-by: Jonas Gorski --- Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml b= /Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml index 45975f40d943..ffe8d7f8dd4a 100644 --- a/Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml +++ b/Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml @@ -57,7 +57,7 @@ properties: reg-names: minItems: 1 items: - - const: mspi + - enum: [ hif_mspi, mspi ] - const: bspi - enum: [ intr_regs, intr_status_reg, cs_reg ] - enum: [ intr_regs, intr_status_reg, cs_reg ] --=20 2.43.0 From nobody Sun Feb 8 04:12:53 2026 Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) (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 3AAED31A571 for ; Thu, 25 Dec 2025 10:26:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766658381; cv=none; b=KBkTZdedazR9tG59o+JDAaT1vMjiEJl4s/K/UfffKTOJ9gu6PCpc+0yOL5l7h+U45txUQ1izjqVtijLx33jU9NrEmRCSqKN8WyP65VDB1SUPfVVlLWsodem3ZeKq8wKZIOHRrqN/n2dkhEvILuxcQ9FAVRL1rmTOx8xj8GE1K+I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766658381; c=relaxed/simple; bh=0SCMMhLFUL8eSdcIdgKvcOi5bla/TKQvmrbo34ohGaQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QHwf6lQrxgp9G1qPY5MeGxLLL2zTWf7TVRG+1ysxHlgoVKZY2AhlccCs0lA1zIjW4eVqTt9yfFIPxZSpI/5bOKchJMGkLMEJbIFaauoi01KfcRu/BsyIBFtMz4lVWhdjWxRApeFS1oXRvICjfYQhVwuOz9TbqpQecj3KINqoNw0= 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.208.43 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-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-64b9230f564so7468491a12.1 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=SE3jLBQnZfWKAJl2Fj3LZXQWrx6qgElZbB3IL4ncWRrD19V6iHalsXJV1/rWChAvgu DWOzcuP+fIh8GQQCB0WKKiIti2r7hKt3efSoA7JQMnFizD8AeQeYIiH5hjdjHZmFaNNA XgRzAin64+3EoGlaVhkPlWFvnGkp2Y5lGMNhoXFDEl3AlgutvNCjjUnK1do5s9NxDOud v8Ek1xXlc8pWvZ3+8Pi6kwwHqRxZpChbNvRQBtbW9ukR+HiLQM2oUEV7MO8mTR8n9ur/ WOOOHKhw5TFUK2+wLIrf+QJBxpwA37JFKVA96+mxmvqguqRD9vYKrwLCcolFXtrYZLgZ Psvg== X-Forwarded-Encrypted: i=1; AJvYcCUUPXCcuXqEQgPpW7cVCOlyxFkUG9eCQj+40Jk2gzZyRSPnBYur3SVDeGQuJ+3M2SByo8Skgk094Y2Ylps=@vger.kernel.org X-Gm-Message-State: AOJu0YwhWYHuLjLlXb25n+S19HRfYssK7+xpvkPVzU3K10KcB/Tr54NG 72iQg2pHjNxav2Zkz1dTjzKpSI2zPCnCSGHbCtB2DrDbiCUTt9uC/8v5 X-Gm-Gg: AY/fxX47fReoBwztzxZqBBGLsrhk25duZ3IsWxDjCuZBSPigI0ossHal5CUg7rWGdAL Ylu+V6OXU0qjXpq3FR7wmJzB4GfOe3r78+2SA8HrAXW1oRQ6jhfLN5PWPQX8t81A3IVHJZXwmfU K4u74piupXW+6n3uzs2kBOJ+Ykba4Ysm2m4KhTdmbjPtimUzde352vU0ZtV+icUCpPFWVBr2kjO RB6X4Y44vutH8WNloi6mSmH5/ex2IfOailTjkjfI9CH1YnwnTI/zn0RNLuYBiLl1nRcdeQERae7 F7I+K57q7tWq6dVV0yI5Y4iws1ASF+5KbJCiA8hYBDCOIoY7dKKIzLRZn35SxHin+RxV2DX4o5N sYJWYG4AR8TepPtjmDEj82Gx2QY8sRkb90ax+FDOTkxRfy5Az7hIiGJgby2I+q1SpFg8K5FhBtD QTvjO/SDbRyOaHtVL5xHrVgfXGMuwTLzHv27HUS71fc/RMJ+RBC27y6c2Axwmwd8z9WI96CQ5m3 eaYag== 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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): c= ompatible: '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-bcm7= 429-qspi', 'brcm,spi-bcm7435-qspi', 'brcm,spi-bcm7445-qspi', 'brcm,spi-bcm7= 216-qspi', 'brcm,spi-bcm7278-qspi'] 'brcm,spi-bcm-qspi' is not one of ['brcm,spi-brcmstb-qspi', 'brcm,spi-brcm= stb-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 =3D <0x1>; #size-cells =3D <0x0>; - compatible =3D "brcm,spi-bcm-qspi", - "brcm,spi-brcmstb-qspi"; + compatible =3D "brcm,spi-brcmstb-qspi", + "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; reg =3D <0x440920 0x4 0x443200 0x188 0x443000 0x50>; reg-names =3D "cs_reg", "hif_mspi", "bspi"; @@ -267,8 +267,8 @@ qspi: spi@443000 { mspi: spi@406400 { #address-cells =3D <1>; #size-cells =3D <0>; - compatible =3D "brcm,spi-bcm-qspi", - "brcm,spi-brcmstb-mspi"; + compatible =3D "brcm,spi-brcmstb-mspi", + "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; reg =3D <0x406400 0x180>; reg-names =3D "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 =3D <0x1>; #size-cells =3D <0x0>; - compatible =3D "brcm,spi-bcm-qspi", - "brcm,spi-brcmstb-qspi"; + compatible =3D "brcm,spi-brcmstb-qspi", + "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; reg =3D <0x410920 0x4 0x413200 0x188 0x413000 0x50>; reg-names =3D "cs_reg", "hif_mspi", "bspi"; @@ -491,8 +491,8 @@ qspi: spi@413000 { mspi: spi@408a00 { #address-cells =3D <1>; #size-cells =3D <0>; - compatible =3D "brcm,spi-bcm-qspi", - "brcm,spi-brcmstb-mspi"; + compatible =3D "brcm,spi-brcmstb-mspi", + "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; reg =3D <0x408a00 0x180>; reg-names =3D "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 =3D <0x1>; #size-cells =3D <0x0>; - compatible =3D "brcm,spi-bcm-qspi", - "brcm,spi-brcmstb-qspi"; + compatible =3D "brcm,spi-brcmstb-qspi", + "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; reg =3D <0x410920 0x4 0x413200 0x188 0x413000 0x50>; reg-names =3D "cs_reg", "hif_mspi", "bspi"; @@ -359,8 +359,8 @@ qspi: spi@413000 { mspi: spi@408a00 { #address-cells =3D <1>; #size-cells =3D <0>; - compatible =3D "brcm,spi-bcm-qspi", - "brcm,spi-brcmstb-mspi"; + compatible =3D "brcm,spi-brcmstb-mspi", + "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; reg =3D <0x408a00 0x180>; reg-names =3D "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 =3D <0x1>; #size-cells =3D <0x0>; - compatible =3D "brcm,spi-bcm-qspi", - "brcm,spi-brcmstb-qspi"; + compatible =3D "brcm,spi-brcmstb-qspi", + "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; reg =3D <0x410920 0x4 0x413200 0x188 0x413000 0x50>; reg-names =3D "cs_reg", "hif_mspi", "bspi"; @@ -410,8 +410,8 @@ qspi: spi@413000 { mspi: spi@408a00 { #address-cells =3D <1>; #size-cells =3D <0>; - compatible =3D "brcm,spi-bcm-qspi", - "brcm,spi-brcmstb-mspi"; + compatible =3D "brcm,spi-brcmstb-mspi", + "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; reg =3D <0x408a00 0x180>; reg-names =3D "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 =3D <0x1>; #size-cells =3D <0x0>; - compatible =3D "brcm,spi-bcm-qspi", - "brcm,spi-brcmstb-qspi"; + compatible =3D "brcm,spi-brcmstb-qspi", + "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; reg =3D <0x410920 0x4 0x413200 0x188 0x413000 0x50>; reg-names =3D "cs_reg", "hif_mspi", "bspi"; @@ -406,8 +406,8 @@ qspi: spi@413000 { mspi: spi@408a00 { #address-cells =3D <1>; #size-cells =3D <0>; - compatible =3D "brcm,spi-bcm-qspi", - "brcm,spi-brcmstb-mspi"; + compatible =3D "brcm,spi-brcmstb-mspi", + "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; reg =3D <0x408a00 0x180>; reg-names =3D "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 =3D <0x1>; #size-cells =3D <0x0>; - compatible =3D "brcm,spi-bcm-qspi", - "brcm,spi-brcmstb-qspi"; + compatible =3D "brcm,spi-brcmstb-qspi", + "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; reg =3D <0x440920 0x4 0x443200 0x188 0x443000 0x50>; reg-names =3D "cs_reg", "hif_mspi", "bspi"; @@ -328,8 +328,8 @@ qspi: spi@443000 { mspi: spi@406400 { #address-cells =3D <1>; #size-cells =3D <0>; - compatible =3D "brcm,spi-bcm-qspi", - "brcm,spi-brcmstb-mspi"; + compatible =3D "brcm,spi-brcmstb-mspi", + "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; reg =3D <0x406400 0x180>; reg-names =3D "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 =3D <0x1>; #size-cells =3D <0x0>; - compatible =3D "brcm,spi-bcm-qspi", - "brcm,spi-brcmstb-qspi"; + compatible =3D "brcm,spi-brcmstb-qspi", + "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; reg =3D <0x419920 0x4 0x41c200 0x188 0x41c000 0x50>; reg-names =3D "cs_reg", "hif_mspi", "bspi"; @@ -502,8 +502,8 @@ qspi: spi@41c000 { mspi: spi@409200 { #address-cells =3D <1>; #size-cells =3D <0>; - compatible =3D "brcm,spi-bcm-qspi", - "brcm,spi-brcmstb-mspi"; + compatible =3D "brcm,spi-brcmstb-mspi", + "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; reg =3D <0x409200 0x180>; reg-names =3D "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 =3D <0x1>; #size-cells =3D <0x0>; - compatible =3D "brcm,spi-bcm-qspi", - "brcm,spi-brcmstb-qspi"; + compatible =3D "brcm,spi-brcmstb-qspi", + "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; reg =3D <0x41a920 0x4 0x41d400 0x188 0x41d200 0x50>; reg-names =3D "cs_reg", "hif_mspi", "bspi"; @@ -518,8 +518,8 @@ qspi: spi@41d200 { mspi: spi@409200 { #address-cells =3D <1>; #size-cells =3D <0>; - compatible =3D "brcm,spi-bcm-qspi", - "brcm,spi-brcmstb-mspi"; + compatible =3D "brcm,spi-brcmstb-mspi", + "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; reg =3D <0x409200 0x180>; reg-names =3D "mspi"; --=20 2.43.0 From nobody Sun Feb 8 04:12:53 2026 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (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 89D4831A552 for ; Thu, 25 Dec 2025 10:26:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766658383; cv=none; b=Yt60eCQ/FKPu7/6Eub0PGnJz3RmV/RLe6nqMUuFO2n0g0i6Af5AfGKDJupeSc7m0d4lI8Q55rwJGm9DZ+iOSExsVSX/yJS/KL4R82nnReGu+DeinQp5gfLU4trw7+/Ir4jtcAfAvNbeOVwCkursGcevkmv61aRRPDlGz4A56gd8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766658383; c=relaxed/simple; bh=XgiT7o9sIoPT2NxgqWtaJ1fVJAjUOhvncV6lWTyMGlA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qbSMjDgWa7cc66PUSpgTn7Ew26ebbIELnhQdXbwkFsaFB6bsv0fqvn4bs5XFThOSW9ZTwDfxp3E+rzqp6XB+NNqzpBMNfqZvF6EUMq31CyljU1ANkE4NULyBKzBGyuWfmnZqWqh43f0Y+xcdPK9I2QLYASBdYD4F7OXbva2/+2c= 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=gCj6forG; arc=none smtp.client-ip=209.85.208.52 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="gCj6forG" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-64b791b5584so9382385a12.0 for ; Thu, 25 Dec 2025 02:26:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766658379; x=1767263179; 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=p98EHDrlfxc1Mpcl2fjHHNglQmuITwMNLij1fvJce3I=; b=gCj6forGu+11yn43QRuT6IyURWvReDv1Bn+YPennC8x1qFCWP6Qp1klTSeNCutp5d4 epSLvsRu7KD8H3ktxllN9YrgGQsij409W/x8GCp24dlD4gpIo+LFe6Res0/q+SW6GruL ygsRd6MXc1nYJhv38phU0JPs73A/173q+4Da1XYPuYnxW7ZhYxBDX5odnR9lBPprwwFO 9+XO9ICBcYIKlRnwyMy3iK/P3rftcfocLGnrvHwlMkrCx6VXgrFPSi5ziASRnchncLrM 2wrnfDhHBeleTJXjyrXJKspObDr4spuxsWH6I1CATjYFRBRaFu5BwD7ZzFgZsww5AL4t miug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766658379; x=1767263179; 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=p98EHDrlfxc1Mpcl2fjHHNglQmuITwMNLij1fvJce3I=; b=RPk6gpAuPuj3oVqq7gomJuO1fkkMyWMMnbOVVhTR9s4B8Dd3iAq+iKh3doifbgw621 YYCHjEUlO3eUOtTl60Nm8LhqG3JQJFE0oMKSgAXKi93/mT5KRSzp/TX1mwk9YMlGb5Uj lCb2PSCVG8jYpc9dnnKoULWsgrA+bJZS6eqRDGoTQF7DesHEcHMILlhe8KT5w7VIfgts qq1Gb67SvUdWeMGeAw8BlNM1HwlEoqDyZAM3js3nVSkm17+PZGkxevb3IgPsjb96xizs QSRJ1xFjLZpdKyoN+LlEf6sKPJvkJgGEPAPZxmxLqzOEucnmMpqFqAHlYe/TzMkja40z PJhA== X-Forwarded-Encrypted: i=1; AJvYcCVZHX5TPwJfgKzz3I0Y0JrzD6MTEZZHsHoqaRbdmsWYVR9Hz4KVjuGaQ97F7QD0IrsLgJRE2XoTp18kqjk=@vger.kernel.org X-Gm-Message-State: AOJu0YxHaA1e/UHI0y+1QU06TbzyIwgi+2PlTvKEhxsfGDolnmmOHVLD PYAHL4FmVt3ymOa5MDWR3BBJxU7cdV5LZGN8aiiNCe0i/xxE7C/YQyr/hwigyQ== X-Gm-Gg: AY/fxX6rLczlW03Mtq4senZbmr/vwQ0ASBGOfoCCOVcCitwa0P/I3spJsISqS7Mr0Hp UiHRd35e2+JIW4vyLnO1/RyIEVpka0kHzXUqgGl/1ivofwKSDBjK1Q7sEfvXT3gRk50f6JNFbtV rdTAsdi8Y5upnFEIjMREc9lJ/H04h2pfYaYoGsamOdHiREiC/Kw4XrhPF8GZ8eDNHSb8Sbg5pfr CcVsOIf3iCqUSJ/G6Sq478IJP9DwhDLZi/Isn2MRL9vCHrjgEP4baB8zmcvIWiy/LOyEjNRva9u tAOFniIYnsUlE7Rj4dLFn2UHg2q1nr2vhuCkpcy6H4JhDZYddwcM6XfGlCNmkOdili9oFxi7O/a YEBA43HTGff8iEIiDip2bE6dwHGY62sR9Or6CCT1t2Py5FpfG2qfITl4mh82b/3eTMNK7Uy7QeL +WyURrcwySLQa/gVQ/OdaTtUrV+4lPOtuKTyYQqzNXVHpFkjxIBqlKuM7FMwdYqgB+TAU= X-Google-Smtp-Source: AGHT+IGYBVpw0kYjxRt40avCFzl/pEbNgLZr1f0D8xUD5sov7X5pMtkVIPJug9QMK9TGrHu2t5/Nsg== X-Received: by 2002:a17:907:7f89:b0:b73:8f33:eee2 with SMTP id a640c23a62f3a-b80371d3877mr2123485766b.48.1766658378448; Thu, 25 Dec 2025 02:26:18 -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 a640c23a62f3a-b8037a5c4dfsm2028659666b.14.2025.12.25.02.26.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Dec 2025 02:26:17 -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 3/4] mips: bmips: dts: fix qspi interrupt order Date: Thu, 25 Dec 2025 11:25:32 +0100 Message-ID: <20251225102533.30772-4-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 to= o 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 --- 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 =3D <&upg_clk>; reg =3D <0x440920 0x4 0x443200 0x188 0x443000 0x50>; reg-names =3D "cs_reg", "hif_mspi", "bspi"; - interrupts =3D <0x0 0x1 0x2 0x3 0x4 0x5 0x6>; + interrupts =3D <0x5 0x6 0x0 0x1 0x2 0x3 0x4>; interrupt-parent =3D <&spi_l2_intc>; - interrupt-names =3D "spi_lr_fullness_reached", + interrupt-names =3D "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 =3D "disabled"; }; =20 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 =3D <&upg_clk>; reg =3D <0x410920 0x4 0x413200 0x188 0x413000 0x50>; reg-names =3D "cs_reg", "hif_mspi", "bspi"; - interrupts =3D <0x0 0x1 0x2 0x3 0x4 0x5 0x6>; + interrupts =3D <0x5 0x6 0x0 0x1 0x2 0x3 0x4>; interrupt-parent =3D <&spi_l2_intc>; - interrupt-names =3D "spi_lr_fullness_reached", + interrupt-names =3D "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 =3D "disabled"; }; =20 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 =3D <&upg_clk>; reg =3D <0x410920 0x4 0x413200 0x188 0x413000 0x50>; reg-names =3D "cs_reg", "hif_mspi", "bspi"; - interrupts =3D <0x0 0x1 0x2 0x3 0x4 0x5 0x6>; + interrupts =3D <0x5 0x6 0x0 0x1 0x2 0x3 0x4>; interrupt-parent =3D <&spi_l2_intc>; - interrupt-names =3D "spi_lr_fullness_reached", + interrupt-names =3D "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 =3D "disabled"; }; =20 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 =3D <&upg_clk>; reg =3D <0x410920 0x4 0x413200 0x188 0x413000 0x50>; reg-names =3D "cs_reg", "hif_mspi", "bspi"; - interrupts =3D <0x0 0x1 0x2 0x3 0x4 0x5 0x6>; + interrupts =3D <0x5 0x6 0x0 0x1 0x2 0x3 0x4>; interrupt-parent =3D <&spi_l2_intc>; - interrupt-names =3D "spi_lr_fullness_reached", + interrupt-names =3D "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 =3D "disabled"; }; =20 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 =3D <&upg_clk>; reg =3D <0x410920 0x4 0x413200 0x188 0x413000 0x50>; reg-names =3D "cs_reg", "hif_mspi", "bspi"; - interrupts =3D <0x0 0x1 0x2 0x3 0x4 0x5 0x6>; + interrupts =3D <0x5 0x6 0x0 0x1 0x2 0x3 0x4>; interrupt-parent =3D <&spi_l2_intc>; - interrupt-names =3D "spi_lr_fullness_reached", + interrupt-names =3D "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 =3D "disabled"; }; =20 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 =3D <&upg_clk>; reg =3D <0x440920 0x4 0x443200 0x188 0x443000 0x50>; reg-names =3D "cs_reg", "hif_mspi", "bspi"; - interrupts =3D <0x0 0x1 0x2 0x3 0x4 0x5 0x6>; + interrupts =3D <0x5 0x6 0x0 0x1 0x2 0x3 0x4>; interrupt-parent =3D <&spi_l2_intc>; - interrupt-names =3D "spi_lr_fullness_reached", + interrupt-names =3D "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 =3D "disabled"; }; =20 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 =3D <&upg_clk>; reg =3D <0x419920 0x4 0x41c200 0x188 0x41c000 0x50>; reg-names =3D "cs_reg", "hif_mspi", "bspi"; - interrupts =3D <0x0 0x1 0x2 0x3 0x4 0x5 0x6>; + interrupts =3D <0x5 0x6 0x0 0x1 0x2 0x3 0x4>; interrupt-parent =3D <&spi_l2_intc>; - interrupt-names =3D "spi_lr_fullness_reached", + interrupt-names =3D "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 =3D "disabled"; }; =20 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 =3D <&upg_clk>; reg =3D <0x41a920 0x4 0x41d400 0x188 0x41d200 0x50>; reg-names =3D "cs_reg", "hif_mspi", "bspi"; - interrupts =3D <0x0 0x1 0x2 0x3 0x4 0x5 0x6>; + interrupts =3D <0x5 0x6 0x0 0x1 0x2 0x3 0x4>; interrupt-parent =3D <&spi_l2_intc>; - interrupt-names =3D "spi_lr_fullness_reached", + interrupt-names =3D "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 =3D "disabled"; }; =20 --=20 2.43.0 From nobody Sun Feb 8 04:12:53 2026 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (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 7E6FA31A7F4 for ; Thu, 25 Dec 2025 10:26:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766658385; cv=none; b=SnmYJkpYH12sRq4rzqo7dOjjFFcy9yEW1nppU9MCodYvLF87jcBj5kK593MAnys2+aEgNmVUyMSvCdsnTE/3ZGtYSLKMbDFG8HRs47CNQ/avKUa6OVvd3BiYSssE1UznNFzNzzUFNMDz5nt++Ik8cKpzu7qR4Pcnh8WtYsQkFzY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766658385; c=relaxed/simple; bh=XDw0CicUcDyUIbwIo5vVTd2jTNcmyLEasGp4m1GbB4k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TLIznOLdfESSccT3Iql+H0DvJgXwNBGW+pUqpsqptY5iW4PaeA7Vsy4NM18VcFtjju/1iiD1fyw/Nv3Pw4dI7pM+Q2SMP8eDxRrTqF77aEcLfuvbzXm5FNkIzLNeZzujn/9Glr0tLGY1XOjACcSKDQyvBWe8PLaPEbwM22UCJlY= 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=haN5wIAG; arc=none smtp.client-ip=209.85.218.44 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="haN5wIAG" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-b7a72874af1so1120363166b.3 for ; Thu, 25 Dec 2025 02:26:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766658380; x=1767263180; 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=bbdavY/KGPzS+o6sMh5gv5dV0PnkFU7uBfyVWtnqgmE=; b=haN5wIAGmIrPGmfirNaQHf+y8vIG8KfOrBx/mCeVC8Zg5UIkeJR1MmVWjiJylOjQv9 RA6IUdN7hMIWoI1LQXOo/xv/ymf+MgtWWjNkBCWGMJ1UJHO3gEi78kv9dEjdcI5pWGoK 3HnURzEKEiNNexq6bnjyTLaaWt+W4kd2bgytA7cn5IaIxTcH1mQPvh2DAp0EWXdKeVqn dYpKadiLtDXACoT7nLmHB7hbsKqDBLKvcQM5+1XiLwXKTWR4ogdc7/VHPsmhtL3X8Hyx 2tbuZzvTFsL8hhpdLrZ2BO8J/G1khzE7wo8oDSSgfm/hFVDly4RpOKQLauPWvlPI9CNB 5CgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766658380; x=1767263180; 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=bbdavY/KGPzS+o6sMh5gv5dV0PnkFU7uBfyVWtnqgmE=; b=D3L6sddTLvgGJVdUl77SN0NJ0fvfjPxxdxwiACHdBjRZ0P3dPwsnWBetjzp8/whAFU r7ZUPzyYEb6BkUbhtc70uxIT/MqKNJ+cmMpBKY8cEoxGF7jBHblB/2rlKh3DLiWUNY4p RFIkqwJvGc9jYBFCSfr9GdhYhoYClJRpwf9KRurhlOiXWuPZ0ar6Jcqu4JZCeB+ipeqn HMbEIg1HqRXajk3mOjqwykll22pO/CAG6CDL86A9VmrZgMdGrsfnzBo+BW7IzS9hp5y7 nTm+ml5QmikL7wKi2NTF3XsnprmxVJSDTdRpeb0ZtYyktDuhKN7eL6UakpwErU3xx0wz 32MA== X-Forwarded-Encrypted: i=1; AJvYcCWo6yuasv1aBThFfIPeUvZZS8gpraTRsOi5yb//kZTIdc0p20dWUXET37INgjyjUbf1som6EBiO4L2vE4A=@vger.kernel.org X-Gm-Message-State: AOJu0YylzCH615fL7FhZNIklcor8vvKlQWH9dyGKoOZipMY18jMEusHW zJAGbJ0thPWSZQq8hz7vj3cyn+3bZHAegw4fwjYi5rRO1FgVeZnTn15J X-Gm-Gg: AY/fxX5ABqte+k/Q7dPstGvqzQ41I8VHqKhe5T2tG5ImWMdWAPn6VVpqn5A5OdV+7oz KXnArY0UjsVT4QlsAMlbYxnEYyOPAzi60CB2+XXEN+9iulgzZiafmgMFQ8gBTgcBSuckIoH3H0N KHViYcg5M7vUSEGHXt9i7oM3nL57FqZD+kC+RWaO6tvCLqmrIT2iv6WA6UsutHBWyU+aY52Oenb qisv53lAR6EKpBiK/W4Rv/uDIq7FC6f0pDUKALMZdxRn2J2iRnAcn4RLXHyyVL0QKX2DeSCE2mJ +4tB73JyAqdfYI2t57d70VpIWvZ5dR30gcsiLFDm+RLbqJfminT2T01UKkuerNeILVgz5acjZLi UmufCfnL6VNE2b1NynLSPnhbrVHmgtfZJRqu49cdUSlmWDEWq0YXGAP4SSepAdlBnl+/Rq0D+DH BL62oetkj1V8XAofHC981llJdsY38wmKvLA4qEKnPm13AO8qRdfx3LU0WAGJrkaWt96NQ= X-Google-Smtp-Source: AGHT+IGlygVhnf4kK96SyejVfTPYWiK9b3dzlGY8ni6rseZRXIsqfMGNRAnZDGe710l1R5Y4qNze3w== X-Received: by 2002:a17:907:7393:b0:b80:40d3:1fc6 with SMTP id a640c23a62f3a-b8040d3232cmr1371363266b.54.1766658379530; Thu, 25 Dec 2025 02:26:19 -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 a640c23a62f3a-b8037ab86cesm2034844566b.19.2025.12.25.02.26.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Dec 2025 02:26:19 -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 4/4] mips: bmips: dts: fix qspi register order Date: Thu, 25 Dec 2025 11:25:33 +0100 Message-ID: <20251225102533.30772-5-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Align the register order to the schema. Fixes warnings like: arch/mips/boot/dts/brcm/bcm97435svmb.dtb: spi@41d200 (brcm,spi-brcmstb-qspi= ): reg-names:0: 'cs_reg' is not one of ['hif_mspi', 'mspi'] from schema $id: http://devicetree.org/schemas/spi/brcm,spi-bcm-qspi.yaml arch/mips/boot/dts/brcm/bcm97435svmb.dtb: spi@41d200 (brcm,spi-brcmstb-qspi= ): reg-names:1: 'bspi' was expected from schema $id: http://devicetree.org/schemas/spi/brcm,spi-bcm-qspi.yaml arch/mips/boot/dts/brcm/bcm97435svmb.dtb: spi@41d200 (brcm,spi-brcmstb-qspi= ): reg-names:2: 'bspi' is not one of ['intr_regs', 'intr_status_reg', 'cs_r= eg'] 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 | 4 ++-- arch/mips/boot/dts/brcm/bcm7346.dtsi | 4 ++-- arch/mips/boot/dts/brcm/bcm7358.dtsi | 4 ++-- arch/mips/boot/dts/brcm/bcm7360.dtsi | 4 ++-- arch/mips/boot/dts/brcm/bcm7362.dtsi | 4 ++-- arch/mips/boot/dts/brcm/bcm7420.dtsi | 4 ++-- arch/mips/boot/dts/brcm/bcm7425.dtsi | 4 ++-- arch/mips/boot/dts/brcm/bcm7435.dtsi | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/mips/boot/dts/brcm/bcm7125.dtsi b/arch/mips/boot/dts/brcm= /bcm7125.dtsi index dd1cc3cda694..81ee0f49b645 100644 --- a/arch/mips/boot/dts/brcm/bcm7125.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7125.dtsi @@ -250,8 +250,8 @@ qspi: spi@443000 { compatible =3D "brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; - reg =3D <0x440920 0x4 0x443200 0x188 0x443000 0x50>; - reg-names =3D "cs_reg", "hif_mspi", "bspi"; + reg =3D <0x443200 0x188 0x443000 0x50 0x440920 0x4>; + reg-names =3D "hif_mspi", "bspi", "cs_reg"; interrupts =3D <0x5 0x6 0x0 0x1 0x2 0x3 0x4>; interrupt-parent =3D <&spi_l2_intc>; interrupt-names =3D "mspi_done", diff --git a/arch/mips/boot/dts/brcm/bcm7346.dtsi b/arch/mips/boot/dts/brcm= /bcm7346.dtsi index 21c7418aaf0d..6efb6347a2e4 100644 --- a/arch/mips/boot/dts/brcm/bcm7346.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7346.dtsi @@ -474,8 +474,8 @@ qspi: spi@413000 { compatible =3D "brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; - reg =3D <0x410920 0x4 0x413200 0x188 0x413000 0x50>; - reg-names =3D "cs_reg", "hif_mspi", "bspi"; + reg =3D <0x413200 0x188 0x413000 0x50 0x410920 0x4>; + reg-names =3D "hif_mspi", "bspi", "cs_reg"; interrupts =3D <0x5 0x6 0x0 0x1 0x2 0x3 0x4>; interrupt-parent =3D <&spi_l2_intc>; interrupt-names =3D "mspi_done", diff --git a/arch/mips/boot/dts/brcm/bcm7358.dtsi b/arch/mips/boot/dts/brcm= /bcm7358.dtsi index 63b3a42a8dc6..527406a5fa4d 100644 --- a/arch/mips/boot/dts/brcm/bcm7358.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7358.dtsi @@ -342,8 +342,8 @@ qspi: spi@413000 { compatible =3D "brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; - reg =3D <0x410920 0x4 0x413200 0x188 0x413000 0x50>; - reg-names =3D "cs_reg", "hif_mspi", "bspi"; + reg =3D <0x413200 0x188 0x413000 0x50 0x410920 0x4>; + reg-names =3D "hif_mspi", "bspi", "cs_reg"; interrupts =3D <0x5 0x6 0x0 0x1 0x2 0x3 0x4>; interrupt-parent =3D <&spi_l2_intc>; interrupt-names =3D "mspi_done", diff --git a/arch/mips/boot/dts/brcm/bcm7360.dtsi b/arch/mips/boot/dts/brcm= /bcm7360.dtsi index 9d89da400104..7ed6dbd145bf 100644 --- a/arch/mips/boot/dts/brcm/bcm7360.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7360.dtsi @@ -393,8 +393,8 @@ qspi: spi@413000 { compatible =3D "brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; - reg =3D <0x410920 0x4 0x413200 0x188 0x413000 0x50>; - reg-names =3D "cs_reg", "hif_mspi", "bspi"; + reg =3D <0x413200 0x188 0x413000 0x50 0x410920 0x4>; + reg-names =3D "hif_mspi", "bspi", "cs_reg"; interrupts =3D <0x5 0x6 0x0 0x1 0x2 0x3 0x4>; interrupt-parent =3D <&spi_l2_intc>; interrupt-names =3D "mspi_done", diff --git a/arch/mips/boot/dts/brcm/bcm7362.dtsi b/arch/mips/boot/dts/brcm= /bcm7362.dtsi index a0d15fcd3b81..194b6dd34eab 100644 --- a/arch/mips/boot/dts/brcm/bcm7362.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7362.dtsi @@ -389,8 +389,8 @@ qspi: spi@413000 { compatible =3D "brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; - reg =3D <0x410920 0x4 0x413200 0x188 0x413000 0x50>; - reg-names =3D "cs_reg", "hif_mspi", "bspi"; + reg =3D <0x413200 0x188 0x413000 0x50 0x410920 0x4>; + reg-names =3D "hif_mspi", "bspi", "cs_reg"; interrupts =3D <0x5 0x6 0x0 0x1 0x2 0x3 0x4>; interrupt-parent =3D <&spi_l2_intc>; interrupt-names =3D "mspi_done", diff --git a/arch/mips/boot/dts/brcm/bcm7420.dtsi b/arch/mips/boot/dts/brcm= /bcm7420.dtsi index a38041451faf..be4c9ba3d509 100644 --- a/arch/mips/boot/dts/brcm/bcm7420.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7420.dtsi @@ -311,8 +311,8 @@ qspi: spi@443000 { compatible =3D "brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; - reg =3D <0x440920 0x4 0x443200 0x188 0x443000 0x50>; - reg-names =3D "cs_reg", "hif_mspi", "bspi"; + reg =3D <0x443200 0x188 0x443000 0x50 0x440920 0x4>; + reg-names =3D "hif_mspi", "bspi", "cs_reg"; interrupts =3D <0x5 0x6 0x0 0x1 0x2 0x3 0x4>; interrupt-parent =3D <&spi_l2_intc>; interrupt-names =3D "mspi_done", diff --git a/arch/mips/boot/dts/brcm/bcm7425.dtsi b/arch/mips/boot/dts/brcm= /bcm7425.dtsi index c2b3ea21410d..8c476a20aea5 100644 --- a/arch/mips/boot/dts/brcm/bcm7425.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7425.dtsi @@ -485,8 +485,8 @@ qspi: spi@41c000 { compatible =3D "brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; - reg =3D <0x419920 0x4 0x41c200 0x188 0x41c000 0x50>; - reg-names =3D "cs_reg", "hif_mspi", "bspi"; + reg =3D <0x41c200 0x188 0x41c000 0x50 0x419920 0x4>; + reg-names =3D "hif_mspi", "bspi", "cs_reg"; interrupts =3D <0x5 0x6 0x0 0x1 0x2 0x3 0x4>; interrupt-parent =3D <&spi_l2_intc>; interrupt-names =3D "mspi_done", diff --git a/arch/mips/boot/dts/brcm/bcm7435.dtsi b/arch/mips/boot/dts/brcm= /bcm7435.dtsi index 826731515f0b..328fafe7519b 100644 --- a/arch/mips/boot/dts/brcm/bcm7435.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7435.dtsi @@ -501,8 +501,8 @@ qspi: spi@41d200 { compatible =3D "brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi"; clocks =3D <&upg_clk>; - reg =3D <0x41a920 0x4 0x41d400 0x188 0x41d200 0x50>; - reg-names =3D "cs_reg", "hif_mspi", "bspi"; + reg =3D <0x41d400 0x188 0x41d200 0x50 0x41a920 0x4>; + reg-names =3D "hif_mspi", "bspi", "cs_reg"; interrupts =3D <0x5 0x6 0x0 0x1 0x2 0x3 0x4>; interrupt-parent =3D <&spi_l2_intc>; interrupt-names =3D "mspi_done", --=20 2.43.0