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: 11941327 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com 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=-20.1 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 8030DC83016 for ; Mon, 30 Nov 2020 21:13:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 340B32073C for ; Mon, 30 Nov 2020 21:13:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="hhRdaHqz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388416AbgK3VNT (ORCPT ); Mon, 30 Nov 2020 16:13:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388397AbgK3VNS (ORCPT ); Mon, 30 Nov 2020 16:13:18 -0500 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 960F1C061A4B for ; Mon, 30 Nov 2020 13:12:07 -0800 (PST) Received: by mail-pf1-x444.google.com with SMTP id 131so11228135pfb.9 for ; Mon, 30 Nov 2020 13:12:07 -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=vzT4m+wYThiQ5saRozePPhBrK2E2X6l79/d9okc+UEU=; b=hhRdaHqz9fB9guNjcms5H0tqYh7X/U/fzKbbgUCEuWffNn8/nIvsjy1oyEHIxkxgA+ GvsJT7jDVvbPCZ3FbP9abiEOTrnLlekApj0zsPeEwoU11M9t9FIhpJcisnYQo2bNzCK1 aQQcIAOgPBugm4goeDQM93NwkMR0O570BGbIU= 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=vzT4m+wYThiQ5saRozePPhBrK2E2X6l79/d9okc+UEU=; b=dKWWvB3L8PvM9eNYcXi9E6Eb+mOg4BhHrxqMosgOYEi15PGQJVy6svJC/uibJDIQBg 18RkLoY1pB/fjK1BsMCUz0OCZwV7H1NzT8wy7eqtg1ri8HkdnzLxN9UESUDlM621YpJx D+KG6XxZGNUUBz+8snbJKtUAP+i5J6c3SExwjNa/fHykyBQcv/kSOhcaBrvS2wdb+YCx 3uQdeBvH6Cn1H/KPSbYeP4tNTl88hAM8pIw9ihY+YN6CvE1PjQTW7Xm0qVDT/mF96W/t lZcT0lamv/JfuK+hePj0edRsHrkwkIJCfnCQT8Ejf58OIYmzbCj4eeCmlsjhoYWIwlyx Eeig== X-Gm-Message-State: AOAM530zKlvP9SjIhOU9ORNo2kQxvBTvqQtapMVbfL8Qs4CszwZ3nkvu sUMY+bOuGtNi0CA0oH/2LUEMzREvuW06TlIMObBiBDmyUDo+HLU3o4rLEiVUepGPh9ODU1Q5Mao 7HU//qCo1o//h7MBEN6npx/Vnr5LPOC4qCRytcM597rq/FAj4MBgF4HV7JscJi5hh5Uma42deR2 J1cX3e 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 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 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> 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 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 }, {}, };