From patchwork Fri Aug 21 03:54:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 248063 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:d4c:0:0:0:0 with SMTP id h12csp5034ilj; Thu, 20 Aug 2020 20:55:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMYf3wgfLptqpjMC0E0vN/hKU2A7MX9wD2cg81l6JfqlR9p6LVSAigoPX8VghiACpFf8di X-Received: by 2002:a50:f10c:: with SMTP id w12mr1015293edl.202.1597982153822; Thu, 20 Aug 2020 20:55:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597982153; cv=none; d=google.com; s=arc-20160816; b=CQQFy+EIU9MgagxCIIrzzb2TBYF11TfhxD/Olmb1bn6WooJK3/LVtAgqJqh3wpD6OE iQ6ofkH03iNU1l6GaYejS9cDhdgTYpXrPp3HJX+yYuvP2Z9DWLLFpmjeh8Lv1o/6tnv8 5FUzEbC38VC6V3tDMlH1uD8GauNvTmlyYonkgKL/UPCL5jKRnS/mDAiu2OXulgIuDWsv LsCJRe3UcqhWFftSCYXWGLY61zdO2XLw7Eg8Wx/BxfW9LZ+rjImjS+Fg03GgzRYVdF19 cax180LZTpchZR63mFeayNQcRG3wL7kRXdkBkkGtPLPC+PzFZaf5DuwpEV6ao3eyDs2N vfUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=kumZHZjUFIvX3SHWpXpEUET8g4KV80WJmK3nUIgHIRs=; b=QNxKjEtPZ3Lkz3uCZ4UyKB7Sp0mKnArc3KKKwmHjv4yeMVnjjycSUs8ycXs+BUWLJV a/fHFLtAKK9RLqvdiw6ZkrU4c8p1LLdE0YVobJ655llUrHb9LaWGpzTmwzGxOmXw2gRu Vbe+dC6a4hGz1fJ0vJ6UQq7C1Di/1V2v4qvhgonuleC0lCRDOxO3aSKf8eTkScNBn8HS kiTcTEonqC6oXVIvz8q6Bg854S+8Vg5WFqWg85gFryGsw4P3now5TnF6dEe6okyFKaws K9bvps7etuvpODCBYDd46vswLTQFf600bcP/3NevCxumEwYjqwDcfR825JWlV/ahe9vN Qbhw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-omap-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g19si12790ejf.115.2020.08.20.20.55.53; Thu, 20 Aug 2020 20:55:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-omap-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-omap-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727969AbgHUDzw (ORCPT + 4 others); Thu, 20 Aug 2020 23:55:52 -0400 Received: from mail-io1-f65.google.com ([209.85.166.65]:34032 "EHLO mail-io1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727977AbgHUDzr (ORCPT ); Thu, 20 Aug 2020 23:55:47 -0400 Received: by mail-io1-f65.google.com with SMTP id q75so487549iod.1; Thu, 20 Aug 2020 20:55:46 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=kumZHZjUFIvX3SHWpXpEUET8g4KV80WJmK3nUIgHIRs=; b=HxDmadhYeFajdPlFRXn2/qt/K7VIXZGAiT4WNvrpnvZ8Trt++qgoQ2153ahtIu79dQ bYWIzy6qNEJxCjyKg2nwut1EFa/rapIv9ZMUsVsFl7CkChWwhdWsPo5N1elDGWq7QiiX LF7xokQUQF0HN+LzO9yvLZxTG3W4RkVVe2b26NI/TT7GntlWx1WBZDPlqs+ztzKtvrMQ IW8D3oAY2wAMKsV+NsdHCMhDpZdt8ChlayGKOqlA8qawxnRgTEH9W/i9pK62zuAorEZ0 6XKY5Nu1m8nptGSwAZfhgSHxVjUkDJFORMTW63hxTUVDMk7kXXof4qWogjVEcGVuWiO1 uA1Q== X-Gm-Message-State: AOAM531k33gg70FRzq3ebbjqNOhe3yXebba+URIGpOPoyS4UDmHLESV5 bGFh2kFYDxyceV08Bj0v0w== X-Received: by 2002:a05:6638:22c7:: with SMTP id j7mr840801jat.77.1597982145790; Thu, 20 Aug 2020 20:55:45 -0700 (PDT) Received: from xps15.herring.priv ([64.188.179.249]) by smtp.googlemail.com with ESMTPSA id 79sm413923ilc.9.2020.08.20.20.55.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2020 20:55:45 -0700 (PDT) From: Rob Herring To: Bjorn Helgaas , Lorenzo Pieralisi Cc: linux-pci@vger.kernel.org, Andy Gross , Binghui Wang , Bjorn Andersson , Dilip Kota , Fabio Estevam , Gustavo Pimentel , Jerome Brunet , Jesper Nilsson , Jingoo Han , Jonathan Chocron , Jonathan Hunter , Kevin Hilman , Kishon Vijay Abraham I , Krzysztof Kozlowski , Kukjin Kim , Kunihiko Hayashi , Lucas Stach , Martin Blumenstingl , Masahiro Yamada , Murali Karicheri , Neil Armstrong , NXP Linux Team , Pengutronix Kernel Team , Pratyush Anand , Richard Zhu , Sascha Hauer , Shawn Guo , Shawn Guo , Stanimir Varbanov , Thierry Reding , Xiaowei Song , Yue Wang , Marc Zyngier , linux-amlogic@lists.infradead.org, linux-arm-kernel@axis.com, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-omap@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH v2 20/40] PCI: dwc/keystone: Drop duplicated 'num-viewport' Date: Thu, 20 Aug 2020 21:54:00 -0600 Message-Id: <20200821035420.380495-21-robh@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200821035420.380495-1-robh@kernel.org> References: <20200821035420.380495-1-robh@kernel.org> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The DWC core driver already parses and stores the 'num-viewport' DT property, so there is no need for the Keystone driver to store it. Cc: Murali Karicheri Cc: Lorenzo Pieralisi Cc: Bjorn Helgaas Signed-off-by: Rob Herring --- drivers/pci/controller/dwc/pci-keystone.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) -- 2.25.1 diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c index 983069a4a561..0fe792f6c253 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -123,7 +123,6 @@ struct keystone_pcie { int msi_host_irq; int num_lanes; - u32 num_viewport; struct phy **phy; struct device_link **link; struct device_node *msi_intc_np; @@ -397,9 +396,9 @@ static void ks_pcie_clear_dbi_mode(struct keystone_pcie *ks_pcie) static void ks_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie) { u32 val; - u32 num_viewport = ks_pcie->num_viewport; struct dw_pcie *pci = ks_pcie->pci; struct pcie_port *pp = &pci->pp; + u32 num_viewport = pci->num_viewport; u64 start, end; struct resource *mem; int i; @@ -1199,7 +1198,6 @@ static int __init ks_pcie_probe(struct platform_device *pdev) struct resource *res; unsigned int version; void __iomem *base; - u32 num_viewport; struct phy **phy; int link_speed; u32 num_lanes; @@ -1349,12 +1347,6 @@ static int __init ks_pcie_probe(struct platform_device *pdev) goto err_get_sync; } - ret = of_property_read_u32(np, "num-viewport", &num_viewport); - if (ret < 0) { - dev_err(dev, "unable to read *num-viewport* property\n"); - goto err_get_sync; - } - /* * "Power Sequencing and Reset Signal Timings" table in * PCI EXPRESS CARD ELECTROMECHANICAL SPECIFICATION, REV. 2.0 @@ -1368,7 +1360,6 @@ static int __init ks_pcie_probe(struct platform_device *pdev) gpiod_set_value_cansleep(gpiod, 1); } - ks_pcie->num_viewport = num_viewport; pci->pp.ops = host_ops; ret = ks_pcie_add_pcie_port(ks_pcie, pdev); if (ret < 0)