From patchwork Tue Mar 29 03:43:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 602724 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qYxT24CVtz9s6r for ; Tue, 29 Mar 2016 14:43:34 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=verge.net.au header.i=@verge.net.au header.b=lU9uxTFZ; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755700AbcC2Dnc (ORCPT ); Mon, 28 Mar 2016 23:43:32 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:56076 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755626AbcC2Dnb (ORCPT ); Mon, 28 Mar 2016 23:43:31 -0400 Received: from reginn.isobedori.kobe.vergenet.net (p2210-ipbfp1103kobeminato.hyogo.ocn.ne.jp [122.23.9.210]) by kirsty.vergenet.net (Postfix) with ESMTPA id DCC1C25B7D5; Tue, 29 Mar 2016 14:43:27 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1459223008; bh=ijheErKBGvpKZtjM03dKHNmuMo8uTR84xUYib0h8vEc=; h=From:To:Cc:Subject:Date:From; b=lU9uxTFZoprrPkPY1UgVXAOXJAsNwQmvVl+9cmnCJ+5AtpByzplbKhyXwqfriwTPC x9RRNptAqJXnTGFEJZ8xUHQmWEH/n0k7ZEpLo+6CeSEJNipe7yEmm/boWooHq+MX5w Hw5KLtBKt87Qu8pI2ALE4lth8k9b0s1oJi8GTz6k= Received: by reginn.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id 575D39405CF; Tue, 29 Mar 2016 12:43:28 +0900 (JST) From: Simon Horman To: Bjorn Helgaas Cc: Phil Edworthy , Magnus Damm , linux-pci@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Simon Horman Subject: [PATCH] PCI: rcar-pcie: Remove Gen2 designation from Kconfig Date: Tue, 29 Mar 2016 12:43:18 +0900 Message-Id: <1459222998-2855-1-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.1.4 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org It appears that Gen2 is a misnomer for the R-Car PCIE driver which also supports Gen 1 and Gen 3 SoCs. Accordingly, drop Gen 2 from the help text and Kconfig symbol. Reported-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- Bjorn, if this patch is acceptable I would like to request that we co-ordinate things so that I can queue-up corresponding updates for arm and arm64 defconfigs in the same release. From my point of view v4.7 would make sense. --- drivers/pci/host/Kconfig | 4 ++-- drivers/pci/host/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig index 7a0780d56d2d..9109c6c5298c 100644 --- a/drivers/pci/host/Kconfig +++ b/drivers/pci/host/Kconfig @@ -69,11 +69,11 @@ config PCI_RCAR_GEN2 There are 3 internal PCI controllers available with a single built-in EHCI/OHCI host controller present on each one. -config PCI_RCAR_GEN2_PCIE +config PCI_RCAR_PCIE bool "Renesas R-Car PCIe controller" depends on ARCH_RENESAS || (ARM && COMPILE_TEST) help - Say Y here if you want PCIe controller support on R-Car Gen2 SoCs. + Say Y here if you want PCIe controller support on R-Car SoCs. config PCI_HOST_COMMON bool diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile index d85b5faf9bbc..042cf32c14ca 100644 --- a/drivers/pci/host/Makefile +++ b/drivers/pci/host/Makefile @@ -7,7 +7,7 @@ obj-$(CONFIG_PCI_HYPERV) += pci-hyperv.o obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o obj-$(CONFIG_PCI_TEGRA) += pci-tegra.o obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o -obj-$(CONFIG_PCI_RCAR_GEN2_PCIE) += pcie-rcar.o +obj-$(CONFIG_PCI_RCAR_PCIE) += pcie-rcar.o obj-$(CONFIG_PCI_HOST_COMMON) += pci-host-common.o obj-$(CONFIG_PCI_HOST_GENERIC) += pci-host-generic.o obj-$(CONFIG_PCIE_SPEAR13XX) += pcie-spear13xx.o