diff options
author | Jean Delvare <khali@linux-fr.org> | 2008-04-29 17:11:40 -0400 |
---|---|---|
committer | Jean Delvare <khali@hyperion.delvare> | 2008-04-29 17:11:40 -0400 |
commit | 3760f736716f74bdc62a4ba5406934338da93eb2 (patch) | |
tree | e28e22c6655dd62566f1b7a99f9354a31bf9d06e /arch/blackfin | |
parent | d2653e92732bd3911feff6bee5e23dbf959381db (diff) |
i2c: Convert most new-style drivers to use module aliasing
Based on earlier work by Jon Smirl and Jochen Friedrich.
Update most new-style i2c drivers to use standard module aliasing
instead of the old driver_name/type driver matching scheme. I've
left the video drivers apart (except for SoC camera drivers) as
they're a bit more diffcult to deal with, they'll have their own
patch later.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Jon Smirl <jonsmirl@gmail.com>
Cc: Jochen Friedrich <jochen@scram.de>
Diffstat (limited to 'arch/blackfin')
-rw-r--r-- | arch/blackfin/mach-bf533/boards/stamp.c | 3 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 3 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c index fddce32901a2..024f418ae543 100644 --- a/arch/blackfin/mach-bf533/boards/stamp.c +++ b/arch/blackfin/mach-bf533/boards/stamp.c | |||
@@ -499,20 +499,17 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
499 | #if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE) | 499 | #if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE) |
500 | { | 500 | { |
501 | I2C_BOARD_INFO("ad7142_joystick", 0x2C), | 501 | I2C_BOARD_INFO("ad7142_joystick", 0x2C), |
502 | .type = "ad7142_joystick", | ||
503 | .irq = 39, | 502 | .irq = 39, |
504 | }, | 503 | }, |
505 | #endif | 504 | #endif |
506 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) | 505 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) |
507 | { | 506 | { |
508 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), | 507 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), |
509 | .type = "pcf8574_lcd", | ||
510 | }, | 508 | }, |
511 | #endif | 509 | #endif |
512 | #if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE) | 510 | #if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE) |
513 | { | 511 | { |
514 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), | 512 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), |
515 | .type = "pcf8574_keypad", | ||
516 | .irq = 39, | 513 | .irq = 39, |
517 | }, | 514 | }, |
518 | #endif | 515 | #endif |
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 0cec14b1ef5c..d3727b7c2d7d 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -751,20 +751,17 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
751 | #if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE) | 751 | #if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE) |
752 | { | 752 | { |
753 | I2C_BOARD_INFO("ad7142_joystick", 0x2C), | 753 | I2C_BOARD_INFO("ad7142_joystick", 0x2C), |
754 | .type = "ad7142_joystick", | ||
755 | .irq = 55, | 754 | .irq = 55, |
756 | }, | 755 | }, |
757 | #endif | 756 | #endif |
758 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) | 757 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) |
759 | { | 758 | { |
760 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), | 759 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), |
761 | .type = "pcf8574_lcd", | ||
762 | }, | 760 | }, |
763 | #endif | 761 | #endif |
764 | #if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE) | 762 | #if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE) |
765 | { | 763 | { |
766 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), | 764 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), |
767 | .type = "pcf8574_keypad", | ||
768 | .irq = 72, | 765 | .irq = 72, |
769 | }, | 766 | }, |
770 | #endif | 767 | #endif |
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 231dfbd3bc1f..b00f68ac6bc9 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
@@ -641,13 +641,11 @@ static struct i2c_board_info __initdata bfin_i2c_board_info1[] = { | |||
641 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) | 641 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) |
642 | { | 642 | { |
643 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), | 643 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), |
644 | .type = "pcf8574_lcd", | ||
645 | }, | 644 | }, |
646 | #endif | 645 | #endif |
647 | #if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE) | 646 | #if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE) |
648 | { | 647 | { |
649 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), | 648 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), |
650 | .type = "pcf8574_keypad", | ||
651 | .irq = 212, | 649 | .irq = 212, |
652 | }, | 650 | }, |
653 | #endif | 651 | #endif |