From 44179fd9b571c00917056177f6bc5c46716b5d8d Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Tue, 10 Jul 2007 09:51:05 +1000
Subject: [PATCH] --- yaml --- r: 60707 b: refs/heads/master c:
 a527ad88a2f11f7ccab3038608e5c50ceae570a3 h: refs/heads/master i:   60705:
 49080c04379ce555ccce089003e529c3484abaf3   60703:
 6182eb0ac3495c72fe4d94d4ea037c12d252da1d v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/ppc/syslib/virtex_devices.c | 38 +++++++++++++++++---------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 341ab938a393..f8a4ce8e223a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31a12cece7c71c47e61ab8ed45bbff5aac4c1931
+refs/heads/master: a527ad88a2f11f7ccab3038608e5c50ceae570a3
diff --git a/trunk/arch/ppc/syslib/virtex_devices.c b/trunk/arch/ppc/syslib/virtex_devices.c
index 16546788e23b..ace4ec08de51 100644
--- a/trunk/arch/ppc/syslib/virtex_devices.c
+++ b/trunk/arch/ppc/syslib/virtex_devices.c
@@ -71,6 +71,21 @@
 	}, \
 }
 
+/*
+ * ML300/ML403 Video Device: shortcut macro for single instance
+ */
+#define XPAR_TFT(num) { \
+	.name = "xilinxfb", \
+	.id = num, \
+	.num_resources = 1, \
+	.resource = (struct resource[]) { \
+		{ \
+			.start = XPAR_TFT_##num##_BASEADDR, \
+			.end = XPAR_TFT_##num##_BASEADDR+7, \
+			.flags = IORESOURCE_IO, \
+		}, \
+	}, \
+}
 
 /* UART 8250 driver platform data table */
 struct plat_serial8250_port virtex_serial_platform_data[] = {
@@ -146,20 +161,17 @@ struct platform_device virtex_platform_devices[] = {
 	XPAR_SYSACE(1),
 #endif
 
-	/* ML300/403 reference design framebuffer */
 #if defined(XPAR_TFT_0_BASEADDR)
-	{
-		.name		= "xilinxfb",
-		.id		= 0,
-		.num_resources	= 1,
-		.resource = (struct resource[]) {
-			{
-				.start	= XPAR_TFT_0_BASEADDR,
-				.end	= XPAR_TFT_0_BASEADDR+7,
-				.flags	= IORESOURCE_IO,
-			},
-		},
-	},
+	XPAR_TFT(0),
+#endif
+#if defined(XPAR_TFT_1_BASEADDR)
+	XPAR_TFT(1),
+#endif
+#if defined(XPAR_TFT_2_BASEADDR)
+	XPAR_TFT(2),
+#endif
+#if defined(XPAR_TFT_3_BASEADDR)
+	XPAR_TFT(3),
 #endif
 };