aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Hennerich <michael.hennerich@analog.com>2009-09-22 11:36:55 -0400
committerMike Frysinger <vapier@gentoo.org>2009-12-15 00:13:48 -0500
commitddcd7cb857cdf2a29c30125f71cb5d4d6744c99b (patch)
tree5aca6dd22cbeb13c9e86afb45a2e0eb1f6b41a87
parent89e84eeace5924f29a4f8f25cce9fcb083969974 (diff)
Blackfin: clean up bf537-lq035 board resources
Now that the driver has been updated, convert the board resources to the new i2c framework for managing slaves. For boards that don't actually hook up to this hardware, simply drop the resources altogether. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--arch/blackfin/mach-bf527/boards/ezkit.c10
-rw-r--r--arch/blackfin/mach-bf533/boards/H8606.c6
-rw-r--r--arch/blackfin/mach-bf533/boards/stamp.c6
-rw-r--r--arch/blackfin/mach-bf537/boards/stamp.c5
4 files changed, 5 insertions, 22 deletions
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index f09665f74ba0..45db07b5221b 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -688,12 +688,6 @@ static struct platform_device bfin_spi0_device = {
688}; 688};
689#endif /* spi master and devices */ 689#endif /* spi master and devices */
690 690
691#if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
692static struct platform_device bfin_fb_device = {
693 .name = "bf537-lq035",
694};
695#endif
696
697#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) 691#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
698static struct resource bfin_uart_resources[] = { 692static struct resource bfin_uart_resources[] = {
699#ifdef CONFIG_SERIAL_BFIN_UART0 693#ifdef CONFIG_SERIAL_BFIN_UART0
@@ -957,10 +951,6 @@ static struct platform_device *stamp_devices[] __initdata = {
957 &bfin_spi0_device, 951 &bfin_spi0_device,
958#endif 952#endif
959 953
960#if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
961 &bfin_fb_device,
962#endif
963
964#if defined(CONFIG_FB_BFIN_T350MCQB) || defined(CONFIG_FB_BFIN_T350MCQB_MODULE) 954#if defined(CONFIG_FB_BFIN_T350MCQB) || defined(CONFIG_FB_BFIN_T350MCQB_MODULE)
965 &bf52x_t350mcqb_device, 955 &bf52x_t350mcqb_device,
966#endif 956#endif
diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c
index 43f43a095a99..26a04f078a40 100644
--- a/arch/blackfin/mach-bf533/boards/H8606.c
+++ b/arch/blackfin/mach-bf533/boards/H8606.c
@@ -258,12 +258,6 @@ static struct platform_device bfin_spi0_device = {
258}; 258};
259#endif /* spi master and devices */ 259#endif /* spi master and devices */
260 260
261#if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
262static struct platform_device bfin_fb_device = {
263 .name = "bf537-fb",
264};
265#endif
266
267#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) 261#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
268static struct resource bfin_uart_resources[] = { 262static struct resource bfin_uart_resources[] = {
269 { 263 {
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index 82f70efd66e7..6d68dcfa2da2 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -321,12 +321,6 @@ static struct platform_device bfin_spi0_device = {
321}; 321};
322#endif /* spi master and devices */ 322#endif /* spi master and devices */
323 323
324#if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
325static struct platform_device bfin_fb_device = {
326 .name = "bf537-fb",
327};
328#endif
329
330#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) 324#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
331static struct resource bfin_uart_resources[] = { 325static struct resource bfin_uart_resources[] = {
332 { 326 {
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index c46baa5e6d9b..6a09b71c96cc 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -1462,6 +1462,11 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
1462 I2C_BOARD_INFO("bfin-adv7393", 0x2B), 1462 I2C_BOARD_INFO("bfin-adv7393", 0x2B),
1463 }, 1463 },
1464#endif 1464#endif
1465#if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
1466 {
1467 I2C_BOARD_INFO("bf537-lq035-ad5280", 0x2C),
1468 },
1469#endif
1465}; 1470};
1466 1471
1467#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) 1472#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)