From patchwork Tue Jun 15 19:14:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 12323169 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 080B4C48BDF for ; Tue, 15 Jun 2021 22:11:15 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id BF260610EA for ; Tue, 15 Jun 2021 22:11:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF260610EA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id: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=4AD6gfJKxyZ/ui6KhYXB4SvUDAhbbgizvDvCkK9tg1c=; b=KcrfH3IkMmUgbE McX3MPDnMQsdbKUJn13WoE74AxR219x6gwtSZecbhQT6TiT2xyhKPZupUsM7jhpiMBqPKAILNiLHC +R2rK4YOQILDoZSEVvKP6kTRKOTZ/EXUQuHAHPWAXyveDdcTiPNsr0yBJvuv0gZe4/Of8hjUFWHX/ 8xOJiDwqNLyNzTL3F78ujCJmLIi87npDVVTk093PuZlbxpGKG324ZkhgELx+cQFPSGBa4kxHU+x96 7Onizb+qAot28+FRIYXacH0RzRfvhjQ/N9aNCn/ai57OcSAoLX4XCXFb3Gkx/zXh7lK9jNgey0vx0 Dk0IY/3Utqm3Nl+HnFbg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltHF0-003RFp-Vd; Tue, 15 Jun 2021 22:09:04 +0000 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltEWA-002MYQ-QJ; Tue, 15 Jun 2021 19:14:36 +0000 Received: by mail-pj1-x1030.google.com with SMTP id i11-20020a17090a2acbb029016f0cce7c3fso44771pjg.3; Tue, 15 Jun 2021 12:14:34 -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; bh=uorcgZXlgqJQcGsdoYZaoV5DX2P7q/2KdrcuQbDRB/0=; b=jw6lzZnCGdUya6JfGU0QecPnq5KIND1/KNNBuz9GepBrkruH9DqzaDfoT7TsjuJC4/ jhMYjv/5rzuaWy/cJqYOVVfZZvUJZSsezFzDvfrJfvxpNLJPISnkjn0pf2mfdATilXzs LnaHALRG3fBxpDAPNkS0EM6DunIBQy9Xf22nBMrCz4pqgKN+B6kzgYiBT6CWKQe0mJVv YSdUKs11YE9ZYjjpWEmn16mCKEEIPF3SlHu3xiDmK/a/leoMIWZk0sT6NhmJkyEzjvxG M/9quwjKnK3sTZ9vN7KIEdTyAy/OAXo8Y8yvCOovfcmfLGqDmCKE1oX61QbjteSNcMnk b4gg== 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; bh=uorcgZXlgqJQcGsdoYZaoV5DX2P7q/2KdrcuQbDRB/0=; b=BsMEOlDOPO3v6GhQ7rPS+lLECntJ01j9jxatI+f6ssnn/zNCpPG4ryUdlTParwUk/N LAJE7RctwywveGDCwCCbdTyk264WaX8JvvbgOsSyUsro9jVVKkGPo4+isSgcsQE6K8ve IjfFBgiRGofmliGX29KGWLTcZnjJlpi1dhbNELG6hliLEDxZ/WTokTArPIq9gePfIYwE py4ipudrVQbXAIgOfKS3yoGzhD+3WJrajEKK21zOdXPvdlisGMuZY5yn5QFUqrtjSfGX /XOS8zOBKFDObLoK9GOMsqnX4TCxDytKt5yVRn5G4dFGpJlqs9e0H8bspBSLQg6ya9pD dQAQ== X-Gm-Message-State: AOAM532bBOiEri0w0pK6FV5cYIfkUtfqCDEP21OC6HPm1prwu5XwHDmp QeWrspnuEp+BoMdA3WAmFkY= X-Google-Smtp-Source: ABdhPJzGtvGuoKoVV6S8/vTL6PuoFi3mXD9AFM4nY55kFTDRu2WD/SFf+JV/rENW1efmmWLvgeREIg== X-Received: by 2002:a17:90a:708a:: with SMTP id g10mr6650326pjk.108.1623784473569; Tue, 15 Jun 2021 12:14:33 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id j4sm3165008pjv.7.2021.06.15.12.14.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 12:14:33 -0700 (PDT) From: Jim Quinlan To: linux-pci@vger.kernel.org, Bjorn Helgaas , Nicolas Saenz Julienne , bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com Cc: Jim Quinlan , Nicolas Saenz Julienne , Lorenzo Pieralisi , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Florian Fainelli , linux-rpi-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 2/3] PCI: brcmstb: Give 7216 SOCs their own config type Date: Tue, 15 Jun 2021 15:14:03 -0400 Message-Id: <20210615191405.21878-3-jim2101024@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210615191405.21878-1-jim2101024@gmail.com> References: <20210615191405.21878-1-jim2101024@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210615_121434_951939_52C851CE X-CRM114-Status: GOOD ( 11.69 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This distinction is required for an imminent commit. Signed-off-by: Jim Quinlan Acked-by: Florian Fainelli --- drivers/pci/controller/pcie-brcmstb.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index abc62a86d94e..51ce51a6cb61 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -257,6 +257,13 @@ static const struct pcie_cfg_data bcm2711_cfg = { .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, }; +static const struct pcie_cfg_data bcm7216_cfg = { + .offsets = pcie_offset_bcm7278, + .type = BCM7278, + .perst_set = brcm_pcie_perst_set_7278, + .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_7278, +}; + struct brcm_msi { struct device *dev; void __iomem *base; @@ -1227,7 +1234,7 @@ static const struct of_device_id brcm_pcie_match[] = { { .compatible = "brcm,bcm4908-pcie", .data = &bcm4908_cfg }, { .compatible = "brcm,bcm7211-pcie", .data = &generic_cfg }, { .compatible = "brcm,bcm7278-pcie", .data = &bcm7278_cfg }, - { .compatible = "brcm,bcm7216-pcie", .data = &bcm7278_cfg }, + { .compatible = "brcm,bcm7216-pcie", .data = &bcm7216_cfg }, { .compatible = "brcm,bcm7445-pcie", .data = &generic_cfg }, {}, };