Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 330bbf485447c0cf127750eb7d68d43a73f59356

Authored by Martyn Welch
Committed by Kumar Gala
1 parent 950740098c

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>

Showing 3 changed files with 12 additions and 4 deletions Side-by-side Diff

arch/powerpc/platforms/86xx/Kconfig
Diff comments   View file @ 330bbf4
... ... @@ -39,6 +39,7 @@
39 39 select MMIO_NVRAM
40 40 select GENERIC_GPIO
41 41 select ARCH_REQUIRE_GPIOLIB
  42 + select GE_FPGA
42 43 help
43 44 This option enables support for the GE PPC9A.
44 45  
... ... @@ -48,6 +49,7 @@
48 49 select MMIO_NVRAM
49 50 select GENERIC_GPIO
50 51 select ARCH_REQUIRE_GPIOLIB
  52 + select GE_FPGA
51 53 help
52 54 This option enables support for the GE SBC310.
53 55  
54 56  
... ... @@ -57,9 +59,14 @@
57 59 select MMIO_NVRAM
58 60 select GENERIC_GPIO
59 61 select ARCH_REQUIRE_GPIOLIB
  62 + select GE_FPGA
60 63 select HAS_RAPIDIO
61 64 help
62 65 This option enables support for the GE SBC610.
  66 +
  67 +config GE_FPGA
  68 + bool
  69 + default n
63 70  
64 71 endif
65 72  
arch/powerpc/platforms/86xx/Makefile
Diff comments   View file @ 330bbf4
... ... @@ -8,7 +8,8 @@
8 8 obj-$(CONFIG_SBC8641D) += sbc8641d.o
9 9 obj-$(CONFIG_MPC8610_HPCD) += mpc8610_hpcd.o
10 10 gef-gpio-$(CONFIG_GPIOLIB) += gef_gpio.o
11   -obj-$(CONFIG_GEF_SBC610) += gef_sbc610.o gef_pic.o $(gef-gpio-y)
12   -obj-$(CONFIG_GEF_SBC310) += gef_sbc310.o gef_pic.o $(gef-gpio-y)
13   -obj-$(CONFIG_GEF_PPC9A) += gef_ppc9a.o gef_pic.o $(gef-gpio-y)
  11 +obj-$(CONFIG_GE_FPGA) += gef_pic.o $(gef-gpio-y)
  12 +obj-$(CONFIG_GEF_SBC610) += gef_sbc610.o
  13 +obj-$(CONFIG_GEF_SBC310) += gef_sbc310.o
  14 +obj-$(CONFIG_GEF_PPC9A) += gef_ppc9a.o
drivers/watchdog/Kconfig
Diff comments   View file @ 330bbf4
... ... @@ -1039,7 +1039,7 @@
1039 1039  
1040 1040 config GEF_WDT
1041 1041 tristate "GE Watchdog Timer"
1042   - depends on GEF_SBC610 || GEF_SBC310 || GEF_PPC9A
  1042 + depends on GE_FPGA
1043 1043 ---help---
1044 1044 Watchdog timer found in a number of GE single board computers.
1045 1045