From patchwork Thu Aug 27 18:18:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 11741267 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D22791731 for ; Thu, 27 Aug 2020 18:19:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BA03C22BF5 for ; Thu, 27 Aug 2020 18:19:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QYFhPpXp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727814AbgH0SSx (ORCPT ); Thu, 27 Aug 2020 14:18:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726243AbgH0SSu (ORCPT ); Thu, 27 Aug 2020 14:18:50 -0400 Received: from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com [IPv6:2607:f8b0:4864:20::1041]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2A08C061264; Thu, 27 Aug 2020 11:18:49 -0700 (PDT) Received: by mail-pj1-x1041.google.com with SMTP id q1so3022420pjd.1; Thu, 27 Aug 2020 11:18:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Hl7owRtuqO+nbDg2yFqvJPtQa89IxgWCrgChGWtbZ1Y=; b=QYFhPpXpmkURLzOHv/XGe3n4fce+F4gPVd0lKUzVF/sFfUvXvkC2GVs3hvCGEzjERM NXlDBrDgcQHT29SFhbuMBDEQOrms09o6fS6LxFBOLRmGrgEivzJZK0oriyuvZc9gRsZJ Qe2ok826vhcTxtlsysOhzNFugExWsW8aXvokCCnY5mujHBMz4LWQ0SBMLS4eEuWin0Dq VLeyF9jvu58VS5Rid0lRA8Jm+RcX9AOiSvVmSXxKVDyocAIXMnqztFSXUGgDmCAtcgIz SqnD6Hq4Oum/Qre7hivqqUToZl+164kepInbLtp/Jek8lqrObnORT2k5nmwS+BYe7K3U prHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Hl7owRtuqO+nbDg2yFqvJPtQa89IxgWCrgChGWtbZ1Y=; b=Ks1NTwcisCX/HEUguCw31BAaPzHFLY7Ym/m72nXGNI3oX+YH+I8NeikntjJjZkeYnh sbNI9zssh9amsih2F+ZJlD17wtd42yKelY8BJIOtO0kCb5lrQf+In1yR48r9D3Ahop8A WYOlJngXlPCMWbtCvsEaJebNS/5rYk4/e8iKsE6c+L5ksn+bu8zj8OwRA3VIUAdCHi8v 1ZlEKzd8nWFfdA0aYBHmv65RZxB03lr459ScS5jK7Rky5FKy+DI37ZXx6+T6PA00SlwL FGA9OQfQjNJv/VpdKrs9//cOkXkwlDnWtW/rXIEQW19kmBPggCVpUyWvDBcQOQf4i7qc Hd3w== X-Gm-Message-State: AOAM532b5Y7Sos9rL1iFuyj468wM44L6JQGm0ySVOHfXcXzgRLVgs3Fp Sobo5GBgBu0SI+zPEXD2U0w= X-Google-Smtp-Source: ABdhPJy4UTBLzEa4OVCZG17ii+J8Oh/hKLLcdPurxKIvFSuAzbMyFjBh95lsmtcm8BnLsPSrzXRdVA== X-Received: by 2002:a17:90b:696:: with SMTP id m22mr116217pjz.158.1598552328571; Thu, 27 Aug 2020 11:18:48 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id q18sm3580179pfn.106.2020.08.27.11.18.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2020 11:18:47 -0700 (PDT) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli , Kamal Dasu , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM SPI DRIVER), Mark Brown , Rob Herring , Ray Jui , Scott Branden , Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Yendapally Reddy Dhananjaya Reddy , linux-spi@vger.kernel.org (open list:SPI SUBSYSTEM), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/5] dt-bindings: spi: Fix spi-bcm-qspi compatible ordering Date: Thu, 27 Aug 2020 11:18:38 -0700 Message-Id: <20200827181842.1000451-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200827181842.1000451-1-f.fainelli@gmail.com> References: <20200827181842.1000451-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org The binding is currently incorrectly defining the compatible strings from least specific to most specific instead of the converse. Re-order them from most specific (left) to least specific (right) and fix the examples as well. Fixes: 5fc78f4c842a ("spi: Broadcom BRCMSTB, NSP, NS2 SoC bindings") Signed-off-by: Florian Fainelli Reviewed-by: Rob Herring --- .../bindings/spi/brcm,spi-bcm-qspi.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt b/Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt index f5e518d099f2..62d4ed2d7fd7 100644 --- a/Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt +++ b/Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt @@ -23,8 +23,8 @@ Required properties: - compatible: Must be one of : - "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-qspi" : MSPI+BSPI on BRCMSTB SoCs - "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI + "brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi" : MSPI+BSPI on BRCMSTB SoCs + "brcm,spi-brcmstb-mspi", "brcm,spi-bcm-qspi" : Second Instance of MSPI BRCMSTB SoCs "brcm,spi-bcm7425-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI BRCMSTB SoCs @@ -36,8 +36,8 @@ Required properties: BRCMSTB SoCs "brcm,spi-bcm7278-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI BRCMSTB SoCs - "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi" : MSPI+BSPI on Cygnus, NSP - "brcm,spi-bcm-qspi", "brcm,spi-ns2-qspi" : NS2 SoCs + "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi" : MSPI+BSPI on Cygnus, NSP + "brcm,spi-ns2-qspi", "brcm,spi-bcm-qspi" : NS2 SoCs - reg: Define the bases and ranges of the associated I/O address spaces. @@ -86,7 +86,7 @@ BRCMSTB SoC Example: spi@f03e3400 { #address-cells = <0x1>; #size-cells = <0x0>; - compatible = "brcm,spi-brcmstb-qspi", "brcm,spi-brcmstb-qspi"; + compatible = "brcm,spi-brcmstb-qspi", "brcm,spi-bcm-qspi"; reg = <0xf03e0920 0x4 0xf03e3400 0x188 0xf03e3200 0x50>; reg-names = "cs_reg", "mspi", "bspi"; interrupts = <0x6 0x5 0x4 0x3 0x2 0x1 0x0>; @@ -149,7 +149,7 @@ BRCMSTB SoC Example: #address-cells = <1>; #size-cells = <0>; clocks = <&upg_fixed>; - compatible = "brcm,spi-brcmstb-qspi", "brcm,spi-brcmstb-mspi"; + compatible = "brcm,spi-brcmstb-mspi", "brcm,spi-bcm-qspi"; reg = <0xf0416000 0x180>; reg-names = "mspi"; interrupts = <0x14>; @@ -160,7 +160,7 @@ BRCMSTB SoC Example: iProc SoC Example: qspi: spi@18027200 { - compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi"; + compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi"; reg = <0x18027200 0x184>, <0x18027000 0x124>, <0x1811c408 0x004>, @@ -191,7 +191,7 @@ iProc SoC Example: NS2 SoC Example: qspi: spi@66470200 { - compatible = "brcm,spi-bcm-qspi", "brcm,spi-ns2-qspi"; + compatible = "brcm,spi-ns2-qspi", "brcm,spi-bcm-qspi"; reg = <0x66470200 0x184>, <0x66470000 0x124>, <0x67017408 0x004>, From patchwork Thu Aug 27 18:18:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 11741265 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B57F914F6 for ; Thu, 27 Aug 2020 18:19:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9D2BD2177B for ; Thu, 27 Aug 2020 18:19:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RDKLzb11" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727820AbgH0SSz (ORCPT ); Thu, 27 Aug 2020 14:18:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727781AbgH0SSu (ORCPT ); Thu, 27 Aug 2020 14:18:50 -0400 Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4403C06121B; Thu, 27 Aug 2020 11:18:50 -0700 (PDT) Received: by mail-pg1-x544.google.com with SMTP id g29so2926016pgl.2; Thu, 27 Aug 2020 11:18:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FN2Vt2rHiJQZJYxgYpljdZm5xb4qlIG3AYHexM9U5WA=; b=RDKLzb11Hj61/atBaOUJPwGPTh+Sv/rC0am9Wg7Dot0WSdR9StL4Bg1+hvobCWrhED gB07sWEi982VmuDQTj2yxoxnzbQ7feb/nnqMs9CzhtWb5LFFTJA3aryFBDAVlwSJOgwc zzdOPtDXuVKUzsUUBdI91HaPXuuwWNSQf6lHmgtligMCd6S8x/utCWVW2iQKNh1DBt6M XTokU7NbxR0X1qTYMxLQhnn+huwRzd74UZ4QYhjtzXPIofmJb2y+8tgara7dc9IjmTOI JOTVjwOfvx07jNfNzwydY82VzU3zqKhLBk7OEXxSClUS6iv9nCJqtDuiBW3Z6wCo/xXM f25g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FN2Vt2rHiJQZJYxgYpljdZm5xb4qlIG3AYHexM9U5WA=; b=aecdBvTIT+KqLO86iNH/ups+5N9MpN3gY8qJvLXVYEp0McSRydUSkXGOjG9FhzfJA2 wayHoSPnViC+85nC33w+g6wJrYdw6vKupzDfB66ChtQiuIguw6FheHgAdWNZERUY/9Yj 4U+aLXEEIkpfCtTdk2P/1hKHEKg+ccoNyBzvtpNNp5WXTdqW81BKWHB+3+Qy2N2Hv7Ys E0OPdZH3XHbk/rSxgjl1uKiIvTNRHiPumxbXvlxUgolBo7F2MD8YMF5zz+ejVjIu/c0I pjcWV06JJB2Hey13zQbqZF5sMCGSJaPIliUqTnFKA7ocBDvX+rxZATTckdmYzZvvCPhA AIFA== X-Gm-Message-State: AOAM532p22nN+bgiBGf+9hdfIop4JVtok6blOk8JOmsDBUva3jTw8955 ADU47gW8KKdgUgEf/2Ag0Lg= X-Google-Smtp-Source: ABdhPJzwV+iNW5pVpRaP+ZVWMf2SduozLYmTfWtf+YyK2Lb5zSVMuUlCR+CPXCVjr4/wJoTnuKt+9A== X-Received: by 2002:a63:cd0b:: with SMTP id i11mr8264867pgg.306.1598552330187; Thu, 27 Aug 2020 11:18:50 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id q18sm3580179pfn.106.2020.08.27.11.18.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2020 11:18:49 -0700 (PDT) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli , Kamal Dasu , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM SPI DRIVER), Mark Brown , Rob Herring , Ray Jui , Scott Branden , Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Yendapally Reddy Dhananjaya Reddy , linux-spi@vger.kernel.org (open list:SPI SUBSYSTEM), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/5] ARM: dts: bcm: HR2: Fixed QSPI compatible string Date: Thu, 27 Aug 2020 11:18:39 -0700 Message-Id: <20200827181842.1000451-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200827181842.1000451-1-f.fainelli@gmail.com> References: <20200827181842.1000451-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org The string was incorrectly defined before from least to most specific, swap the compatible strings accordingly. Fixes: b9099ec754b5 ("ARM: dts: Add Broadcom Hurricane 2 DTS include file") Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm-hr2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm-hr2.dtsi b/arch/arm/boot/dts/bcm-hr2.dtsi index cbebed5f050e..e8df458aad39 100644 --- a/arch/arm/boot/dts/bcm-hr2.dtsi +++ b/arch/arm/boot/dts/bcm-hr2.dtsi @@ -217,7 +217,7 @@ rng: rng@33000 { }; qspi: spi@27200 { - compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi"; + compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi"; reg = <0x027200 0x184>, <0x027000 0x124>, <0x11c408 0x004>, From patchwork Thu Aug 27 18:18:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 11741263 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B41D614E5 for ; Thu, 27 Aug 2020 18:19:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9A75522BF5 for ; Thu, 27 Aug 2020 18:19:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="q6A4v1RE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727823AbgH0SS4 (ORCPT ); Thu, 27 Aug 2020 14:18:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727784AbgH0SSw (ORCPT ); Thu, 27 Aug 2020 14:18:52 -0400 Received: from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com [IPv6:2607:f8b0:4864:20::1041]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B3C5C061232; Thu, 27 Aug 2020 11:18:52 -0700 (PDT) Received: by mail-pj1-x1041.google.com with SMTP id kx11so3015213pjb.5; Thu, 27 Aug 2020 11:18:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CatPPhK9A3iq+4G8OsLNJjr5wv7C3OYfFC9OHG8z8x0=; b=q6A4v1REhzHsXoNtbR/YkAu6EirCTqIxVdqQrdtGv88d2YYEly07YjSadVqqijOhcL HK1NZA41gHW0VCi00hdDcd2Yiwo3dXPraXqu9x5kH14otsMXVJKOhbZncqwFQ6wtY4MI oSApTjReTTfXmUTQORZHLoV0KASDM0AqvRDbT9H2gXkWoHGYdNsKo3LPdM3cUVYG9fhq 5CBlC4TRalTx2+9jlQO6B1+RnBFc3xU22LauRlPi2ztFSr+HMOSvvvlQAtfm2dV7ZeZ/ WbA2+ihi007Hhh2PL1/8s8Ogk5vHkVDNLz4XPGeWiEXEJCckiPlkV61H52ONDHum9nro Ah+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CatPPhK9A3iq+4G8OsLNJjr5wv7C3OYfFC9OHG8z8x0=; b=CimO2tE22TvM2Q7tunc38s26L5xG7JUxZyBiWaYC5pMwZ+gy1kTFerzi5QcBMMmit4 qJhjBfbQt/nIDBnLs3IKWjHy6ve1NOgaSVDSlSoIfmRmYQhzb6apGhs371t5YoR87mAC /rYzHIl/mL4cF+Nzp0AkpdWpdMfeE6nzlg3uo1PZuFgULCAhfnuEYAQ+Wy+bvrX4vx6l ZiK06ORjucH6xqn4iH5HPQW5rkwKsCS83gfe3Nhh+pZtzb/ezJ4HVnTLAt9BH71BosrR Lm7xuvan35XnJ9r95mwWlNbkfGOnzdaO3mtN18DCNpOJH2qRZGkL8LZyyTQmY2Z92m00 wmRg== X-Gm-Message-State: AOAM531ItBMEGWgRqzprTnmElWRcw5DQGvrsGM6FZY/ynjhCS28H27jU 9PgcHkuzAVlTNLhPKl4/dOg= X-Google-Smtp-Source: ABdhPJyMqHpvSpd3C9HlHIRazuypsiroUjSp4k/vGcBtgRM2tm00Y+6yPc4yLyhg+f8pNQELqsUljA== X-Received: by 2002:a17:90a:ad05:: with SMTP id r5mr104112pjq.186.1598552331809; Thu, 27 Aug 2020 11:18:51 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id q18sm3580179pfn.106.2020.08.27.11.18.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2020 11:18:51 -0700 (PDT) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli , Kamal Dasu , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM SPI DRIVER), Mark Brown , Rob Herring , Ray Jui , Scott Branden , Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Yendapally Reddy Dhananjaya Reddy , linux-spi@vger.kernel.org (open list:SPI SUBSYSTEM), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 3/5] ARM: dts: NSP: Fixed QSPI compatible string Date: Thu, 27 Aug 2020 11:18:40 -0700 Message-Id: <20200827181842.1000451-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200827181842.1000451-1-f.fainelli@gmail.com> References: <20200827181842.1000451-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org The string was incorrectly defined before from least to most specific, swap the compatible strings accordingly. Fixes: 329f98c1974e ("ARM: dts: NSP: Add QSPI nodes to NSPI and bcm958625k DTSes") Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index 0346ea621f0f..c846fa3c244d 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -284,7 +284,7 @@ nand: nand@26000 { }; qspi: spi@27200 { - compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi"; + compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi"; reg = <0x027200 0x184>, <0x027000 0x124>, <0x11c408 0x004>, From patchwork Thu Aug 27 18:18:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 11741257 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 649C514E5 for ; Thu, 27 Aug 2020 18:18:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4BD8D22B4D for ; Thu, 27 Aug 2020 18:18:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TvVNg0zL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727833AbgH0SS4 (ORCPT ); Thu, 27 Aug 2020 14:18:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726938AbgH0SSy (ORCPT ); Thu, 27 Aug 2020 14:18:54 -0400 Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D839C061264; Thu, 27 Aug 2020 11:18:54 -0700 (PDT) Received: by mail-pf1-x442.google.com with SMTP id y206so4129919pfb.10; Thu, 27 Aug 2020 11:18:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qWEGjrPVeQY7q74ALv9YEvs+7dg18MaH1fONO0hwUXo=; b=TvVNg0zLEaMe/if7bHVLqge2Wq5YSHCcoXWdEI7NaQNxXsrF5bxaxu4FCs/CTTaypv 7NNo87iPUdgYUvV0m6KxvCslkLZCRmZVNRN77P1eQvnIl5XmRDEXwCQus4O58iqOHU1w A3tpPuT86C9ReSMobznRt8KLSxWVHZZWJP2+lkDqbiITm0ML7ldqC1RjKZZTJI/2bLjz VRNLg5mEW7i7946zyRwvfdQV+5k+eGOUIV87w0RCJODLdxE8gjspNW9BbWFyIiD6qzyI RfGCISl+TF1WkKdLP6xmepnMDhdCseM6pEf6tlhqNskSFe89wmjpP82M3XjDW/o77/KO R7KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qWEGjrPVeQY7q74ALv9YEvs+7dg18MaH1fONO0hwUXo=; b=ebwFe8M3UmCegyTghaJMsXw02Asbj+zd/RIXdFywKnWbAKVGrzAiCGHk0YPZfhbmZ+ P3j/Cvo9lyVkMYJMnP/KEw5JpZ6cCcprsKmpv/q9l+pIIOW5YYljJw7P5KfxBdxzHG/I XUBJCoboNhbgxrOuSZIg3TjtaMAYaOsseIEWvY+qEtJuljiSbovDxT0H64YauDETM87x 453LPkV653xoGmU/UhZtiCoXmBpxG0wK+MDvveRRH8FyjuR10Hvj14za385fQPvi1+F0 Fn6AVgXxx1NykLapP6+8DH5Os8rQDcejR2gKO/GuhQVBSpaFUB7tGTaS/LhsRvNoYC/l t/mQ== X-Gm-Message-State: AOAM533Gjwf0cMiTuh6NQAdap29ot9n/VfsuuUuOma2BKwGjRrv3kg0k ejgEFaHUxTUnsJWVtftbBIg= X-Google-Smtp-Source: ABdhPJzx3hkAE/P+tGjBhOPy9WW8+9VI2y0iNI9hLyVjFfHn8On9W36EQudYnNUXxbLvn4hv4ya4mA== X-Received: by 2002:a63:4c11:: with SMTP id z17mr15248438pga.152.1598552333632; Thu, 27 Aug 2020 11:18:53 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id q18sm3580179pfn.106.2020.08.27.11.18.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2020 11:18:53 -0700 (PDT) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli , Kamal Dasu , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM SPI DRIVER), Mark Brown , Rob Herring , Ray Jui , Scott Branden , Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Yendapally Reddy Dhananjaya Reddy , linux-spi@vger.kernel.org (open list:SPI SUBSYSTEM), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 4/5] ARM: dts: BCM5301X: Fixed QSPI compatible string Date: Thu, 27 Aug 2020 11:18:41 -0700 Message-Id: <20200827181842.1000451-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200827181842.1000451-1-f.fainelli@gmail.com> References: <20200827181842.1000451-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org The string was incorrectly defined before from least to most specific, swap the compatible strings accordingly. Fixes: 1c8f40650723 ("ARM: dts: BCM5301X: convert to iProc QSPI") Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm5301x.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi index 2d9b4dd05830..0016720ce530 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -488,7 +488,7 @@ nand: nand@18028000 { }; spi@18029200 { - compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi"; + compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi"; reg = <0x18029200 0x184>, <0x18029000 0x124>, <0x1811b408 0x004>, From patchwork Thu Aug 27 18:18:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 11741259 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2C9C314F6 for ; Thu, 27 Aug 2020 18:19:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1523822BEB for ; Thu, 27 Aug 2020 18:19:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cIV9jK65" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727099AbgH0STL (ORCPT ); Thu, 27 Aug 2020 14:19:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727822AbgH0SS4 (ORCPT ); Thu, 27 Aug 2020 14:18:56 -0400 Received: from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com [IPv6:2607:f8b0:4864:20::1041]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDFF6C061264; Thu, 27 Aug 2020 11:18:55 -0700 (PDT) Received: by mail-pj1-x1041.google.com with SMTP id 2so3051397pjx.5; Thu, 27 Aug 2020 11:18:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AxmULkJUlPJ0j1k6lcIgCZG5M7EGNDQkghcppoKAqWM=; b=cIV9jK65cCq1DtQMSLjUfQ078BoS4IFTNZmc0plZjtfXSjK6UECYi+74VZ+YHiVYFN h4P3NKLNdBQv22Dl/7fANby7hhpv9vTK/MX2hYrYi00/suujYOUlxLEDxmrB09IxD6AR 0sDoNy12cSu70635GDgiFbPJL2qpFNa64k2I6Z/VCmjlcKCS2ut/svN7dnj5llIBZlRn bs74rGsDy8Ky8lV6vF6dwpjBnGyhmUA9NZLUfIGL3V1RB0Z3J2hJtZ4PUAnrKVmFGthW dZvMLyFdxNFP1AfXi6FuigjXTUGivszRpoE8JqGHzcBLruZnjsJVq8h2Qi8/zzJrkm0U xhdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AxmULkJUlPJ0j1k6lcIgCZG5M7EGNDQkghcppoKAqWM=; b=JRHPwW2ytf5mBVeVqoUloniDFbSLOGSOcJplBmP3kPaQxVyOLqS8suxZn1eb7VEAXJ ottyu3310UFHg/GP91B/Y7UFp8y9DEqmDnFBMveJGoEKGPOJ2AE/mWINkX6ZAn9Qb16O wLcnuLKWPcPOWdcss/B9ywmYxF2xbhbfOWKD3QCf9o/fFD30zJ9kaGs8rcEGAnFi5O76 4CxkWu/Grwp+j/vyECw+lN4lc/aVtyA9vNhao/jFYZ9RIuvfGT7RgNOyd6IMMWnZZMt5 Q7i/eHtmvCYw5A3jOgvAAosE7sxrBfOP/ubXw89VvmjOQof/hwKt8rudLx42B6WElAvg cH4A== X-Gm-Message-State: AOAM533RE0QyYz4gUA6uNodiMRXx/PkuRbNKbG5KC4IQdmmTcmI4YRi/ r8Fv40DBDoUA9JOcPl8gDuY= X-Google-Smtp-Source: ABdhPJyHl3YlRZvGe3nPyemkInLkd2D+iFh/iW4Fs2NFdP9gnVxtl/xHR1ozdtFi43v4aIOFEkSx4g== X-Received: by 2002:a17:90a:d712:: with SMTP id y18mr93319pju.79.1598552335285; Thu, 27 Aug 2020 11:18:55 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id q18sm3580179pfn.106.2020.08.27.11.18.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2020 11:18:54 -0700 (PDT) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli , Kamal Dasu , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM SPI DRIVER), Mark Brown , Rob Herring , Ray Jui , Scott Branden , Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Yendapally Reddy Dhananjaya Reddy , linux-spi@vger.kernel.org (open list:SPI SUBSYSTEM), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 5/5] arm64: dts: ns2: Fixed QSPI compatible string Date: Thu, 27 Aug 2020 11:18:42 -0700 Message-Id: <20200827181842.1000451-6-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200827181842.1000451-1-f.fainelli@gmail.com> References: <20200827181842.1000451-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org The string was incorrectly defined before from least to most specific, swap the compatible strings accordingly. Fixes: ff73917d38a6 ("ARM64: dts: Add QSPI Device Tree node for NS2") Signed-off-by: Florian Fainelli --- arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi index 15f7b0ed3836..39802066232e 100644 --- a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi @@ -745,7 +745,7 @@ nand: nand@66460000 { }; qspi: spi@66470200 { - compatible = "brcm,spi-bcm-qspi", "brcm,spi-ns2-qspi"; + compatible = "brcm,spi-ns2-qspi", "brcm,spi-bcm-qspi"; reg = <0x66470200 0x184>, <0x66470000 0x124>, <0x67017408 0x004>,