aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-bf527/boards
diff options
context:
space:
mode:
authorMichael Hennerich <michael.hennerich@analog.com>2009-09-22 09:10:09 -0400
committerMike Frysinger <vapier@gentoo.org>2009-10-08 00:57:54 -0400
commit50c4c0861a0a60cd4f414457fdbfc8d9a1eb1e31 (patch)
tree350ca12a1c94cf4a48440c95582048d680455f7d /arch/blackfin/mach-bf527/boards
parent19a3b6034aed7d8ac5a15f5fa854523c1cf76674 (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-bf527/boards')
-rw-r--r--arch/blackfin/mach-bf527/boards/cm_bf527.c15
-rw-r--r--arch/blackfin/mach-bf527/boards/ezkit.c15
2 files changed, 10 insertions, 20 deletions
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c
index 0c6d2929f0a5..1c4f9e236b9f 100644
--- a/arch/blackfin/mach-bf527/boards/cm_bf527.c
+++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c
@@ -595,12 +595,6 @@ static struct platform_device bfin_spi0_device = {
595}; 595};
596#endif /* spi master and devices */ 596#endif /* spi master and devices */
597 597
598#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
599static struct platform_device bfin_fb_adv7393_device = {
600 .name = "bfin-adv7393",
601};
602#endif
603
604#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE) 598#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE)
605static struct mtd_partition cm_partitions[] = { 599static struct mtd_partition cm_partitions[] = {
606 { 600 {
@@ -765,6 +759,11 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
765 .irq = IRQ_PF8, 759 .irq = IRQ_PF8,
766 }, 760 },
767#endif 761#endif
762#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
763 {
764 I2C_BOARD_INFO("bfin-adv7393", 0x2B),
765 },
766#endif
768}; 767};
769 768
770#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) 769#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
@@ -888,10 +887,6 @@ static struct platform_device *cmbf527_devices[] __initdata = {
888 &bfin_spi0_device, 887 &bfin_spi0_device,
889#endif 888#endif
890 889
891#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
892 &bfin_fb_adv7393_device,
893#endif
894
895#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) 890#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
896 &bfin_uart_device, 891 &bfin_uart_device,
897#endif 892#endif
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index b7574b4e55e0..9fbdebeb0b1a 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -694,12 +694,6 @@ static struct platform_device bfin_fb_device = {
694}; 694};
695#endif 695#endif
696 696
697#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
698static struct platform_device bfin_fb_adv7393_device = {
699 .name = "bfin-adv7393",
700};
701#endif
702
703#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) 697#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
704static struct resource bfin_uart_resources[] = { 698static struct resource bfin_uart_resources[] = {
705#ifdef CONFIG_SERIAL_BFIN_UART0 699#ifdef CONFIG_SERIAL_BFIN_UART0
@@ -815,6 +809,11 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
815 .irq = IRQ_PF8, 809 .irq = IRQ_PF8,
816 }, 810 },
817#endif 811#endif
812#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
813 {
814 I2C_BOARD_INFO("bfin-adv7393", 0x2B),
815 },
816#endif
818}; 817};
819 818
820#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) 819#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
@@ -979,10 +978,6 @@ static struct platform_device *stamp_devices[] __initdata = {
979 &bf52x_t350mcqb_device, 978 &bf52x_t350mcqb_device,
980#endif 979#endif
981 980
982#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
983 &bfin_fb_adv7393_device,
984#endif
985
986#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) 981#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
987 &bfin_uart_device, 982 &bfin_uart_device,
988#endif 983#endif