[PATCH 1/2] PCI: tegra: Do not build on 64-bit ARM

[PATCH 1/2] PCI: tegra: Do not build on 64-bit ARM

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

32-bit and 64-bit ARM use very different infrastructure to register a
PCI host bridge. The Tegra PCIe host controller driver currently only
supports the 32-bit ARM infrastructure, so prevent it from being built
on 64-bit ARM where it will break.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/pci/host/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index 3dc25fad490c..9c56137e5e5e 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -32,7 +32,7 @@ config PCI_IMX6
 
 config PCI_TEGRA
 	bool "NVIDIA Tegra PCIe controller"
-	depends on ARCH_TEGRA
+	depends on ARCH_TEGRA && !ARM64
 
 config PCI_RCAR_GEN2
 	bool "Renesas R-Car Gen2 Internal PCI controller"
-- 
2.1.3

[PATCH 2/2] PCI: tegra: Add Kconfig help text

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

Add a standard help text to the Kconfig entry for the Tegra PCIe host
controller driver.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/pci/host/Kconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index 9c56137e5e5e..9dbb1fc68bc9 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -33,6 +33,9 @@ config PCI_IMX6
 config PCI_TEGRA
 	bool "NVIDIA Tegra PCIe controller"
 	depends on ARCH_TEGRA && !ARM64
+	help
+	  Say Y here if you want support for the PCIe host controller found
+	  on NVIDIA Tegra SoCs.
 
 config PCI_RCAR_GEN2
 	bool "Renesas R-Car Gen2 Internal PCI controller"
-- 
2.1.3

Re: [PATCH 1/2] PCI: tegra: Do not build on 64-bit ARM

[Bjorn Helgaas]

On Wed, Nov 12, 2014 at 02:53:37PM +0100, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> 32-bit and 64-bit ARM use very different infrastructure to register a
> PCI host bridge. The Tegra PCIe host controller driver currently only
> supports the 32-bit ARM infrastructure, so prevent it from being built
> on 64-bit ARM where it will break.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>

I applied both of these to pci/host-tegra for v3.19, thanks!

> ---
>  drivers/pci/host/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
> index 3dc25fad490c..9c56137e5e5e 100644
> --- a/drivers/pci/host/Kconfig
> +++ b/drivers/pci/host/Kconfig
> @@ -32,7 +32,7 @@ config PCI_IMX6
>  
>  config PCI_TEGRA
>  	bool "NVIDIA Tegra PCIe controller"
> -	depends on ARCH_TEGRA
> +	depends on ARCH_TEGRA && !ARM64
>  
>  config PCI_RCAR_GEN2
>  	bool "Renesas R-Car Gen2 Internal PCI controller"
> -- 
> 2.1.3
>