diff options
| author | LiGang <b41990@freescale.com> | 2012-10-19 13:09:13 +0800 |
|---|---|---|
| committer | LiGang <b41990@freescale.com> | 2012-10-24 09:45:30 +0800 |
| commit | 79ff2f66431a7ecfee98d3ad9cc81dddb4f97fa3 (patch) | |
| tree | b8c09dff3002dd07a5d82a6debc5f586a52f55f5 | |
| parent | 7fef39c21d21060a35831eb2ec8010e9adf9000d (diff) | |
ENGR00230371-01 Add HDMI resolution select feature
Kernel need to pass the panel type to android framework via node
fsl_disp_dev_property.
Signed-off-by: LiGang <b41990@freescale.com>
| -rw-r--r-- | drivers/video/mxc/mxc_elcdif_fb.c | 14 | ||||
| -rw-r--r-- | include/linux/fsl_devices.h | 1 |
2 files changed, 14 insertions, 1 deletions
diff --git a/drivers/video/mxc/mxc_elcdif_fb.c b/drivers/video/mxc/mxc_elcdif_fb.c index a3500c73ed5f..7475bfbd2c9e 100644 --- a/drivers/video/mxc/mxc_elcdif_fb.c +++ b/drivers/video/mxc/mxc_elcdif_fb.c @@ -1303,7 +1303,17 @@ static int mxc_elcdif_fb_unmap_video_memory(struct fb_info *fbi) static ssize_t show_disp_dev(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "elcd");; + if (dev) { + char *panel_type = dev->platform_data; + + if (panel_type) + return sprintf(buf, "%s", panel_type); + else + return sprintf(buf, "elcd default"); + } else { + dev_err(dev, "%s[%s], none dev\n", __FILE__, __func__); + return 0; + } } static DEVICE_ATTR(fsl_disp_dev_property, S_IRUGO, show_disp_dev, NULL); @@ -1486,6 +1496,8 @@ static int mxc_elcdif_fb_probe(struct platform_device *pdev) platform_set_drvdata(pdev, fbi); + fbi->dev->platform_data = pdata->panel_type; + ret = device_create_file(fbi->dev, &dev_attr_fsl_disp_dev_property); if (ret) dev_err(&pdev->dev, "Error %d on creating file for disp " diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index ab22c4a9472e..a9afbb347c94 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -247,6 +247,7 @@ struct mxc_fb_platform_data { int num_modes; char *mode_str; u32 interface_pix_fmt; + char *panel_type; }; struct fsl_mxc_lcd_platform_data { |