From patchwork Wed Nov 25 19:24:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 11932077 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=-18.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MIME_HEADER_CTYPE_ONLY, SPF_HELO_NONE,SPF_PASS,T_TVD_MIME_NO_HEADERS,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 30090C56202 for ; Wed, 25 Nov 2020 19:24:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E3E1B207BC for ; Wed, 25 Nov 2020 19:24:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="RqP2ENWe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727666AbgKYTYn (ORCPT ); Wed, 25 Nov 2020 14:24:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727652AbgKYTYm (ORCPT ); Wed, 25 Nov 2020 14:24:42 -0500 Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6332C0617A7 for ; Wed, 25 Nov 2020 11:24:42 -0800 (PST) Received: by mail-pf1-x441.google.com with SMTP id w6so3291771pfu.1 for ; Wed, 25 Nov 2020 11:24:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PNWFWow9BMSEQ33XGIIu2VFtrCr4MG/+/TzLim/ysUA=; b=RqP2ENWe35FJ+fpPKFMca6jW5aSQxNbXBxUpYmsP5rmyNUHoZAcBHmNH9sWcQVnDDD HFyAlAI730jdreP3Q1kLJaGOx3BlDp8OCuumfTUd5bQoYAZcaJiewZYH7IpHrp74+fph /ztaAD1zt0fMT0OJYp0tnwkF0+EfAiZu2YBkY= 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=PNWFWow9BMSEQ33XGIIu2VFtrCr4MG/+/TzLim/ysUA=; b=HLujz2vjZ/1IQ9h6M3SA5/L3kkN1kmdixd+xMy+4URNOWhvbNbDGezzJ5E7fQIhdqM HrqiMe0vcRv4SE20q4GUj6xw7AyF/1YCLGzz7OjGqjka0kZ/i19tTDnBv7av1xQ6nfi0 azuXqjojoGIU8abfQ+fH0Pq2IvQYYIDVfN5XUM72Cy+MIo/8XA0lUISGYmJG9WiWFK29 FwfeLXHKvi9SCvx14S5URC1qbCh6KC69DJmzF+aZBY24AAngH3nqrj3XGf1gVI6wPXsJ umy1hVNiKk18tIldL2AAjubvxPAEHTU1VuycCnQ4idrgtQi2US89eyU87e1WthKr8lJl Q3GQ== X-Gm-Message-State: AOAM530tSZTAPB32USDWP70Jbf843trnOJHOD2DKPH9uolCKVsF2qxT1 V+WY1Y5mAAyYvtT1N7IGEA8pkpguqhoSAcwi9919iCaCae7hd/G7l3NYembRUzcynP4S2BSU10E R3OLYzOdyCxetsa8TSqEhGA+xPr6BzeM2SVB67GVg0Lr+y0L4ABLVV+reQmy87Ot/nXFsBBhkU2 WGGil3 X-Google-Smtp-Source: ABdhPJxmwsEH5Ovf3XcqoVcZ7u8ynG5VfIqXXe29N/D0KNNuLm418XkTPxyuYMw+tKAdJcn8nbUYhw== X-Received: by 2002:a63:7943:: with SMTP id u64mr4212799pgc.139.1606332281763; Wed, 25 Nov 2020 11:24:41 -0800 (PST) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id j69sm2574885pfd.37.2020.11.25.11.24.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 11:24:41 -0800 (PST) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com Cc: Lorenzo Pieralisi , Rob Herring , Bjorn Helgaas , 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 4/6] PCI: brcmstb: Give 7216 SOCs their own config type Date: Wed, 25 Nov 2020 14:24:21 -0500 Message-Id: <20201125192424.14440-5-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125192424.14440-1-james.quinlan@broadcom.com> References: <20201125192424.14440-1-james.quinlan@broadcom.com> Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This distinction is required for an imminent commit. Signed-off-by: Jim Quinlan --- 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 9b888846f0bc..e39bd93790d0 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -264,6 +264,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; @@ -1312,7 +1319,7 @@ static const struct of_device_id brcm_pcie_match[] = { { .compatible = "brcm,bcm2711-pcie", .data = &bcm2711_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 }, {}, };