aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-bf548/boards/ezkit.c
diff options
context:
space:
mode:
authorBryan Wu <cooloney@kernel.org>2008-03-25 22:02:13 -0400
committerBryan Wu <cooloney@kernel.org>2008-03-25 22:02:13 -0400
commit81d9c7f27dd679df6d03df53eba4fd12caafdb47 (patch)
tree601081d297b20657e84a6b3bbad8e2e38997d11a /arch/blackfin/mach-bf548/boards/ezkit.c
parentd171c23327e2d596ac27d3df4322fc6430b45aa2 (diff)
[Blackfin] arch: add i2c board info struct and move to new-style i2c interface
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/mach-bf548/boards/ezkit.c')
-rw-r--r--arch/blackfin/mach-bf548/boards/ezkit.c34
1 files changed, 34 insertions, 0 deletions
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index dc3c0156f37f..04c0c8df6e96 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -36,6 +36,7 @@
36#include <linux/spi/spi.h> 36#include <linux/spi/spi.h>
37#include <linux/spi/flash.h> 37#include <linux/spi/flash.h>
38#include <linux/irq.h> 38#include <linux/irq.h>
39#include <linux/i2c.h>
39#include <linux/interrupt.h> 40#include <linux/interrupt.h>
40#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE) 41#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
41#include <linux/usb/musb.h> 42#include <linux/usb/musb.h>
@@ -573,6 +574,29 @@ static struct platform_device i2c_bfin_twi1_device = {
573#endif 574#endif
574#endif 575#endif
575 576
577#ifdef CONFIG_I2C_BOARDINFO
578static struct i2c_board_info __initdata bfin_i2c_board_info0[] = {
579};
580
581#if !defined(CONFIG_BF542) /* The BF542 only has 1 TWI */
582static struct i2c_board_info __initdata bfin_i2c_board_info1[] = {
583#if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE)
584 {
585 I2C_BOARD_INFO("pcf8574_lcd", 0x22),
586 .type = "pcf8574_lcd",
587 },
588#endif
589#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
590 {
591 I2C_BOARD_INFO("pcf8574_keypad", 0x27),
592 .type = "pcf8574_keypad",
593 .irq = 212,
594 },
595#endif
596};
597#endif
598#endif
599
576#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) 600#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
577#include <linux/gpio_keys.h> 601#include <linux/gpio_keys.h>
578 602
@@ -672,6 +696,16 @@ static struct platform_device *ezkit_devices[] __initdata = {
672static int __init ezkit_init(void) 696static int __init ezkit_init(void)
673{ 697{
674 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); 698 printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);
699
700#ifdef CONFIG_I2C_BOARDINFO
701 i2c_register_board_info(0, bfin_i2c_board_info0,
702 ARRAY_SIZE(bfin_i2c_board_info0));
703#if !defined(CONFIG_BF542) /* The BF542 only has 1 TWI */
704 i2c_register_board_info(1, bfin_i2c_board_info1,
705 ARRAY_SIZE(bfin_i2c_board_info1));
706#endif
707#endif
708
675 platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); 709 platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices));
676 710
677#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) 711#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)