From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 B2664C433E4 for ; Fri, 26 Mar 2021 19:20:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ACF4661A32 for ; Fri, 26 Mar 2021 19:20:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230308AbhCZTT6 (ORCPT ); Fri, 26 Mar 2021 15:19:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230230AbhCZTTX (ORCPT ); Fri, 26 Mar 2021 15:19:23 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6F4EC0613AA; Fri, 26 Mar 2021 12:19:22 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id bf3so7524732edb.6; Fri, 26 Mar 2021 12:19:22 -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=Ml2lWLGpOaR2MEq6nedJpA3igERFdLP4LEElGLKkZws=; b=cK8RSpvdKDjYYJfpCu2ltYA9ueBdewUw857Bv0ho2ruAvtG17DBnqm4SdJYlCHuCqS pkRvF2F1vJQ7F0/d6AimMoKDaJaRT5gBe8xNWjh6iLHOA/pnfenJd0EPm4yovbCm8W5s wWMUIG9GBhD+fUB5Xi4ZiMPoZs/4PrriOTHmkMhhGx+IqpnWgvpIFQZnvCKaS1zogxP8 H8XLh27ZWl+LWdNxIwffLSYc1guHW7McbVlaE53rIvGJSnUTdRy+fkZSo5gzWx0PsKzE fscT6tG8dJ5N2Eh+moldHJapqj4aNrFsyDltJEy8TsfY5KfB2WdYiETICqEuAYy2ML6d zu5g== 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=Ml2lWLGpOaR2MEq6nedJpA3igERFdLP4LEElGLKkZws=; b=LambhKsnV1InDIt7uRtvGpDRgWvfPaCqTrqUHcp3YwhC7nOLM63bzlEiJ5a8zOG1X1 Jep9w0hEVI+bbkjbGvbpyxyn6rWPrGTh6TB9RvHnRCTL+nIQnZvxZXRKATh2Z8htO2+W 7dBB3NXCTg/8WXFlH1YwAFhD0OB4Hegg1DyaqlqY/MziUTh40PLJmlX2Cv32MSouWL7g mHASx97ehPekJ2zEjEF+MDml/fWdycsMvEUaFdHjc+LjKvNkXWb/VC/nWWhvHGOZZZEc Q94iOGsUNIZuHBTq+71OSD0ptDemOVpuwNlsYJJNd/MBQutGL3hkRP8fOiFB2WChB2pE nEWg== X-Gm-Message-State: AOAM533Qryc2N3GKyAG5YdXp7iPCnvj/U/Cg89o7HGFcNTwILgVpWmoW 0YCnSeDY8HHpWS+8+baqBCn724WzuXg= X-Google-Smtp-Source: ABdhPJwzVR1KR1vKMODpCAinj0MQcXxrRz7RUrG5Wj0zhIHZbOzKFSTuIKUO2BCFD8yUJ2HdtOqo2A== X-Received: by 2002:a05:6402:1613:: with SMTP id f19mr17182438edv.222.1616786361397; Fri, 26 Mar 2021 12:19:21 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id c19sm4739373edu.20.2021.03.26.12.19.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Mar 2021 12:19:20 -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 v3 4/6] PCI: brcmstb: Give 7216 SOCs their own config type Date: Fri, 26 Mar 2021 15:19:02 -0400 Message-Id: <20210326191906.43567-5-jim2101024@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210326191906.43567-1-jim2101024@gmail.com> References: <20210326191906.43567-1-jim2101024@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 89745bb6ada6..9c8b922a9c19 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -260,6 +260,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; @@ -1336,7 +1343,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 }, {}, }; -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 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 39F2CC433C1 for ; Fri, 26 Mar 2021 19:21:38 +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 C2D4661945 for ; Fri, 26 Mar 2021 19:21:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C2D4661945 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=jwnf2QDfypprqjkaAf8FtjmatFg8Abd3UykzUM9JIWo=; b=qQH1zNF2AttiFTGUmnyBLN7uaW sh7l97ICNIwj4PQqSJvVj0uLGciiwJLp+V2sOGcEDpfNiWIS6TRrQtx5trGauqKCtvRyPsEnYqy1Q kaKSyIsGcRRgaiqOgG3u+3hq0EMgUC8xqPq8MZFp5f7E/C/K8s3QPJUmK/osPKLSfhzM22IAanG9m Pe00xWoK9a14YGhv7EE9SHfifSV0XTI+zY0JR3/6+qPz6fiF3Ay4IiEBv5ifpoGAKFIcurWu0KiBh TB2Wn42TmDS6iHW8rbsoWWBDzAQrUuI2tYsxpJeyfLliJpfIGEwOGMUDh0HS9h96Icu8PrVCi4V18 ciTQvsCA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lPrzr-004CXP-3c; Fri, 26 Mar 2021 19:19:51 +0000 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lPrzO-004CRU-3r; Fri, 26 Mar 2021 19:19:23 +0000 Received: by mail-ed1-x531.google.com with SMTP id j3so7487987edp.11; Fri, 26 Mar 2021 12:19:21 -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=Ml2lWLGpOaR2MEq6nedJpA3igERFdLP4LEElGLKkZws=; b=cK8RSpvdKDjYYJfpCu2ltYA9ueBdewUw857Bv0ho2ruAvtG17DBnqm4SdJYlCHuCqS pkRvF2F1vJQ7F0/d6AimMoKDaJaRT5gBe8xNWjh6iLHOA/pnfenJd0EPm4yovbCm8W5s wWMUIG9GBhD+fUB5Xi4ZiMPoZs/4PrriOTHmkMhhGx+IqpnWgvpIFQZnvCKaS1zogxP8 H8XLh27ZWl+LWdNxIwffLSYc1guHW7McbVlaE53rIvGJSnUTdRy+fkZSo5gzWx0PsKzE fscT6tG8dJ5N2Eh+moldHJapqj4aNrFsyDltJEy8TsfY5KfB2WdYiETICqEuAYy2ML6d zu5g== 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=Ml2lWLGpOaR2MEq6nedJpA3igERFdLP4LEElGLKkZws=; b=NFiJo3DxSYxJ9mPQMuyTQwTjZ+uXdip4UsKXNTHg+mlowX55e/f/0ddCfwAN5FAJoa 8YLY6kGVl1dMhq1k9DPG/LD50otBQjB0UjzbC8QGmfk54zrqQOHhvU2YzzmHmSPti4kh +Zjr97hbGIU5LqkKG/xwPQm4htCaZbRCsGjHSHz1yyMjRW92XQwizcB+mCM7ZpX8VJ3j j7FKPoT4pzDkWArRD46bGNlmxWyBprxcSFSZph0lrce/sdKqBgOgiUscphvfVl5U/3y6 5f9IRNdM8o3Tl+RiRjGvzYvlUUrcBcMQof1iUTDa/HEi80wWJmvfaCA2Pu6Rim9POKOP o4Mw== X-Gm-Message-State: AOAM532b57vHAADKilPg+5io1A3t3Sy8/Q4IIzZ7BqSQPdGMv5m+x0Qd qY5+TpsmMCCF+uTYl5mCqxI= X-Google-Smtp-Source: ABdhPJwzVR1KR1vKMODpCAinj0MQcXxrRz7RUrG5Wj0zhIHZbOzKFSTuIKUO2BCFD8yUJ2HdtOqo2A== X-Received: by 2002:a05:6402:1613:: with SMTP id f19mr17182438edv.222.1616786361397; Fri, 26 Mar 2021 12:19:21 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id c19sm4739373edu.20.2021.03.26.12.19.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Mar 2021 12:19:20 -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 v3 4/6] PCI: brcmstb: Give 7216 SOCs their own config type Date: Fri, 26 Mar 2021 15:19:02 -0400 Message-Id: <20210326191906.43567-5-jim2101024@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210326191906.43567-1-jim2101024@gmail.com> References: <20210326191906.43567-1-jim2101024@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210326_191922_226215_FFCDC12A X-CRM114-Status: GOOD ( 11.48 ) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 89745bb6ada6..9c8b922a9c19 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -260,6 +260,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; @@ -1336,7 +1343,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 }, {}, }; -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel