X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Fs3c24xx%2Ffiles-2.6.30%2Fdrivers%2Fmfd%2Fglamo%2Fglamo-fb.c;h=90a6541e644b4a1e7c18e1d679aa2e63a86d155e;hp=c3422ffe9b5e3daedaf95cebbcf01f80cc415239;hb=cf7f35761f2ef7164101480104c12272c6472812;hpb=e8ba63b5d72248b23ba8d3b52b47ed4ffdcbe58b;ds=sidebyside

diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-fb.c b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-fb.c
index c3422ffe9b..90a6541e64 100644
--- a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-fb.c
+++ b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-fb.c
@@ -79,11 +79,6 @@ struct glamofb_handle {
 	int output_enabled; /* 0 if the video output is disabled */
 };
 
-/* 'sibling' spi device for lcm init */
-static struct platform_device glamo_spi_dev = {
-	.name		= "glamo-lcm-spi",
-};
-
 static void glamo_output_enable(struct glamofb_handle *gfb) {
         	struct glamo_core *gcore = gfb->mach_info->glamo;
 
@@ -861,7 +856,7 @@ static int __init glamofb_probe(struct platform_device *pdev)
 	}
 
 	glamofb->fb_res = request_mem_region(glamofb->fb_res->start,
-					     mach_info->fb_mem_size,
+					     resource_size(glamofb->fb_res),
 					     pdev->name);
 	if (!glamofb->fb_res) {
 		dev_err(&pdev->dev, "failed to request vram region\n");
@@ -875,6 +870,7 @@ static int __init glamofb_probe(struct platform_device *pdev)
 		dev_err(&pdev->dev, "failed to ioremap() mmio memory\n");
 		goto out_release_fb;
 	}
+
 	fbinfo->fix.smem_start = (unsigned long) glamofb->fb_res->start;
 	fbinfo->fix.smem_len = (__u32) resource_size(glamofb->fb_res);
 
@@ -934,14 +930,6 @@ static int __init glamofb_probe(struct platform_device *pdev)
 		goto out_unmap_fb;
 	}
 
-	if (mach_info->spi_info) {
-		/* register the sibling spi device */
-		mach_info->spi_info->glamofb_handle = glamofb;
-		glamo_spi_dev.dev.parent = &pdev->dev;
-		glamo_spi_dev.dev.platform_data = mach_info->spi_info;
-		platform_device_register(&glamo_spi_dev);
-	}
-
 	printk(KERN_INFO "fb%d: %s frame buffer device\n",
 		fbinfo->node, fbinfo->fix.id);