From patchwork Tue Dec 14 03:58:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12696021 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7AAE8C433F5 for ; Tue, 14 Dec 2021 04:01:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7YgLVSRLQhB7KntlP5Xp2CaNhCdRUUezEzk3syCheNQ=; b=lC1FXHCPsTkSrd W/NvnvqW5X27XPIygu7Wl6A/xBdauHVmCPIY6ksXim/NkAOEUnbeYhwHE27dP4F9d3Yo8/NoqrowO fUN9xmTdmcowECpE6ABsdF8W+dQC/UBPjv+ZOOE2M+P2XNtTcJ/qeZofJEWEbLY95mZvSTynNPVIP oxfC2DiIozscoH6mwJV0ChoQmCH4K3Aad1fhTMGRluzUnSuxmXu2fmVE1TfoqGnle+hvzvzIRVjyu NENi+cd2oSsr+Xf2aUG76KIZoYOz+ho3Hc7cTVH//p4/Ebp607psHfphAWdcbcjf3CVzYLRkYAquy AfXFu+4BvftWnb1uKMRA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwyyA-00CTCt-LD; Tue, 14 Dec 2021 03:59:14 +0000 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwyxT-00CT2i-UI for linux-arm-kernel@lists.infradead.org; Tue, 14 Dec 2021 03:58:33 +0000 Received: by mail-pg1-x534.google.com with SMTP id k4so16295755pgb.8 for ; Mon, 13 Dec 2021 19:58:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6PtQ+iCOtg8wKI/383IxFyqZ9i0rudNbH4n4NHCffbA=; b=DZhJTuI7YzW03odBx/bNqEurSo33emVPAj/azvE7XrsemmvRymdUBsKJBff4HbXKL2 cnSjxAD0V8TCBQegRSQlL+p0cgFJMvRJ1wJbXAfZi1y34kZYEk6AwnM+89LQBT5BG/Gx TLDlsGdZNcSXZghV/JbjO+CQKgmkVmsk29Qqdk2nWMy5rLqJlV2/U0pE6Jv9gEk4xq+/ 3KHIYynY4PhX/vuw3djmgN7GA/Q39Zc65HDLyr0AXnaEkHd13V65VJyfbC4/rgGQZ9DT YmJHkEVbcALis4r63k2ABnepHaAqCawCwDzISMYVrtVLoOHh3CzPgDf486gRtqKM0MlI Oh3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6PtQ+iCOtg8wKI/383IxFyqZ9i0rudNbH4n4NHCffbA=; b=jL/5kNq6iI8liDK+Ur0hJkrxhu2nBdMZKENYZKietICqx603jPToE351MXinEq2MOq xJWvDe5yqothEQsb1Pzy87zfICAF98NKRaOueR7VlOhHNGOxpj9xjrHp/Gr3riIBdods aEa41qd5qie0bhUie7Q02TVuXLVTI0cTBkKLN/UBV0S9l4o2WzoJCIPhyaHHIgipuoQa nZwArjCa1gTTe/4NeecFtRv4Gv4OLm8w/SPDAuBhXqOZFIxe0dp549aAx7PHV+Ltnro8 Kig1myeupJ5IlruMBI+TvVtoje/Blnl2iTjHS0DUeWrXPqEtBnsc2jtOYwH1lriaeSN6 +VtQ== X-Gm-Message-State: AOAM531u5QP0ao/1pIS8rmdwnGKGCLq0SJZoJlY6sBbxq8+uZsODj3GS impfOlLDwOx8jRwN9mBbswU= X-Google-Smtp-Source: ABdhPJxV9k0ZL4Gqs67Vg9VKizi/lSyC7nsQ/hfmdjfPA6IUerHTOc5040md/BDFUMBR4ca4StXqUg== X-Received: by 2002:a62:8103:0:b0:4ae:d63e:9d85 with SMTP id t3-20020a628103000000b004aed63e9d85mr2108727pfd.69.1639454310360; Mon, 13 Dec 2021 19:58:30 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id o17sm11430356pgb.42.2021.12.13.19.58.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 19:58:29 -0800 (PST) From: Florian Fainelli To: devicetree@vger.kernel.org Cc: Florian Fainelli , Bjorn Helgaas , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM IPROC ARM ARCHITECTURE), linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM IPROC ARM ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 4/6] ARM: dts: NSP: Fixed iProc PCIe MSI sub-node Date: Mon, 13 Dec 2021 19:58:18 -0800 Message-Id: <20211214035820.2984289-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214035820.2984289-1-f.fainelli@gmail.com> References: <20211214035820.2984289-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211213_195832_006869_A66B8079 X-CRM114-Status: GOOD ( 11.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Rename the msi controller unit name to 'msi' to avoid collisions with the 'msi-controller' boolean property. Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm-nsp.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index 1c08daa18858..f242763c3bde 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -587,7 +587,7 @@ pcie0: pcie@18012000 { status = "disabled"; msi-parent = <&msi0>; - msi0: msi-controller { + msi0: msi { compatible = "brcm,iproc-msi"; msi-controller; interrupt-parent = <&gic>; @@ -624,7 +624,7 @@ pcie1: pcie@18013000 { status = "disabled"; msi-parent = <&msi1>; - msi1: msi-controller { + msi1: msi { compatible = "brcm,iproc-msi"; msi-controller; interrupt-parent = <&gic>; @@ -661,7 +661,7 @@ pcie2: pcie@18014000 { status = "disabled"; msi-parent = <&msi2>; - msi2: msi-controller { + msi2: msi { compatible = "brcm,iproc-msi"; msi-controller; interrupt-parent = <&gic>;