diff options
author | Alessandro Rubini <rubini@gnudd.com> | 2013-06-12 03:13:25 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 19:38:57 -0400 |
commit | 9c9f32eddee56888c7acd0d69134a5dcae09e1a8 (patch) | |
tree | 2da7a255c0fe298b011759f237de18e01f1e7ab9 | |
parent | b1f254e35d85535b17af2786d06fe88f15f304f7 (diff) |
FMC: create drivers/fmc and toplevel Kconfig question
This commit creates the drivers/fmc directory and puts the necessary
hooks for kbuild and kconfig. The code is currently a placeholder
that only registers an empty bus.
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
Acked-by: Juan David Gonzalez Cobas <dcobas@cern.ch>
Acked-by: Emilio G. Cota <cota@braap.org>
Acked-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | MAINTAINERS | 9 | ||||
-rw-r--r-- | drivers/Kconfig | 2 | ||||
-rw-r--r-- | drivers/Makefile | 1 | ||||
-rw-r--r-- | drivers/fmc/Kconfig | 17 | ||||
-rw-r--r-- | drivers/fmc/Makefile | 4 | ||||
-rw-r--r-- | drivers/fmc/fmc-core.c | 24 |
6 files changed, 57 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5be702cc8449..14746ad5ee15 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3309,6 +3309,15 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git | |||
3309 | S: Odd fixes | 3309 | S: Odd fixes |
3310 | F: drivers/block/floppy.c | 3310 | F: drivers/block/floppy.c |
3311 | 3311 | ||
3312 | FMC SUBSYSTEM | ||
3313 | M: Alessandro Rubini <rubini@gnudd.com> | ||
3314 | W: http://www.ohwr.org/projects/fmc-bus | ||
3315 | S: Supported | ||
3316 | F: drivers/fmc/ | ||
3317 | F: include/linux/fmc*.h | ||
3318 | F: include/linux/ipmi-fru.h | ||
3319 | K: fmc_d.*register | ||
3320 | |||
3312 | FPU EMULATOR | 3321 | FPU EMULATOR |
3313 | M: Bill Metzenthen <billm@melbpc.org.au> | 3322 | M: Bill Metzenthen <billm@melbpc.org.au> |
3314 | W: http://floatingpoint.sourceforge.net/emulator/index.html | 3323 | W: http://floatingpoint.sourceforge.net/emulator/index.html |
diff --git a/drivers/Kconfig b/drivers/Kconfig index 9953a42809ec..ae050b54c368 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
@@ -166,4 +166,6 @@ source "drivers/ipack/Kconfig" | |||
166 | 166 | ||
167 | source "drivers/reset/Kconfig" | 167 | source "drivers/reset/Kconfig" |
168 | 168 | ||
169 | source "drivers/fmc/Kconfig" | ||
170 | |||
169 | endmenu | 171 | endmenu |
diff --git a/drivers/Makefile b/drivers/Makefile index 130abc1dfd65..336b0ad0acd0 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
@@ -152,3 +152,4 @@ obj-$(CONFIG_IIO) += iio/ | |||
152 | obj-$(CONFIG_VME_BUS) += vme/ | 152 | obj-$(CONFIG_VME_BUS) += vme/ |
153 | obj-$(CONFIG_IPACK_BUS) += ipack/ | 153 | obj-$(CONFIG_IPACK_BUS) += ipack/ |
154 | obj-$(CONFIG_NTB) += ntb/ | 154 | obj-$(CONFIG_NTB) += ntb/ |
155 | obj-$(CONFIG_FMC) += fmc/ | ||
diff --git a/drivers/fmc/Kconfig b/drivers/fmc/Kconfig new file mode 100644 index 000000000000..e28790267c69 --- /dev/null +++ b/drivers/fmc/Kconfig | |||
@@ -0,0 +1,17 @@ | |||
1 | # | ||
2 | # FMC (ANSI-VITA 57.1) bus support | ||
3 | # | ||
4 | |||
5 | menuconfig FMC | ||
6 | tristate "FMC support" | ||
7 | help | ||
8 | |||
9 | FMC (FPGA Mezzanine Carrier) is a mechanical and electrical | ||
10 | standard for mezzanine cards that plug into a carrier board. | ||
11 | This kernel subsystem supports the matching between carrier | ||
12 | and mezzanine based on identifiers stored in the internal I2C | ||
13 | EEPROM, as well as having carrier-independent drivers. | ||
14 | |||
15 | The framework was born outside of the kernel and at this time | ||
16 | the off-tree code base is more complete. Code and documentation | ||
17 | is at git://ohwr.org/fmc-projects/fmc-bus.git . | ||
diff --git a/drivers/fmc/Makefile b/drivers/fmc/Makefile new file mode 100644 index 000000000000..a2784d8b5306 --- /dev/null +++ b/drivers/fmc/Makefile | |||
@@ -0,0 +1,4 @@ | |||
1 | |||
2 | obj-$(CONFIG_FMC) += fmc.o | ||
3 | |||
4 | fmc-y = fmc-core.o | ||
diff --git a/drivers/fmc/fmc-core.c b/drivers/fmc/fmc-core.c new file mode 100644 index 000000000000..fc3547f32d5e --- /dev/null +++ b/drivers/fmc/fmc-core.c | |||
@@ -0,0 +1,24 @@ | |||
1 | /* Temporary placeholder so the empty code can build */ | ||
2 | #include <linux/kernel.h> | ||
3 | #include <linux/module.h> | ||
4 | #include <linux/init.h> | ||
5 | #include <linux/device.h> | ||
6 | |||
7 | static struct bus_type fmc_bus_type = { | ||
8 | .name = "fmc", | ||
9 | }; | ||
10 | |||
11 | static int fmc_init(void) | ||
12 | { | ||
13 | return bus_register(&fmc_bus_type); | ||
14 | } | ||
15 | |||
16 | static void fmc_exit(void) | ||
17 | { | ||
18 | bus_unregister(&fmc_bus_type); | ||
19 | } | ||
20 | |||
21 | module_init(fmc_init); | ||
22 | module_exit(fmc_exit); | ||
23 | |||
24 | MODULE_LICENSE("GPL"); | ||