fimc-is: Set correct paths to firmware files

fimc-is-ois: correct sd card path
fimc-is: change firmware path to /lib/firmware to avoid confusion

Change-Id: I198cdc58c1464a963a8ca23875f7c9ae38175b13
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-companion.h b/drivers/media/platform/exynos/fimc-is/fimc-is-companion.h
index 3de736d626002e94caceecce4f9f1deaecb2c4e9..29885c49a43c74db1d0f7134b41262b6826e3624 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-companion.h
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-companion.h
@@ -21,7 +21,7 @@
 
 #define CRC_RETRY_COUNT         40
 
-#define FIMC_IS_ISP_CV "/data/ISP_CV"
+#define FIMC_IS_ISP_CV "/lib/firmware/ISP_CV"
 
 enum dcdc_vendor{
        DCDC_VENDOR_NONE = 0,

diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-device-ois.c b/drivers/media/platform/exynos/fimc-is/fimc-is-device-ois.c
index 1cf4f4503c0acf8c46ec591404ab4b896b3ae345..7e375e7ad82ea0a8468bd2656ef841fbaa5d9298 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-device-ois.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-device-ois.c
@@ -39,7 +39,7 @@
 #include "fimc-is-device-ois.h"
 #include "fimc-is-device-af.h"
 
-#define FIMC_IS_OIS_SDCARD_PATH                "/data/media/0/"
+#define FIMC_IS_OIS_SDCARD_PATH                "/tmp/"
 #define FIMC_IS_OIS_DEV_NAME           "exynos-fimc-is-ois"
 #define FIMC_OIS_FW_NAME_SEC           "fimc_is_ois_63B.bin"
 #define FIMC_OIS_FW_NAME_DOM           "fimc_is_ois_63A.bin"

diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.c b/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.c
index 2342ee40be72358411b36203ef06e338cb5c4b5d..ef8e16b4954bbb5f83894618f2a3d20555d97b74 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.c
@@ -602,20 +602,20 @@ crc_retry:
 
        old_fs = get_fs();
        set_fs(KERNEL_DS);
-       key_fp = filp_open("/data/media/0/1q2w3e4r.key", O_RDONLY, 0);
+       key_fp = filp_open("/lib/firmware/1q2w3e4r.key", O_RDONLY, 0);
        if (IS_ERR(key_fp)) {
                pr_info("KEY does not exist.\n");
                key_fp = NULL;
                goto key_err;
        } else {
-               dump_fp = filp_open("/data/media/0/dump", O_RDONLY, 0);
+               dump_fp = filp_open("/tmp/dump", O_RDONLY, 0);
                if (IS_ERR(dump_fp)) {
                        pr_info("dump folder does not exist.\n");
                        dump_fp = NULL;
                        goto key_err;
                } else {
                        pr_info("dump folder exist, Dump FROM cal data.\n");
-                       if (write_data_to_file("/data/media/0/dump/from_cal.bin", cal_buf, FIMC_IS_DUMP_CAL_SIZE, &pos) < 0) {
+                       if (write_data_to_file("/lib/firmware/from_cal.bin", cal_buf, FIMC_IS_DUMP_CAL_SIZE, &pos) < 0) {
                                pr_info("Failedl to dump cal data.\n");
                                goto dump_err;
                        }

diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.h b/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.h
index 3b84c7efffb2560d493c67fd7594fc3138fc1427..8c2a0bde94f175f8abb7acad739ebd1e92a59050 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.h
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.h
@@ -86,7 +86,7 @@
 #define FW_2P3         "J16LL"
 
 #define SDCARD_FW
-#define FIMC_IS_SETFILE_SDCARD_PATH            "/data/media/0/"
+#define FIMC_IS_SETFILE_SDCARD_PATH            "/tmp/"
 #define FIMC_IS_FW                             "fimc_is_fw2.bin"
 #define FIMC_IS_FW_2P2                         "fimc_is_fw2_2p2.bin"
 #define FIMC_IS_FW_2P2_12M                             "fimc_is_fw2_2p2_12m.bin"
@@ -100,7 +100,7 @@
 #define FIMC_IS_FW_COMPANION_2P2_EVT1                          "companion_fw_2p2_evt1.bin"
 #define FIMC_IS_FW_COMPANION_2P2_12M_EVT1                              "companion_fw_2p2_12m_evt1.bin"
 #define FIMC_IS_FW_COMPANION_IMX240_EVT1                               "companion_fw_imx240_evt1.bin"
-#define FIMC_IS_FW_SDCARD                      "/data/media/0/fimc_is_fw2.bin"
+#define FIMC_IS_FW_SDCARD                      "/tmp/fimc_is_fw2.bin"
 #define FIMC_IS_IMX240_SETF                    "setfile_imx240.bin"
 #define FIMC_IS_IMX135_SETF                    "setfile_imx135.bin"
 #define FIMC_IS_IMX134_SETF                    "setfile_imx134.bin"
@@ -120,16 +120,16 @@
 #define FIMC_IS_COMPANION_IMX240_MODE_SETF                     "companion_imx240_mode_setfile.bin"
 #define FIMC_IS_COMPANION_2P2_12M_MASTER_SETF                  "companion_2p2_12m_master_setfile.bin"
 #define FIMC_IS_COMPANION_2P2_12M_MODE_SETF                    "companion_2p2_12m_mode_setfile.bin"
-#define FIMC_IS_FW_PATH                                "/system/vendor/firmware/"
-#define FIMC_IS_FW_DUMP_PATH           "/data/"
+#define FIMC_IS_FW_PATH                                "/lib/firmware/"
+#define FIMC_IS_FW_DUMP_PATH           "/tmp/"
 
 #define FIMC_IS_FW_BASE_MASK                   ((1 << 26) - 1)
 #define FIMC_IS_VERSION_SIZE                   42
 #define FIMC_IS_SETFILE_VER_OFFSET             0x40
 #define FIMC_IS_SETFILE_VER_SIZE               52
 
-#define FIMC_IS_CAL_SDCARD                     "/data/cal_data.bin"
-#define FIMC_IS_CAL_SDCARD_FRONT                       "/data/cal_data_front.bin"
+#define FIMC_IS_CAL_SDCARD                     "/lib/firmware/cal_data.bin"
+#define FIMC_IS_CAL_SDCARD_FRONT                       "/lib/firmware/cal_data_front.bin"
 
 /*#define FIMC_IS_MAX_CAL_SIZE                 (20 * 1024)*/
 #define FIMC_IS_MAX_FW_SIZE                    (2048 * 1024)