Skip to contentSkip to conversation

iProc PCIe driver Kconfig changes

PATCH In review Ray Jui 2 participants 6 messages Mar 25, 2015 – Apr 8, 2015

Subsystems (2)
lore
Share & tools
lore

Ray Jui

author maintainer
#0 lore raw

v2 cover iProc PCIe driver Kconfig changes

This patch series contains two patches to address iProc PCIe Kconfig related issues. The first patch adds more protection to PCIE_IPROC so it cannot be accidentally enabled for non-ARM based platforms. The second patch changes the config name of the iProc PCIe platform driver from PCIE_IPROC_PLTFM to PCIE_IPROC_PLATFORM. The driver name is also changed from pcie-iproc-pltfm.c to pcie-iproc-platform.c so it's consistent with the config name change.

Changes from v1:
- Changes the driver name from pcie-iproc-pltfm.c to pcie-iproc-platform.c

Ray Jui (2):
pci: iproc: fix PCIE_IPROC in Kconfig
pci: iproc: change PCIE_IPROC_PLTFM to PCIE_IPROC_PLATFORM

 drivers/pci/host/Kconfig                           |    4 +++-
 drivers/pci/host/Makefile                          |    2 +-
 .../{pcie-iproc-pltfm.c => pcie-iproc-platform.c}  |    0
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename drivers/pci/host/{pcie-iproc-pltfm.c => pcie-iproc-platform.c} (100%)
Signature · 1 line
1.7.9.5
author maintainer
#1 lore raw

PATCH v2 1/2 pci: iproc: fix PCIE_IPROC in Kconfig

Make PCIE_IPROC depending on both OF and ARM and default to be disabled, so it cannot be accidentally enabled by other platforms

PCIE_IPROC is meant to be enabled by a front-end bus driver. Curenntly it's enabled by PCIE_IPROC_PLTFM driver

---
 drivers/pci/host/Kconfig |    2 ++
 1 file changed, 2 insertions(+)
drivers/pci/host/Kconfig +2 -0
index feccd0d..963b507 100644
@@ -108,6 +108,8 @@ config PCI_VERSATILE
 
 config PCIE_IPROC
 	tristate "Broadcom iProc PCIe controller"
+	depends on OF && ARM
+	default n
 	help
 	  This enables the iProc PCIe core controller support for Broadcom's
 	  iProc family of SoCs. An appropriate bus interface driver also needs
Signature · 1 line
1.7.9.5
author maintainer
#2 lore raw

PATCH v2 2/2 pci: iproc: change PCIE_IPROC_PLTFM to PCIE_IPROC_PLATFORM

In reply to Ray Jui

Change the config name of the iProc PCIe platform bus driver from PCIE_IPROC_PLTFM to PCIE_IPROC_PLATFORM. Also change the driver name from pcie-iproc-pltfm.c to pcie-iproc-platform.c to match the config name

---
 drivers/pci/host/Kconfig                           |    2 +-
 drivers/pci/host/Makefile                          |    2 +-
 .../{pcie-iproc-pltfm.c => pcie-iproc-platform.c}  |    0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename drivers/pci/host/{pcie-iproc-pltfm.c => pcie-iproc-platform.c} (100%)
drivers/pci/host/Kconfig +1 -1
index 963b507..1dfb567 100644
@@ -115,7 +115,7 @@ config PCIE_IPROC
 	  iProc family of SoCs. An appropriate bus interface driver also needs
 	  to be enabled
 
-config PCIE_IPROC_PLTFM
+config PCIE_IPROC_PLATFORM
 	tristate "Broadcom iProc PCIe platform bus driver"
 	depends on ARCH_BCM_IPROC || (ARM && COMPILE_TEST)
 	depends on OF
drivers/pci/host/Makefile +1 -1
index 2e02d20..f733b4e 100644
@@ -14,4 +14,4 @@ obj-$(CONFIG_PCI_XGENE) += pci-xgene.o
 obj-$(CONFIG_PCI_LAYERSCAPE) += pci-layerscape.o
 obj-$(CONFIG_PCI_VERSATILE) += pci-versatile.o
 obj-$(CONFIG_PCIE_IPROC) += pcie-iproc.o
-obj-$(CONFIG_PCIE_IPROC_PLTFM) += pcie-iproc-pltfm.o
+obj-$(CONFIG_PCIE_IPROC_PLATFORM) += pcie-iproc-platform.o
drivers/pci/host/pcie-iproc-platform.c renamed from drivers/pci/host/pcie-iproc-pltfm.c +0 -0
similarity index 100%
rename from drivers/pci/host/pcie-iproc-pltfm.c
rename to drivers/pci/host/pcie-iproc-platform.c
Signature · 1 line
1.7.9.5
author maintainer
#3 lore raw
In reply to Ray Jui

