aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin
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
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')
-rw-r--r--arch/blackfin/mach-bf527/boards/cm_bf527.c15
-rw-r--r--arch/blackfin/mach-bf527/boards/ezkit.c15
-rw-r--r--arch/blackfin/mach-bf533/boards/ezkit.c21
-rw-r--r--arch/blackfin/mach-bf533/boards/stamp.c15
-rw-r--r--arch/blackfin/mach-bf537/boards/stamp.c15
5 files changed, 31 insertions, 50 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
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)
38static 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
436static 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
441static struct platform_device *ezkit_devices[] __initdata = { 444static 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
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index 1a995d18349e..ff1fd938442f 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -73,12 +73,6 @@ static struct platform_device smc91x_device = {
73}; 73};
74#endif 74#endif
75 75
76#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
77static struct platform_device bfin_fb_adv7393_device = {
78 .name = "bfin-adv7393",
79};
80#endif
81
82#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) 76#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
83static struct resource net2272_bfin_resources[] = { 77static struct resource net2272_bfin_resources[] = {
84 { 78 {
@@ -465,6 +459,11 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
465 .irq = 39, 459 .irq = 39,
466 }, 460 },
467#endif 461#endif
462#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
463 {
464 I2C_BOARD_INFO("bfin-adv7393", 0x2B),
465 },
466#endif
468}; 467};
469 468
470static const unsigned int cclk_vlev_datasheet[] = 469static const unsigned int cclk_vlev_datasheet[] =
@@ -506,10 +505,6 @@ static struct platform_device *stamp_devices[] __initdata = {
506 &smc91x_device, 505 &smc91x_device,
507#endif 506#endif
508 507
509#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
510 &bfin_fb_adv7393_device,
511#endif
512
513#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) 508#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
514 &net2272_bfin_device, 509 &net2272_bfin_device,
515#endif 510#endif
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 1cb72a87188b..3091a149dd19 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -1056,12 +1056,6 @@ static struct platform_device bfin_fb_device = {
1056}; 1056};
1057#endif 1057#endif
1058 1058
1059#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
1060static struct platform_device bfin_fb_adv7393_device = {
1061 .name = "bfin-adv7393",
1062};
1063#endif
1064
1065#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE) 1059#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
1066#include <asm/bfin-lq035q1.h> 1060#include <asm/bfin-lq035q1.h>
1067 1061
@@ -1476,6 +1470,11 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
1476 .platform_data = (void *)&adp5588_gpio_data, 1470 .platform_data = (void *)&adp5588_gpio_data,
1477 }, 1471 },
1478#endif 1472#endif
1473#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
1474 {
1475 I2C_BOARD_INFO("bfin-adv7393", 0x2B),
1476 },
1477#endif
1479}; 1478};
1480 1479
1481#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) 1480#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
@@ -1646,10 +1645,6 @@ static struct platform_device *stamp_devices[] __initdata = {
1646 &bfin_lq035q1_device, 1645 &bfin_lq035q1_device,
1647#endif 1646#endif
1648 1647
1649#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
1650 &bfin_fb_adv7393_device,
1651#endif
1652
1653#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) 1648#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
1654 &bfin_uart_device, 1649 &bfin_uart_device,
1655#endif 1650#endif