From patchwork Mon Nov 30 21:11:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 11941315 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.2 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 5D2CCC64E7B for ; Mon, 30 Nov 2020 21:14:32 +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 E9DE2206A5 for ; Mon, 30 Nov 2020 21:14:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Ab8/pUxQ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="SY+7XNLb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E9DE2206A5 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=0gYOelEvNdpUOWJ8xhk2WoDMih3q54MEID3sOJwIQ8o=; b=Ab8/pUxQZq/03Uv8ZHzzzfn7M 06/vtS/dvNh6aXlKDtvtg/RGfOLX8A2+xAfRzXIJKhU5p+p1ZvyiB75x4s9hJ7/0URdX1+ATNI59B csBiGrDRhDRImuSNF4ozG3AuDqVfFdCCVeC6xh8z3/tHBdBk02P2AlWhHi3c2mM1oulKIWyjuxHG1 DyGPD/BcpP4S/OtmbvEWTKxnOU6S4kfubgSVLWO2rZZaCsiJ4vAV9CdguzHfUTbPoiYvBP0PbwuSq 4LpwYpiBr4gxp1oQutJ6dXGhckD1rhee/Hmw3kXwLahmcZCWtVk3rosoTmJk6Zd3d5S4ozEMU7b6e 4Lr3xGruQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kjqTa-0003FY-45; Mon, 30 Nov 2020 21:12:50 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kjqSu-00032o-Qx for linux-arm-kernel@lists.infradead.org; Mon, 30 Nov 2020 21:12:09 +0000 Received: by mail-pf1-x441.google.com with SMTP id s21so11214396pfu.13 for ; Mon, 30 Nov 2020 13:12:08 -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=kYEfXBmWaU4ioHHox/z1UnFyfiFOQMIZPl/cH4mtoOI=; b=SY+7XNLbuuuDzkBfMb/rS0Xkq3hjYmI7ZIr+qmtjVO7ym12qfPFTJi65sG0o0+S91g 2BWHYCLLsmJsKfmkrtbTmhS01M6XFsZ8hwu6Er5+EQtqLlAFj41RX6TKvX8iXubzBnrN 3PkpAU5ZFZbIQr4t8QUMDDexmV5iTuXUo/ryg= 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=kYEfXBmWaU4ioHHox/z1UnFyfiFOQMIZPl/cH4mtoOI=; b=FbgWf0bEMtRl1feXsKbYD0WeIhqtjLEFwWcFFq6B2AaDkLAtjdNBpwqRN9njuAc7Cy g7Z63KVZcFlYwEHKXsMo6DQxiBfcLhy3yziXBq11C+XDBsY+WskzXsysQ4+7pDoibY2t zaFVERn5XKJRG87xBqzf3JSF0i7ZIUjyU/ikqSOIFPdFkgOyKNBYTRwfW83/RQV6y2hJ b+V+M1w89VsQJxcLOL8pOZpAFQajHUV3Ss6PQxD0DbTSZ1WfFI17J2z8wOgO1HrT+fRr /WAzUEYJbPHHbfXsTRUjoY4Qpb1mooeA66jYNNk9+DgUiTFawMWQomW4j4wd5rJ7bE5j 2qLw== X-Gm-Message-State: AOAM533IucvbpnXjPxKOUYd2TFD+KPkkTtYU5etKK3DqpN/zgl5SrxHC BQny/T6eg6m5ZHy9AFQFrqW2oQ== X-Google-Smtp-Source: ABdhPJwEtL+25XAnoY7taX1u8+WwMDXA28Roz3MngZVR6qloQjm2YdLePCYz0EAvVgPTRkYE7t0eOg== X-Received: by 2002:a65:679a:: with SMTP id e26mr19025326pgr.394.1606770726690; Mon, 30 Nov 2020 13:12:06 -0800 (PST) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id m7sm18320441pfh.72.2020.11.30.13.12.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Nov 2020 13:12:06 -0800 (PST) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , broonie@kernel.org, bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com Subject: [PATCH v2 4/6] PCI: brcmstb: Give 7216 SOCs their own config type Date: Mon, 30 Nov 2020 16:11:41 -0500 Message-Id: <20201130211145.3012-5-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201130211145.3012-1-james.quinlan@broadcom.com> References: <20201130211145.3012-1-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201130_161208_911110_A090A258 X-CRM114-Status: GOOD ( 11.32 ) 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 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 cbdb315d4b2f..989e4231d136 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -256,6 +256,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; @@ -1276,7 +1283,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 }, {}, };