Skip to content

Commit

Permalink
[ARM] 3011/1: pxafb: Add ability to set device parent + fix spitz com…
Browse files Browse the repository at this point in the history
…pile 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: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Richard Purdie authored and Russell King committed Oct 14, 2005
1 parent cb90d68 commit cb38c56
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
5 changes: 5 additions & 0 deletions arch/arm/mach-pxa/generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/spitz.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
1 change: 1 addition & 0 deletions include/asm-arm/arch-pxa/pxafb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

0 comments on commit cb38c56

Please sign in to comment.