Patchwork ARM: imx: platform-imx-fb: modifies platform device name

login
register
mail settings
Submitter Gwenhael Goavec-Merou
Date Jan. 13, 2013, 3:56 p.m.
Message ID <1358092603-13480-1-git-send-email-gwenhael.goavec-merou@armadeus.com>
Download mbox | patch
Permalink /patch/211636/
State New
Headers show

Comments

Gwenhael Goavec-Merou - Jan. 13, 2013, 3:56 p.m.
From: Gwenhael Goavec-Merou <gwe@trabucayre.com>

Framebuffer platform device is now identified by a device id (imx1-fb or
imx21-fb) instead of by driver name (imx-fb).

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
---
 arch/arm/mach-imx/devices/platform-imx-fb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Shawn Guo - Jan. 14, 2013, 12:37 a.m.
On Sun, Jan 13, 2013 at 04:56:43PM +0100, Gwenhael Goavec-Merou wrote:
> From: Gwenhael Goavec-Merou <gwe@trabucayre.com>
> 
> The devtype field for fbi (struct imxfb_info) must be set after memset call to
> avoid some wrong behaviour (pixel size).
> 
> Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>

Gwenhael,

Thanks for fixing the problems left from patch e69dc9a (video: imxfb:
remove cpu_is_xxx by using platform_device_id).

Considering the absence of FB maintainer, I will send both patches
through arm-soc tree for -rc.  But since it's still a FB patch,
I changed the patch prefix to "video: imxfb: ...".

Shawn

Patch

diff --git a/arch/arm/mach-imx/devices/platform-imx-fb.c b/arch/arm/mach-imx/devices/platform-imx-fb.c
index 10b0ed3..25a47c6 100644
--- a/arch/arm/mach-imx/devices/platform-imx-fb.c
+++ b/arch/arm/mach-imx/devices/platform-imx-fb.c
@@ -54,7 +54,7 @@  struct platform_device *__init imx_add_imx_fb(
 			.flags = IORESOURCE_IRQ,
 		},
 	};
-	return imx_add_platform_device_dmamask("imx-fb", 0,
+	return imx_add_platform_device_dmamask(data->devid, 0,
 			res, ARRAY_SIZE(res),
 			pdata, sizeof(*pdata), DMA_BIT_MASK(32));
 }