[PATCH] au1200fb: configurable number of planes

@@ -49,10 +49,6 @@
 #include <asm/mach-au1x00/au1xxx_pm.h>
 #endif
 
-#ifndef CONFIG_FB_AU1200_DEVS
-#define CONFIG_FB_AU1200_DEVS 4
-#endif
-
 #define DRIVER_NAME "au1200fb"
 #define DRIVER_DESC "LCD controller driver for AU1200 processors"
 

@@ -157,7 +153,7 @@ struct au1200fb_device {
 	dma_addr_t    		fb_phys;
 };
 
-static struct au1200fb_device _au1200fb_devices[CONFIG_FB_AU1200_DEVS];
+static struct au1200fb_device _au1200fb_devices[4];
 /********************************************************************/
 
 /* LCD controller restrictions */

@@ -173,6 +169,7 @@ static struct au1200fb_device _au1200fb_
 /********************************************************************/
 
 static struct au1200_lcd *lcd = (struct au1200_lcd *) AU1200_LCD_ADDR;
+static int device_count = 4;	/* number of fb devices to create */
 static int window_index = 2; /* default is zero */
 static int panel_index = 2; /* default is zero */
 static struct window_settings *win;

@@ -711,7 +812,7 @@ static int fbinfo2index (struct fb_info 
 {
 	int i;
 
-	for (i = 0; i < CONFIG_FB_AU1200_DEVS; ++i) {
+	for (i = 0; i < device_count; ++i) {
 		if (fb_info == (struct fb_info *)(&_au1200fb_devices[i].fb_info))
 			return i;
 	}

@@ -1632,7 +1733,7 @@ static int au1200fb_drv_probe(struct dev
 	if (!dev)
 		return -EINVAL;
 
-	for (plane = 0; plane < CONFIG_FB_AU1200_DEVS; ++plane) {
+	for (plane = 0; plane < device_count; ++plane) {
 		bpp = winbpp(win->w[plane].mode_winctrl1);
 		if (win->w[plane].xres == 0)
 			win->w[plane].xres = panel->Xres;

@@ -1727,7 +1828,7 @@ static int au1200fb_drv_remove(struct de
 	/* Turn off the panel */
 	au1200_setpanel(NULL);
 
-	for (plane = 0; plane < CONFIG_FB_AU1200_DEVS; ++plane)
+	for (plane = 0; plane < device_count; ++plane)
 	{
 		fbdev = &_au1200fb_devices[plane];
 

@@ -1779,7 +1880,7 @@ static struct device_driver au1200fb_dri
 static void au1200fb_setup(void)
 {
 	char* options = NULL;
-	char* this_opt;
+	char* this_opt, *endptr;
 	int num_panels = ARRAY_SIZE(known_lcd_panels);
 	int panel_idx = -1;
 

@@ -1792,7 +1893,6 @@ static void au1200fb_setup(void)
 			if (!strncmp(this_opt, "panel:", 6)) {
 				int i;
 				long int li;
-				char *endptr;
 				this_opt += 6;
 				/* First check for index, which allows
 				 * to short circuit this mess */

@@ -1824,6 +1924,12 @@ static void au1200fb_setup(void)
 				nohwcursor = 1;
 			}
 
+			else if (strncmp(this_opt, "devices:", 8) == 0) {
+				this_opt += 8;
+				device_count = simple_strtol(this_opt, &endptr, 0);
+				if ((device_count < 0) || (device_count > 4))
+					device_count = 4;	/* set default */
+			}
 			/* Unsupported option */
 			else {
 				print_warn("Unsupported option \"%s\"", this_opt);

@@ -1847,7 +1953,7 @@ static int au1200fb_pm_callback(au1xxx_p
 		{
 			int plane;
 			au1200_setpanel(panel);
-			for (plane = 0; plane < CONFIG_FB_AU1200_DEVS; ++plane) 	{
+			for (plane = 0; plane < device_count; ++plane) 	{
 				struct au1200fb_device *fbdev;
 				fbdev = &_au1200fb_devices[plane];
 				au1200fb_fb_set_par(&fbdev->fb_info);

-------------------------------------------------------------------------