Hi Bjorn,

Do you think the following changes are okay? If so, could you pull them in?

Thanks!

Ray

Quoted 20 lines · Ray Jui

This patch series contains two patches to address iProc PCIe Kconfig related issues. The first patch adds more protection to PCIE_IPROC so it cannot be accidentally enabled for non-ARM based platforms. The second patch changes the config name of the iProc PCIe platform driver from PCIE_IPROC_PLTFM to PCIE_IPROC_PLATFORM. The driver name is also changed from pcie-iproc-pltfm.c to pcie-iproc-platform.c so it's consistent with the config name change.

Changes from v1:
- Changes the driver name from pcie-iproc-pltfm.c to pcie-iproc-platform.c

Ray Jui (2):
pci: iproc: fix PCIE_IPROC in Kconfig
pci: iproc: change PCIE_IPROC_PLTFM to PCIE_IPROC_PLATFORM

 drivers/pci/host/Kconfig                           |    4 +++-
 drivers/pci/host/Makefile                          |    2 +-
 .../{pcie-iproc-pltfm.c => pcie-iproc-platform.c}  |    0
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename drivers/pci/host/{pcie-iproc-pltfm.c => pcie-iproc-platform.c} (100%)
maintainer
#4 lore raw
Quoted 5 lines · Ray Jui

Hi Bjorn,

Do you think the following changes are okay? If so, could you pull them in?

Thanks!

Hi Ray,

I'm a little bit lost because these patches don't apply on top of what I
currently have in my pci/host-iproc branch. I haven't merged that branch
into "next yet, so can you just repost the entire set of all the iproc stuff, based on v4.0-rc1? Then I'll just merge the final stuff with no fixups.

Bjorn

Quoted 21 lines · Ray Jui
Quoted 20 lines

This patch series contains two patches to address iProc PCIe Kconfig related issues. The first patch adds more protection to PCIE_IPROC so it cannot be accidentally enabled for non-ARM based platforms. The second patch changes the config name of the iProc PCIe platform driver from PCIE_IPROC_PLTFM to PCIE_IPROC_PLATFORM. The driver name is also changed from pcie-iproc-pltfm.c to pcie-iproc-platform.c so it's consistent with the config name change.

Changes from v1:
- Changes the driver name from pcie-iproc-pltfm.c to pcie-iproc-platform.c

Ray Jui (2):
pci: iproc: fix PCIE_IPROC in Kconfig
pci: iproc: change PCIE_IPROC_PLTFM to PCIE_IPROC_PLATFORM

 drivers/pci/host/Kconfig                           |    4 +++-
 drivers/pci/host/Makefile                          |    2 +-
 .../{pcie-iproc-pltfm.c => pcie-iproc-platform.c}  |    0
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename drivers/pci/host/{pcie-iproc-pltfm.c => pcie-iproc-platform.c} (100%)
author maintainer
#5 lore raw

Hi Bjorn,

Okay I'll send out a new patch set based on v4.0-rc1 today. The new patch set will be with subject:

[PATCH v8 0/4] pci: iproc: Add Broadcom iProc PCIe support

Thanks,

Ray

Quoted 38 lines · Bjorn Helgaas
Quoted 5 lines · Ray Jui

Hi Bjorn,

Do you think the following changes are okay? If so, could you pull them in?

Thanks!

Hi Ray,

I'm a little bit lost because these patches don't apply on top of what I
currently have in my pci/host-iproc branch. I haven't merged that branch
into "next yet, so can you just repost the entire set of all the iproc stuff, based on v4.0-rc1? Then I'll just merge the final stuff with no fixups.

Bjorn

Quoted 21 lines · Ray Jui
Quoted 20 lines

This patch series contains two patches to address iProc PCIe Kconfig related issues. The first patch adds more protection to PCIE_IPROC so it cannot be accidentally enabled for non-ARM based platforms. The second patch changes the config name of the iProc PCIe platform driver from PCIE_IPROC_PLTFM to PCIE_IPROC_PLATFORM. The driver name is also changed from pcie-iproc-pltfm.c to pcie-iproc-platform.c so it's consistent with the config name change.

Changes from v1:
- Changes the driver name from pcie-iproc-pltfm.c to pcie-iproc-platform.c

Ray Jui (2):
pci: iproc: fix PCIE_IPROC in Kconfig
pci: iproc: change PCIE_IPROC_PLTFM to PCIE_IPROC_PLATFORM

 drivers/pci/host/Kconfig                           |    4 +++-
 drivers/pci/host/Makefile                          |    2 +-
 .../{pcie-iproc-pltfm.c => pcie-iproc-platform.c}  |    0
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename drivers/pci/host/{pcie-iproc-pltfm.c => pcie-iproc-platform.c} (100%)