From patchwork Tue Apr 27 17:51:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 12227093 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,URIBL_BLOCKED, 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 2F561C43460 for ; Tue, 27 Apr 2021 17:54:11 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 A506E613B2 for ; Tue, 27 Apr 2021 17:54:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A506E613B2 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=desiato.20200630; 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=FS+dgxy5FmqJfxo1aJzmoTV9iJs2iwxtKc87eOcTkpU=; b=Q0OO38ydNgNCxyrPP0k1t450D3 wGvE8K91kAZ2DpETWX3oGefaoo5GGoXoQg0kGTD4UVc7Wben3O9qHcaSVU9V+DZI7Uuzm3opHWbmE PN4PT7S5lIsH3qrdePajslLXi4Ke2MCVj1SgLi9P1qQfqCSevjnpQekIj9uWPnZOCSQQ4HyWFsWjO hauTW2FTxF0onXrJT3f5kAAtu3PuM09DMleaMzmg9U0WzXAAZUotBbrcCics3obF+GE4Z7kE+AYuA 4mfZLrNHeA+AlhEpy7xVQMlr7sdgZqorYwqC+q4jR3/GzuwmNAODzjTLrvClbBsCBbFMYd6taa5lI 3A8tUneQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lbRsk-001zSv-7h; Tue, 27 Apr 2021 17:52:22 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbRsK-001zQM-9f; Tue, 27 Apr 2021 17:51:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description; bh=2TeMQIR29LL2unimARSS4Lts2CWaYP5hnwBOgRuHstg=; b=uXtdr/uaaivqJXaj+3TZsr5ctv jePCEUI2ftVf3J5O5wGvyIDvC8MnOAXs6xpEa65UAXpyG+pYxH1bY72EavAYP3EQQ+tEVVpsyRntg Letf+cD4TkjtE/2dRM79czB4Gt/68DuQFwwDpPIYis4UFMSdNrEW02Mw3RCcLGRZhQ1I0jbQVPa+3 ScNiN1ZmUKOgETAXkDBgExCwIdIqlgwpC1l4Q3+9KmilktQzy3MPfAicSkH8oj93Nk97+XxanljEY 5VgllcIJ7knzw6kVcRXr0fM+mlaifqDUGptlkLGLNBLFkhiFCD+E0wKwBhplVRjPR4GgzVHrgNnO3 AyD+L97w==; Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbRsH-00GtlC-NO; Tue, 27 Apr 2021 17:51:55 +0000 Received: by mail-pj1-x1034.google.com with SMTP id md17so3934413pjb.0; Tue, 27 Apr 2021 10:51: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; bh=2TeMQIR29LL2unimARSS4Lts2CWaYP5hnwBOgRuHstg=; b=QdGe6x34JJei2d/ron5yM0DJQaJi1jeLsPy+/ZgW8umuLF/6hL54BgrJOy72zTLBjj SaK5FWmffeSlWH5iOk1FAJzl5PWqPNY0lPgOA5SoFwV0/2U0dVHZ0jjDJkB/LW1qInfS wq2eVemAQ6lsSAsYA3EN1hzrNckL75XUZy/osCJ5UlUQCbmfEpjZZocSlIxOYVBx/mZL U/iMQ+0T33Mgv4wd74WTfR7YUksY5jo7JzL6mJ5MNE6JTiIUTDMIl6zX4PT9PejgPwQR r5nEtNC8rKuUUFqSPLFX40vmF4R558O6AWsl/aBxO/vk9eHCR05ZAIhLcyS83em4fyeA 5xTA== 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=2TeMQIR29LL2unimARSS4Lts2CWaYP5hnwBOgRuHstg=; b=eHcxwsY9N3dfB0BHrqmh1XGeXFBy7zVvmwNNN7l7dYzwN2Mp/mlVDllwkMfIV182ch hIMFSDmiO4+MUll1qtlqGi40wmEhsV1samK0/DoL2olDQlgxWFUASIqWxl6FZ6/QZ7H/ mUtF4hkn+M4sKatzDlmk7Sc1sFA0aNjw0i4j3DjZgNmG2p4mqyegaLLtABRywxKqPdZx vDP7nHALLy+x7Fvet1KdPp2x78qZidq1Ha4AWZ/rAOUBJxYLxNLJZUMmEfpUAtbl6O04 UOx/R+2wqYe3zmo69rCtPdi/h5+Z4/4m+8I7+utzLQCHkY9cKE9aMK+tp4VPN5l4VQgI kS4w== X-Gm-Message-State: AOAM530ZP2tlfXLcRYCkjLLn0nGPawqdNUld+sIbRm+pZqTz4+ac7hz4 AWw2Bgt6n951/McbECUd4R0= X-Google-Smtp-Source: ABdhPJx3pj84P+TymUJU7/RCESFFoXJOkjgVGHcMsSz22PuKQmBEfFdZP2cdrdcIWYQSdH7bw/9cXg== X-Received: by 2002:a17:90b:e95:: with SMTP id fv21mr13283405pjb.107.1619545911874; Tue, 27 Apr 2021 10:51:51 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id h21sm2456833pfo.211.2021.04.27.10.51.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Apr 2021 10:51:51 -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 , 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 v1 2/4] PCI: brcmstb: Give 7216 SOCs their own config type Date: Tue, 27 Apr 2021 13:51:37 -0400 Message-Id: <20210427175140.17800-3-jim2101024@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210427175140.17800-1-jim2101024@gmail.com> References: <20210427175140.17800-1-jim2101024@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210427_105153_779849_FF6B6F6E X-CRM114-Status: GOOD ( 11.16 ) 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 4ce1f3a60574..3b6a62dd2e72 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; @@ -1220,7 +1227,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 }, {}, };