diff options
author | Michael Hennerich <michael.hennerich@analog.com> | 2009-09-22 09:10:09 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-10-08 00:57:54 -0400 |
commit | 50c4c0861a0a60cd4f414457fdbfc8d9a1eb1e31 (patch) | |
tree | 350ca12a1c94cf4a48440c95582048d680455f7d /arch/blackfin/mach-bf533/boards/ezkit.c | |
parent | 19a3b6034aed7d8ac5a15f5fa854523c1cf76674 (diff) |
Blackfin: convert adv7393 resources to new i2c framework
Now that the driver has been updated, convert the board resources to the
new i2c framework for managing slaves.
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/mach-bf533/boards/ezkit.c')
-rw-r--r-- | arch/blackfin/mach-bf533/boards/ezkit.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c index 64816b08d13c..9ffcd63442f1 100644 --- a/arch/blackfin/mach-bf533/boards/ezkit.c +++ b/arch/blackfin/mach-bf533/boards/ezkit.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/usb/isp1362.h> | 17 | #include <linux/usb/isp1362.h> |
18 | #endif | 18 | #endif |
19 | #include <linux/irq.h> | 19 | #include <linux/irq.h> |
20 | #include <linux/i2c.h> | ||
20 | #include <asm/dma.h> | 21 | #include <asm/dma.h> |
21 | #include <asm/bfin5xx_spi.h> | 22 | #include <asm/bfin5xx_spi.h> |
22 | #include <asm/portmux.h> | 23 | #include <asm/portmux.h> |
@@ -34,12 +35,6 @@ static struct platform_device rtc_device = { | |||
34 | }; | 35 | }; |
35 | #endif | 36 | #endif |
36 | 37 | ||
37 | #if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE) | ||
38 | static struct platform_device bfin_fb_adv7393_device = { | ||
39 | .name = "bfin-adv7393", | ||
40 | }; | ||
41 | #endif | ||
42 | |||
43 | /* | 38 | /* |
44 | * USB-LAN EzExtender board | 39 | * USB-LAN EzExtender board |
45 | * Driver needs to know address, irq and flag pin. | 40 | * Driver needs to know address, irq and flag pin. |
@@ -438,6 +433,14 @@ static struct platform_device bfin_dpmc = { | |||
438 | }, | 433 | }, |
439 | }; | 434 | }; |
440 | 435 | ||
436 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | ||
437 | #if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE) | ||
438 | { | ||
439 | I2C_BOARD_INFO("bfin-adv7393", 0x2B), | ||
440 | }, | ||
441 | #endif | ||
442 | }; | ||
443 | |||
441 | static struct platform_device *ezkit_devices[] __initdata = { | 444 | static struct platform_device *ezkit_devices[] __initdata = { |
442 | 445 | ||
443 | &bfin_dpmc, | 446 | &bfin_dpmc, |
@@ -460,10 +463,6 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
460 | &bfin_spi0_device, | 463 | &bfin_spi0_device, |
461 | #endif | 464 | #endif |
462 | 465 | ||
463 | #if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE) | ||
464 | &bfin_fb_adv7393_device, | ||
465 | #endif | ||
466 | |||
467 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | 466 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) |
468 | &rtc_device, | 467 | &rtc_device, |
469 | #endif | 468 | #endif |
@@ -494,6 +493,8 @@ static int __init ezkit_init(void) | |||
494 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 493 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
495 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); | 494 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); |
496 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 495 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
496 | i2c_register_board_info(0, bfin_i2c_board_info, | ||
497 | ARRAY_SIZE(bfin_i2c_board_info)); | ||
497 | return 0; | 498 | return 0; |
498 | } | 499 | } |
499 | 500 | ||