Merge tag 'media/v5.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-microblaze.git] / arch / arm / mach-ixp4xx / Kconfig

diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
index 165c184..bf14d65 100644 (file)
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
@@ -7,7 +7,7 @@ comment "IXP4xx Platforms"
 
 config MACH_IXP4XX_OF
        bool
-       prompt "Devce Tree IXP4xx boards"
+       prompt "Device Tree IXP4xx boards"
        default y
        select ARM_APPENDED_DTB # Old Redboot bootloaders deployed
        select I2C
@@ -20,7 +20,7 @@ config MACH_IXP4XX_OF
 config MACH_NSLU2
        bool
        prompt "Linksys NSLU2"
-       select FORCE_PCI
+       depends on IXP4XX_PCI_LEGACY
        help
          Say 'Y' here if you want your kernel to support Linksys's
          NSLU2 NAS device. For more information on this platform,
@@ -28,7 +28,7 @@ config MACH_NSLU2
 
 config MACH_AVILA
        bool "Avila"
-       select FORCE_PCI
+       depends on IXP4XX_PCI_LEGACY
        help
          Say 'Y' here if you want your kernel to support the Gateworks
          Avila Network Platform. For more information on this platform,
@@ -44,7 +44,7 @@ config MACH_LOFT
 
 config ARCH_ADI_COYOTE
        bool "Coyote"
-       select FORCE_PCI
+       depends on IXP4XX_PCI_LEGACY
        help
          Say 'Y' here if you want your kernel to support the ADI 
          Engineering Coyote Gateway Reference Platform. For more
@@ -52,7 +52,7 @@ config ARCH_ADI_COYOTE
 
 config MACH_GATEWAY7001
        bool "Gateway 7001"
-       select FORCE_PCI
+       depends on IXP4XX_PCI_LEGACY
        help
          Say 'Y' here if you want your kernel to support Gateway's
          7001 Access Point. For more information on this platform,
@@ -60,7 +60,7 @@ config MACH_GATEWAY7001
 
 config MACH_WG302V2
        bool "Netgear WG302 v2 / WAG302 v2"
-       select FORCE_PCI
+       depends on IXP4XX_PCI_LEGACY
        help
          Say 'Y' here if you want your kernel to support Netgear's
          WG302 v2 or WAG302 v2 Access Points. For more information
@@ -68,6 +68,7 @@ config MACH_WG302V2
 
 config ARCH_IXDP425
        bool "IXDP425"
+       depends on IXP4XX_PCI_LEGACY
        help
          Say 'Y' here if you want your kernel to support Intel's 
          IXDP425 Development Platform (Also known as Richfield).  
@@ -75,6 +76,7 @@ config ARCH_IXDP425
 
 config MACH_IXDPG425
        bool "IXDPG425"
+       depends on IXP4XX_PCI_LEGACY
        help
          Say 'Y' here if you want your kernel to support Intel's
          IXDPG425 Development Platform (Also known as Montajade).
@@ -120,7 +122,7 @@ config ARCH_PRPMC1100
 config MACH_NAS100D
        bool
        prompt "NAS100D"
-       select FORCE_PCI
+       depends on IXP4XX_PCI_LEGACY
        help
          Say 'Y' here if you want your kernel to support Iomega's
          NAS 100d device. For more information on this platform,
@@ -129,7 +131,7 @@ config MACH_NAS100D
 config MACH_DSMG600
        bool
        prompt "D-Link DSM-G600 RevA"
-       select FORCE_PCI
+       depends on IXP4XX_PCI_LEGACY
        help
          Say 'Y' here if you want your kernel to support D-Link's
          DSM-G600 RevA device. For more information on this platform,
@@ -143,7 +145,7 @@ config      ARCH_IXDP4XX
 config MACH_FSG
        bool
        prompt "Freecom FSG-3"
-       select FORCE_PCI
+       depends on IXP4XX_PCI_LEGACY
        help
          Say 'Y' here if you want your kernel to support Freecom's
          FSG-3 device. For more information on this platform,
@@ -152,7 +154,7 @@ config MACH_FSG
 config MACH_ARCOM_VULCAN
        bool
        prompt "Arcom/Eurotech Vulcan"
-       select FORCE_PCI
+       depends on IXP4XX_PCI_LEGACY
        help
          Say 'Y' here if you want your kernel to support Arcom's
          Vulcan board.
@@ -173,7 +175,7 @@ config CPU_IXP43X
 config MACH_GTWX5715
        bool "Gemtek WX5715 (Linksys WRV54G)"
        depends on ARCH_IXP4XX
-       select FORCE_PCI
+       depends on IXP4XX_PCI_LEGACY
        help
                This board is currently inside the Linksys WRV54G Gateways.
 
@@ -196,7 +198,7 @@ config MACH_DEVIXP
 
 config MACH_MICCPT
        bool "Omicron MICCPT"
-       select FORCE_PCI
+       depends on IXP4XX_PCI_LEGACY
        help
          Say 'Y' here if you want your kernel to support the MICCPT
          board from OMICRON electronics GmbH.
@@ -209,9 +211,16 @@ config MACH_MIC256
 
 comment "IXP4xx Options"
 
+config IXP4XX_PCI_LEGACY
+       bool "IXP4xx legacy PCI driver support"
+       depends on PCI
+       help
+         Selects legacy PCI driver.
+         Not recommended for new development.
+
 config IXP4XX_INDIRECT_PCI
        bool "Use indirect PCI memory access"
-       depends on PCI
+       depends on IXP4XX_PCI_LEGACY
        help
           IXP4xx provides two methods of accessing PCI memory space: