Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd850f12 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Olof Johansson
Browse files

ARM: clps711x: Transform clps711x-framebuffer to platform driver and use it 



clps711x-framebuffer driver needs to be updated and this is a first step
to make driver better. With this patch we are convert clps711x-framebuffer
to platform device and load this driver from board code.

Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent b3a076dd

arch/arm/mach-clps711x/autcpu12.c

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ static struct platform_device autcpu12_nvram_pdev __initdata = { 


static void __init autcpu12_init(void)

{

	platform_device_register_simple("video-clps711x", 0, NULL, 0);

	platform_device_register_simple("cs89x0", 0, autcpu12_cs8900_resource,

					ARRAY_SIZE(autcpu12_cs8900_resource));

	platform_device_register(&autcpu12_nvram_pdev);

arch/arm/mach-clps711x/edb7211.c

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ fixup_edb7211(struct tag *tags, char **cmdline, struct meminfo *mi) 


static void __init edb7211_init(void)

{

	platform_device_register_simple("video-clps711x", 0, NULL, 0);

	platform_device_register_simple("cs89x0", 0, edb7211_cs8900_resource,

					ARRAY_SIZE(edb7211_cs8900_resource));

}

arch/arm/mach-clps711x/p720t.c

+6 −0
Original line number Diff line number Diff line
@@ -119,6 +119,11 @@ static struct gpio_led_platform_data p720t_gpio_led_pdata __initdata = { 
	.num_leds	= ARRAY_SIZE(p720t_gpio_leds),

};



static void __init p720t_init(void)

{

	platform_device_register_simple("video-clps711x", 0, NULL, 0);

}



static void __init p720t_init_late(void)

{

	platform_device_register_data(&platform_bus, "leds-gpio", 0,
@@ -134,6 +139,7 @@ MACHINE_START(P720T, "ARM-Prospector720T") 
	.init_early	= p720t_init_early,

	.init_irq	= clps711x_init_irq,

	.timer		= &clps711x_timer,

	.init_machine	= p720t_init,

	.init_late	= p720t_init_late,

	.restart	= clps711x_restart,

MACHINE_END

drivers/video/clps711xfb.c

+15 −6
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static const struct file_operations backlight_proc_fops = { 
	.write		= backlight_proc_write,

};



static void __init clps711x_guess_lcd_params(struct fb_info *info)

static void __devinit clps711x_guess_lcd_params(struct fb_info *info)

{

	unsigned int lcdcon, syscon, size;

	unsigned long phys_base = PAGE_OFFSET;
@@ -358,7 +358,7 @@ static void __init clps711x_guess_lcd_params(struct fb_info *info) 
	info->fix.type       = FB_TYPE_PACKED_PIXELS;

}



int __init clps711xfb_init(void)

static int __devinit clps711x_fb_probe(struct platform_device *pdev)

{

	int err = -ENOMEM;
@@ -410,7 +410,7 @@ int __init clps711xfb_init(void) 
out:	return err;

}



static void __exit clps711xfb_exit(void)

static int __devexit clps711x_fb_remove(struct platform_device *pdev)

{

	unregister_framebuffer(cfb);

	kfree(cfb);
@@ -422,11 +422,20 @@ static void __exit clps711xfb_exit(void) 
		PLD_LCDEN = 0;

		PLD_PWR &= ~(PLD_S4_ON|PLD_S3_ON|PLD_S2_ON|PLD_S1_ON);

	}



	return 0;

}



module_init(clps711xfb_init);

module_exit(clps711xfb_exit);

static struct platform_driver clps711x_fb_driver = {

	.driver	= {

		.name	= "video-clps711x",

		.owner	= THIS_MODULE,

	},

	.probe	= clps711x_fb_probe,

	.remove	= __devexit_p(clps711x_fb_remove),

};

module_platform_driver(clps711x_fb_driver);



MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");

MODULE_DESCRIPTION("CLPS711x framebuffer driver");

MODULE_DESCRIPTION("CLPS711X framebuffer driver");

MODULE_LICENSE("GPL");