powerpc: Add GE FPGA config option

This patch adds the GE_FPGA configuration option. This is being carried
out as ground work to allow the PIC and GPIO drivers to be move from the
powerpc 86xx platform directory to more general locations to allow them to
be used on non-86xx boards and to reduce churn when further boards using
these drivers are added.

Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 8d6599d54ea6caadf8476cc42ba56734b1edfbcc..abe2c4fff8116a8c06503a4ec6d8722d6235d3b8 100644 (file)
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -39,6 +39,7 @@ config GEF_PPC9A
        select MMIO_NVRAM
        select GENERIC_GPIO
        select ARCH_REQUIRE_GPIOLIB
+       select GE_FPGA
        help
          This option enables support for the GE PPC9A.
 
@@ -48,6 +49,7 @@ config GEF_SBC310
        select MMIO_NVRAM
        select GENERIC_GPIO
        select ARCH_REQUIRE_GPIOLIB
+       select GE_FPGA
        help
          This option enables support for the GE SBC310.
 
@@ -57,10 +59,15 @@ config GEF_SBC610
        select MMIO_NVRAM
        select GENERIC_GPIO
        select ARCH_REQUIRE_GPIOLIB
+       select GE_FPGA
        select HAS_RAPIDIO
        help
          This option enables support for the GE SBC610.
 
+config GE_FPGA
+       bool
+       default n
+
 endif
 
 config MPC8641

diff --git a/arch/powerpc/platforms/86xx/Makefile b/arch/powerpc/platforms/86xx/Makefile
index 4b0d7b1aa0056bd45d5f80dfd95a150a4844f3d4..ac6a50fdd1d17134f2c987f19e0a74c1920e8c68 100644 (file)
--- a/arch/powerpc/platforms/86xx/Makefile
+++ b/arch/powerpc/platforms/86xx/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_MPC8641_HPCN)      += mpc86xx_hpcn.o
 obj-$(CONFIG_SBC8641D)         += sbc8641d.o
 obj-$(CONFIG_MPC8610_HPCD)     += mpc8610_hpcd.o
 gef-gpio-$(CONFIG_GPIOLIB)     += gef_gpio.o
-obj-$(CONFIG_GEF_SBC610)       += gef_sbc610.o gef_pic.o $(gef-gpio-y)
-obj-$(CONFIG_GEF_SBC310)       += gef_sbc310.o gef_pic.o $(gef-gpio-y)
-obj-$(CONFIG_GEF_PPC9A)                += gef_ppc9a.o gef_pic.o $(gef-gpio-y)
+obj-$(CONFIG_GE_FPGA)  += gef_pic.o $(gef-gpio-y)
+obj-$(CONFIG_GEF_SBC610)       += gef_sbc610.o
+obj-$(CONFIG_GEF_SBC310)       += gef_sbc310.o
+obj-$(CONFIG_GEF_PPC9A)                += gef_ppc9a.o

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 877b107f77a769577111ce5f9eee41742be8fa32..2955c3fa819478b81f25a840a0df3630af3e76fb 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1039,7 +1039,7 @@ config LANTIQ_WDT
 
 config GEF_WDT
        tristate "GE Watchdog Timer"
-       depends on GEF_SBC610 || GEF_SBC310 || GEF_PPC9A
+       depends on GE_FPGA
        ---help---
          Watchdog timer found in a number of GE single board computers.