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: 11932093 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=-16.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 3C2A3C56201 for ; Wed, 25 Nov 2020 19:26:33 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 AAE08206F9 for ; Wed, 25 Nov 2020 19:26:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JEGzZIOY"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="bboQPOK0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AAE08206F9 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=broadcom.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=merlin.20170209; h=Sender:Content-Type:MIME-Version: Cc:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: References:In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=U+ekxBNH4IKCSDW+Vpni/UbopTFgxSucK+rt5TZU8f8=; b=JEGzZIOY6MSBOHgrjIwqc8gCz +4wThmpK9U9/PmqlagxfXgDkpTIi5BrJiAxStMVp4zIZdA//fPNkTYLn7pjuocZ5bIaMFb0N6nrSn Si00jlQ84IUk7Q6I0XlwNtcsmImv6K8fQxabOjfH+gRogT3t5THrr1lr2tTKoyzV0Wf72H5ed2G+J 3xCnKUKCldBMPCSE3yG3wVSqrNuNYWQ7dJh2/1LpvVA3zm6zYMf+Y11/rp74ANa4Hcp/fXnA9/7Rp 0aC5PfISByl6QMgXifD3ofdSISm3TrUlVNrSkjvu5T4FoR01XArhogk/ZAuLiAUN39aPYonWHGaKq k3WkFblbA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ki0Pe-0007fM-A7; Wed, 25 Nov 2020 19:25:10 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ki0PE-0007VK-8k for linux-arm-kernel@lists.infradead.org; Wed, 25 Nov 2020 19:24:46 +0000 Received: by mail-pf1-x444.google.com with SMTP id x24so3272956pfn.6 for ; Wed, 25 Nov 2020 11:24:43 -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=0r82+/4L79UhQ+PqH/cR19yIxMZLeXEsxYpNXRVD/LY=; b=bboQPOK0CTid/0dUFAwPYMzvMP8fg6kbLTnuIB1c6umXimvCH+V4IZP89CC1bnnzbO alB88CJbOwxrF7QGGq5RHWaF8qG1/uHnxEao6bPYpTtNFFMzHByQjyywXNAnedD/teFL tICAWsi5sqs/vEMMwDuH+Nas4+kv+edc6mqx8= 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=0r82+/4L79UhQ+PqH/cR19yIxMZLeXEsxYpNXRVD/LY=; b=RYhATeBm57NtmOKzZI/N9i6p17FOHGbtqTRqKTkphlUP2Hk7uYuGfwm7CyP2DMox7r b2/y7CzRbTk05cUw0MS+b6PTY6otjjoYFjfswcKoKKrUEiIdpn3/riZGwyCABRnBnPhB t0Nr0BdCIzTEn7Q9E1ajuZh9B8NUYC+ijmJAuDZYUgaTwiWff2P8YwX/5VJI1lhTfXP/ ShB0r8R8eY+95KAE8O4evP3YbdkoUXnasiCuEjDw2L0rPcAvOeJJxHbMOK06ooH7Iuo1 jnXw7bIb0d+pMoSxSe85Oew0qKwzCIWqMLzqvGXqOr+Ab9p0l8VRpqm/AYB6D2PoFmab f4ig== X-Gm-Message-State: AOAM532CLHjb2FVRb4CWw+cq5DUBEiyC8GTjRxMAELAL53rsM5NHph/q rvqpt6Jdul6dUdIK+6CtKjilwA== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201125_142444_422738_96BA8D7A X-CRM114-Status: GOOD ( 12.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Herring , Lorenzo Pieralisi , open list , Florian Fainelli , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , Bjorn Helgaas , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" 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 --- 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 }, {}, };