[9610][7885][7872][7570] wlbt: add additional release counter

Add another decimal point to describe the downstream patch
level.

Change-Id: Ia913a2bb89236878e6d13a823855f7ea0411ba1f
SCSC-Bug-Id: SSB-41599
Signed-off-by: Ivan Priest <i.priest@samsung.com>

diff --git a/drivers/misc/samsung/scsc/mxman.c b/drivers/misc/samsung/scsc/mxman.c
index bfaf6636a2b873c70d76c7eacead48e3505322d4..daf53b008b20b6d725a1119860ae0d0e2c5152a1 100755 (executable)
--- a/drivers/misc/samsung/scsc/mxman.c
+++ b/drivers/misc/samsung/scsc/mxman.c
@@ -367,8 +367,8 @@ static void write_m_test_fw_version_file(struct mxman *mxman)
                SCSC_TAG_INFO(MXMAN, "%s doesn't exist.\n", filepath);
                return;
        }
-       snprintf(buf, sizeof(buf), "drv_ver: %d.%d.%d N (f/w: %s)\n",
-                SCSC_RELEASE_PRODUCT, SCSC_RELEASE_ITERATION, SCSC_RELEASE_CANDIDATE,
+       snprintf(buf, sizeof(buf), "drv_ver: %d.%d.%d.%d N (f/w: %s)\n",
+                SCSC_RELEASE_PRODUCT, SCSC_RELEASE_ITERATION, SCSC_RELEASE_CANDIDATE, SCSC_RELEASE_POINT,
                 build_id ? build_id : "unknown");
 #ifdef CONFIG_SCSC_WLBTD
        scsc_wlbtd_get_and_print_build_type();
@@ -428,8 +428,8 @@ static void mxman_print_versions(struct mxman *mxman)
 
        SCSC_TAG_INFO(MXMAN, "%s", buf);
        SCSC_TAG_INFO(MXMAN, "WLBT FW: %s\n", mxman->fw_build_id);
-       SCSC_TAG_INFO(MXMAN, "WLBT Driver: %d.%d.%d\n",
-               SCSC_RELEASE_PRODUCT, SCSC_RELEASE_ITERATION, SCSC_RELEASE_CANDIDATE);
+       SCSC_TAG_INFO(MXMAN, "WLBT Driver: %d.%d.%d.%d\n",
+               SCSC_RELEASE_PRODUCT, SCSC_RELEASE_ITERATION, SCSC_RELEASE_CANDIDATE, SCSC_RELEASE_POINT);
 #ifdef CONFIG_SCSC_WLBTD
        scsc_wlbtd_get_and_print_build_type();
 #endif
@@ -1267,10 +1267,11 @@ static void mxman_failure_work(struct work_struct *work)
                process_panic_record(mxman);
                SCSC_TAG_INFO(MXMAN, "Trying to schedule coredump\n");
 
-               SCSC_TAG_INFO(MXMAN, "scsc_release %d.%d.%d\n",
+               SCSC_TAG_INFO(MXMAN, "scsc_release %d.%d.%d.%d\n",
                        SCSC_RELEASE_PRODUCT,
                        SCSC_RELEASE_ITERATION,
-                       SCSC_RELEASE_CANDIDATE);
+                       SCSC_RELEASE_CANDIDATE,
+                       SCSC_RELEASE_POINT);
 #ifdef CONFIG_SCSC_WLBTD
                scsc_wlbtd_get_and_print_build_type();
 #endif
@@ -1996,8 +1997,8 @@ EXPORT_SYMBOL(mxman_get_fw_version);
 
 void mxman_get_driver_version(char *version, size_t ver_sz)
 {
-       snprintf(version, ver_sz - 1, "drv_ver: %d.%d.%d",
-                SCSC_RELEASE_PRODUCT, SCSC_RELEASE_ITERATION, SCSC_RELEASE_CANDIDATE);
+       snprintf(version, ver_sz - 1, "drv_ver: %d.%d.%d.%d",
+                SCSC_RELEASE_PRODUCT, SCSC_RELEASE_ITERATION, SCSC_RELEASE_CANDIDATE, SCSC_RELEASE_POINT);
 #ifdef CONFIG_SCSC_WLBTD
        scsc_wlbtd_get_and_print_build_type();
 #endif

diff --git a/drivers/misc/samsung/scsc/mxproc.c b/drivers/misc/samsung/scsc/mxproc.c
index 4d7de78733b16dfff6e23c7573903625b8dcdf84..9ec5a7e1ba5abc9eb22fc82044b36bcc4ac81344 100644 (file)
--- a/drivers/misc/samsung/scsc/mxproc.c
+++ b/drivers/misc/samsung/scsc/mxproc.c
@@ -474,8 +474,8 @@ static ssize_t mx_procfs_mx_release_read(struct file *file, char __user *user_bu
 
        memset(buf, '\0', sizeof(buf));
 
-       bytes = snprintf(buf, sizeof(buf), "Release: %d.%d.%d (f/w: %s)\n",
-               SCSC_RELEASE_PRODUCT, SCSC_RELEASE_ITERATION, SCSC_RELEASE_CANDIDATE,
+       bytes = snprintf(buf, sizeof(buf), "Release: %d.%d.%d.%d (f/w: %s)\n",
+               SCSC_RELEASE_PRODUCT, SCSC_RELEASE_ITERATION, SCSC_RELEASE_CANDIDATE, SCSC_RELEASE_POINT,
                build_id ? build_id : "unknown");
 #ifdef CONFIG_SCSC_WLBTD
        scsc_wlbtd_get_and_print_build_type();

diff --git a/drivers/misc/samsung/scsc/scsc_mx_module.c b/drivers/misc/samsung/scsc/scsc_mx_module.c
index d05a83c459b69c33f2bb6d49ef43727ea9a4d5ff..e11f4c29a1e31ca5368366a9ca36d66e0dcd6779 100755 (executable)
--- a/drivers/misc/samsung/scsc/scsc_mx_module.c
+++ b/drivers/misc/samsung/scsc/scsc_mx_module.c
@@ -102,10 +102,11 @@ static struct scsc_mif_abs_driver mx_module_mif_if = {
 
 static int __init scsc_mx_module_init(void)
 {
-       SCSC_TAG_INFO(MXMAN, SCSC_MX_CORE_MODDESC " scsc_release %d.%d.%d\n",
+       SCSC_TAG_INFO(MXMAN, SCSC_MX_CORE_MODDESC " scsc_release %d.%d.%d.%d\n",
                SCSC_RELEASE_PRODUCT,
                SCSC_RELEASE_ITERATION,
-               SCSC_RELEASE_CANDIDATE);
+               SCSC_RELEASE_CANDIDATE,
+               SCSC_RELEASE_POINT);
 #ifdef CONFIG_SCSC_WLBTD
        scsc_wlbtd_get_and_print_build_type();
 #endif

diff --git a/include/scsc/scsc_release.h b/include/scsc/scsc_release.h
index 63adf7b83962caff9693cf31aed2242e428c3ba7..33a8eed6151bd87ffe11007839424072ae0ab5a0 100644 (file)
--- a/include/scsc/scsc_release.h
+++ b/include/scsc/scsc_release.h
@@ -13,6 +13,7 @@
 #define SCSC_RELEASE_ITERATION 34
 #define SCSC_RELEASE_CANDIDATE 2
 
+#define SCSC_RELEASE_POINT 0
 
 #endif