From patchwork Fri Dec 10 20:04:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12695709 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 390F0C433F5 for ; Fri, 10 Dec 2021 20:07:29 +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=YJMijfPW6+Ea41 3FXNyV+obJ9j5KdykTvgSO8KjIkfuw0KoTXykKtJVgIcNN+6LS+vP+aD2YFDHmVFJ/RUvsNelvq+j cG7m4stTQRb+u60AUesINfWGC7xo09Eb8YlZ/1XNuIUXbd5VD8K9rzvO/ccl2kzkwcCnkcU/04qav TSePYbfvHW7nmkt4Jvfnel1GExWRbGZXz4xy4g7hnODEk1KIJQAlab+gsIwNQrjE2rUhEc1zQeXRD M9exa26UCQI03LRQZScbL8cNZC/lTCCB3+YuyYL3MZzpI14dbI7fevkaN0TlmaoG2pJ4mHZNc5h5U FVzRzHsTDsSMlw56SReg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mvm9S-003fOg-Pj; Fri, 10 Dec 2021 20:05:54 +0000 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mvm8k-003fCS-52 for linux-arm-kernel@lists.infradead.org; Fri, 10 Dec 2021 20:05:11 +0000 Received: by mail-pg1-x533.google.com with SMTP id r138so8911993pgr.13 for ; Fri, 10 Dec 2021 12:05:03 -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=P9PK+g5pd0zUN7vBecpw5kRKHQ4ONdv3uxggvZWCKMk1DeNsbq4AhePgOSAn/qBhZL eMsd6kZtO81nZyzVD6eew1+4VUkymIvPZdsNNIFqCdxorwyl2LXPXOj6d1KsDQIfVGcu SvoaR1DtpNpEJQv/ziyGmY5F37jhzPk4JnUI5oLur0u5/h/D+K1vrJ3rQrwiAj4JnvOM i06TYdLNy28DdnO0d2iH4pMZ6iwdHhYXKKte6OUP3iJXkeGdnchinryksaDlT+VTz2BX 6o04JaH/63H28H8XPHc5YMNN4uaEzTR+KMzcMVWECNvwmkj09btB9va9GbxFQSvCbtcA lV+Q== 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=oLIuH5yUzJ9rFHHQujYt3E2Vkm9yOBMsZwQR7CezATrFkGip9t+wSVEkPWR4ueu8Xi aRzz3dK36ltw/HKMERN4lkmtJonNhGOhL41t0t9MTuxybHMibURediQGIDt+1x1sj6Ji SnQ/FcNCkvgflxcJPg+SwT8EiJ/H01RUKXJXNCxvHv74P7PZ4/QlO/fWCRgmGpzn2O8D xlSYDyUSOgTT1qZse2IVQg9MQTGB2iE+5TqpRzdp3wJ0aoPgqkSQsHURDr1pU9Fstq5t zR2/g43Q+VRXb3asgDVreZo4XZTxWl627w0RDQbN4C/g+gnwWsqmeX3NopIX+b9YWHMS JkgA== X-Gm-Message-State: AOAM5334iPyxBW0WvwcllKxNdK2P3UVh0nIW3MWsOC6cHsVJys23ks5U 9H6dOELBAM9wz+/WfccIFA4= X-Google-Smtp-Source: ABdhPJzLai1LzHaLHJ983CX/T7ku5ydPVdpFfHWVtadiam0qshf38kLWDsCvkH8YA+FI6tdnC6TyFg== X-Received: by 2002:a05:6a00:21c4:b0:4a7:ec46:34b7 with SMTP id t4-20020a056a0021c400b004a7ec4634b7mr19891146pfj.15.1639166703345; Fri, 10 Dec 2021 12:05:03 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id g13sm3474463pjc.39.2021.12.10.12.05.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Dec 2021 12:05:02 -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 v4 4/6] ARM: dts: NSP: Fixed iProc PCIe MSI sub-node Date: Fri, 10 Dec 2021 12:04:49 -0800 Message-Id: <20211210200451.3849106-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211210200451.3849106-1-f.fainelli@gmail.com> References: <20211210200451.3849106-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-20211210_120510_218760_75DF7E24 X-CRM114-Status: GOOD ( 11.54 ) 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>;