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

Commit cb38c569 authored by Richard Purdie's avatar Richard Purdie Committed by Russell King
Browse files

[ARM] 3011/1: pxafb: Add ability to set device parent + fix spitz compile error 



Patch from Richard Purdie

Add a function to allow machines to set the parent of the pxa
framebuffer device. This means the power up/down sequence can be
controlled where required by the machine.

Update spitz to use the new function, fixing a compile error.

Signed-off-by: default avatarRichard Purdie <rpurdie@rpsys.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cb90d681

arch/arm/mach-pxa/generic.c

+5 −0
Original line number Diff line number Diff line
@@ -208,6 +208,11 @@ static struct platform_device pxafb_device = { 
	.resource	= pxafb_resources,

};



void __init set_pxa_fb_parent(struct device *parent_dev)

{

	pxafb_device.dev.parent = parent_dev;

}



static struct platform_device ffuart_device = {

	.name		= "pxa2xx-uart",

	.id		= 0,

arch/arm/mach-pxa/spitz.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ static void __init common_init(void) 


	platform_add_devices(devices, ARRAY_SIZE(devices));

	pxa_set_mci_info(&spitz_mci_platform_data);

	pxafb_device.dev.parent = &spitzssp_device.dev;

	set_pxa_fb_parent(&spitzssp_device.dev);

	set_pxa_fb_info(&spitz_pxafb_info);

}

include/asm-arm/arch-pxa/pxafb.h

+1 −0
Original line number Diff line number Diff line
@@ -66,4 +66,5 @@ struct pxafb_mach_info { 


};

void set_pxa_fb_info(struct pxafb_mach_info *hard_pxa_fb_info);

void set_pxa_fb_parent(struct device *parent_dev);

unsigned long pxafb_get_hsync_time(struct device *dev);