From patchwork Thu Apr 1 21:21:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 12179597 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 945A7C433ED for ; Thu, 1 Apr 2021 21:31:20 +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 070EC610FB for ; Thu, 1 Apr 2021 21:31:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 070EC610FB 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=Jr3ljCn/5i4Q7iKKjrNTpusWWUNAnyKYUAsu+jqkyxI=; b=fE/NWgX04Zho/VCChr/+5sRS+7 psLsiZmUz161+ad5mFK7tXIoLqS7LaZTj8F/xra7WY0pY1gCcAzzLjN61fWyAe+sHqDqVOX3SNVXh zPOdbWNEYJ/KWbXJf9WsoHmjwPcdjKrFDZS7tXm/c8r/Dm3J2+bnomTObgFBEPi2IWPrz7acSj2gv ai5lc14CjrS8tR+AI9PnNqsCNJ4GmVL5d9Ih3Irv37/Oa4WA0RKNUsR08n7NroLBqTWVrsVSs6DhZ RxooPZkFtlP3lBgYi3R29Ne+EYhM/WEtZ5iApqJFhH1j+GkUPpoY7kZH7KJg1USqul+BpcHESws4x 10UJsk/g==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lS4s0-00B3mz-WF; Thu, 01 Apr 2021 21:28:53 +0000 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lS4lS-00B35V-9u; Thu, 01 Apr 2021 21:22:51 +0000 Received: by mail-pg1-x52e.google.com with SMTP id l76so2374602pga.6; Thu, 01 Apr 2021 14:22:06 -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=kSGfeqiI16h1xdk+kDjbKZZ2Zy2FnQRhOpc1dRiQ3Hc=; b=TyACpHVWPpmn4rVcyPdd2oD+YnXPljjxNqIQMypgJj1OzC2p1DEKTcULKOs8oO7d5j 3Zl7zcTZwdQkdVDKuhV0OqsolRYB983JEXRhlyaWPIP9e1uW81Vl8yv9nHO6SBiDDrGp 8fjhQ0G6TED/SftetqoBCQ/Wnt9WuC/bVamjwvpKUVpyWMbD56Ue6IBYLX1tRVnyhmCU kegFFPShHoTCNIXHeFkIjyyQYLeP2dx02DYvA7iYJr/NC1q5qV7c1IPPbVsklEjZTEb9 V9x08uQsyJWH/ZUPtd25IeMALZ8/GHoT+08WEfqu+isMVCZN0vzNRyGfug4LonsXvZJv 2rUA== 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=kSGfeqiI16h1xdk+kDjbKZZ2Zy2FnQRhOpc1dRiQ3Hc=; b=PMbdvIhDElWApCuxsELnH6jF9N0QPnxvs8wtf5hnKjXrkTt8HBLdWJHW2RmF4QTvQF eRDkg/z0Nl0q2rgVEhra5B+VxG+Vj1fuD6pJHiccOLnD1QpU1EWT62yMkuh5DidYn75A Yw5bPMWSUmEDn0zFu3xt0BA0mawWdY6l9P6KpDOpab335EMG7lhpYSHorMrOcyYKLAA4 RDseAVlcvhepTO1LCfChFJXu+3TpYyDW0uPjOBlG1f+8zu9u46JwzY7WjCJO1XxdklRn vx3dxRzIe5StBh8nu2N23jnY6GfXhx8D+Lqdbdtvko4Vuing8FQ+R9kdQzqapy6G0RPG Svaw== X-Gm-Message-State: AOAM530IRmNMkSMz2eCL3dBWVQpGnbTBbcqheghKUwBFcDoGTF39MQoy h6jbaIxjmueLtB9NDK2yiys= X-Google-Smtp-Source: ABdhPJzZR0MBN1IIOC3WlT4nfpVaoCry/gQUJ5AcabN0UPPKheKks8+k5P9sS4p57f3qyjkkVffmVA== X-Received: by 2002:aa7:8d4c:0:b029:21c:104b:f6cb with SMTP id s12-20020aa78d4c0000b029021c104bf6cbmr9063700pfe.26.1617312124937; Thu, 01 Apr 2021 14:22:04 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id q5sm5926707pfk.219.2021.04.01.14.22.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 14:22:04 -0700 (PDT) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Rob Herring , Mark Brown , bcm-kernel-feedback-list@broadcom.com, jim2101024@gmail.com, james.quinlan@broadcom.com Cc: Lorenzo Pieralisi , 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 v4 5/6] PCI: brcmstb: Give 7216 SOCs their own config type Date: Thu, 1 Apr 2021 17:21:45 -0400 Message-Id: <20210401212148.47033-6-jim2101024@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210401212148.47033-1-jim2101024@gmail.com> References: <20210401212148.47033-1-jim2101024@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210401_222249_682451_A8A2732C X-CRM114-Status: GOOD ( 11.78 ) 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 4c79aff66de7..44128df33785 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -265,6 +265,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; @@ -1325,7 +1332,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 }, {}, };