diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-21 18:23:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 17:02:15 -0400 |
commit | a9d1b24d91f91b77db3da8aeacb414764f789b9c (patch) | |
tree | a7400c6154b7e5b6839b3c25fecc2daac75c4a2b | |
parent | 0dc9a32d9a975ccd25b9f531451165c93e1c7313 (diff) |
[PATCH] I2C: add i2c module alias for i2c drivers to use
This is the start of adding hotplug-like support for i2c devices.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | include/linux/i2c.h | 1 | ||||
-rw-r--r-- | include/linux/mod_devicetable.h | 5 | ||||
-rw-r--r-- | scripts/mod/file2alias.c | 10 |
3 files changed, 16 insertions, 0 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 32977fb1d99a..f88577ca3b3a 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
30 | #include <linux/types.h> | 30 | #include <linux/types.h> |
31 | #include <linux/i2c-id.h> | 31 | #include <linux/i2c-id.h> |
32 | #include <linux/mod_devicetable.h> | ||
32 | #include <linux/device.h> /* for struct device */ | 33 | #include <linux/device.h> /* for struct device */ |
33 | #include <asm/semaphore.h> | 34 | #include <asm/semaphore.h> |
34 | 35 | ||
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 2f0299a448f6..7b08c11ec4cc 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
@@ -244,4 +244,9 @@ struct pcmcia_device_id { | |||
244 | #define PCMCIA_DEV_ID_MATCH_FAKE_CIS 0x0200 | 244 | #define PCMCIA_DEV_ID_MATCH_FAKE_CIS 0x0200 |
245 | #define PCMCIA_DEV_ID_MATCH_ANONYMOUS 0x0400 | 245 | #define PCMCIA_DEV_ID_MATCH_ANONYMOUS 0x0400 |
246 | 246 | ||
247 | /* I2C */ | ||
248 | struct i2c_device_id { | ||
249 | __u16 id; | ||
250 | }; | ||
251 | |||
247 | #endif /* LINUX_MOD_DEVICETABLE_H */ | 252 | #endif /* LINUX_MOD_DEVICETABLE_H */ |
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index f2ee673329a7..e3d144a3f10b 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c | |||
@@ -359,6 +359,13 @@ static int do_vio_entry(const char *filename, struct vio_device_id *vio, | |||
359 | return 1; | 359 | return 1; |
360 | } | 360 | } |
361 | 361 | ||
362 | static int do_i2c_entry(const char *filename, struct i2c_device_id *i2c, char *alias) | ||
363 | { | ||
364 | strcpy(alias, "i2c:"); | ||
365 | ADD(alias, "id", 1, i2c->id); | ||
366 | return 1; | ||
367 | } | ||
368 | |||
362 | /* Ignore any prefix, eg. v850 prepends _ */ | 369 | /* Ignore any prefix, eg. v850 prepends _ */ |
363 | static inline int sym_is(const char *symbol, const char *name) | 370 | static inline int sym_is(const char *symbol, const char *name) |
364 | { | 371 | { |
@@ -443,6 +450,9 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, | |||
443 | else if (sym_is(symname, "__mod_vio_device_table")) | 450 | else if (sym_is(symname, "__mod_vio_device_table")) |
444 | do_table(symval, sym->st_size, sizeof(struct vio_device_id), | 451 | do_table(symval, sym->st_size, sizeof(struct vio_device_id), |
445 | do_vio_entry, mod); | 452 | do_vio_entry, mod); |
453 | else if (sym_is(symname, "__mod_i2c_device_table")) | ||
454 | do_table(symval, sym->st_size, sizeof(struct i2c_device_id), | ||
455 | do_i2c_entry, mod); | ||
446 | 456 | ||
447 | } | 457 | } |
448 | 458 | ||