diff options
| author | Oliver Brown <oliver.brown@freescale.com> | 2015-07-17 08:04:18 -0500 |
|---|---|---|
| committer | Oliver Brown <oliver.brown@freescale.com> | 2015-08-05 09:22:26 -0500 |
| commit | c77f07c388aff73e210a171c07d13fa09814f304 (patch) | |
| tree | 72849fcec13c64e96b3fe9dff0649920e4e83ed9 | |
| parent | c508d4b304394aafab45541e2c0ed5d943cc426f (diff) | |
MLK-11260 [EPDC]: Move the EPDC firmware to /lib/firmware/imx/epdc
Moving the EPDC firmware to /lib/firmware/imx/epdc.
Signed-off-by: Oliver Brown <oliver.brown@freescale.com>
| -rw-r--r-- | drivers/video/mxc/mxc_epdc_fb.c | 6 | ||||
| -rw-r--r-- | drivers/video/mxc/mxc_epdc_v2_fb.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/mxc/mxc_epdc_fb.c b/drivers/video/mxc/mxc_epdc_fb.c index 472f726e4579..89bb60761663 100644 --- a/drivers/video/mxc/mxc_epdc_fb.c +++ b/drivers/video/mxc/mxc_epdc_fb.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2014 Freescale Semiconductor, Inc. + * Copyright (C) 2010-2015 Freescale Semiconductor, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -4288,7 +4288,7 @@ static void mxc_epdc_fb_fw_handler(const struct firmware *fw, "Can't find firmware. Trying fallback fw\n"); fb_data->fw_default_load = true; ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, - "imx/epdc.fw", fb_data->dev, GFP_KERNEL, fb_data, + "imx/epdc/epdc.fw", fb_data->dev, GFP_KERNEL, fb_data, mxc_epdc_fb_fw_handler); if (ret) dev_err(fb_data->dev, @@ -4413,7 +4413,7 @@ static int mxc_epdc_fb_init_hw(struct fb_info *info) * Format is "imx/epdc_[panel string].fw" */ if (fb_data->cur_mode) { - strcat(fb_data->fw_str, "imx/epdc_"); + strcat(fb_data->fw_str, "imx/epdc/epdc_"); strcat(fb_data->fw_str, fb_data->cur_mode->vmode->name); strcat(fb_data->fw_str, ".fw"); } diff --git a/drivers/video/mxc/mxc_epdc_v2_fb.c b/drivers/video/mxc/mxc_epdc_v2_fb.c index da02c9f23df4..68a39b805a01 100644 --- a/drivers/video/mxc/mxc_epdc_v2_fb.c +++ b/drivers/video/mxc/mxc_epdc_v2_fb.c @@ -4694,7 +4694,7 @@ static void mxc_epdc_fb_fw_handler(const struct firmware *fw, "Can't find firmware. Trying fallback fw\n"); fb_data->fw_default_load = true; ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, - "imx/epdc.fw", fb_data->dev, GFP_KERNEL, fb_data, + "imx/epdc/epdc.fw", fb_data->dev, GFP_KERNEL, fb_data, mxc_epdc_fb_fw_handler); if (ret) dev_err(fb_data->dev, @@ -4832,10 +4832,10 @@ static int mxc_epdc_fb_init_hw(struct fb_info *info) /* * Create fw search string based on ID string in selected videomode. - * Format is "imx/epdc_[panel string].fw" + * Format is "imx/epdc/epdc_[panel string].fw" */ if (fb_data->cur_mode) { - strcat(fb_data->fw_str, "imx/epdc_"); + strcat(fb_data->fw_str, "imx/epdc/epdc_"); strcat(fb_data->fw_str, fb_data->cur_mode->vmode->name); strcat(fb_data->fw_str, ".fw"); } |