trusty: firmware version registration

Register version string using devm_register_firwmare_version

Bug 2330176
Bug 200489191

Change-Id: I9270920a5f8bacac4eeeb3652747f4eb5fdd557f
Reviewed-on: https://git-master.nvidia.com/r/2092325
(cherry picked from commit ebe5219b6ac45a0a4d99f1a128c2c96faaab3324)
Signed-off-by: dmitry pervushin <dpervushin@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2094365
GVS: Gerrit_Virtual_Submit
Reviewed-by: Rahul Jain (SW-TEGRA) <rahuljain@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 4 insertions, 33 deletions

diff --git a/drivers/platform/tegra/firmwares-all.c b/drivers/platform/tegra/firmwares-all.c
index 28a8ebc32..a0a483371 100644
--- a/drivers/platform/tegra/firmwares-all.c
+++ b/drivers/platform/tegra/firmwares-all.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved.
  *
  * 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
@@ -18,31 +18,6 @@
 #include <linux/cpu.h>
 #include <asm/cpu.h>
 
-#if IS_ENABLED(CONFIG_TRUSTY)
-#include <linux/trusty/trusty.h>
-
-static ssize_t tegrafw_read_trusty(struct device *dev,
-                                char *data, size_t size)
-{
-        const struct of_device_id trusty_of_match[] = {
-                {.compatible = "android,trusty-smc-v1", },
-                {},
-        };
-        struct device_node *dn;
-        struct platform_device *pdev;
-
-        for_each_matching_node(dn, trusty_of_match) {
-                pdev = of_find_device_by_node(dn);
-                if (pdev == NULL)
-                        continue;
-                return snprintf(data, size, "%s",
-                        trusty_version_str_get(&pdev->dev));
-        }
-        snprintf(data, size, "NULL");
-        return 0;
-}
-#endif
-
 static ssize_t tegrafw_read_denver(struct device *dev,
                                 char *version, size_t size)
 {
@@ -83,12 +58,6 @@ static int __init tegra_firmwares_init(void)
         check_out_of_bounds(dev, 0);
         *dev++ = tegrafw_register("MTS", TFW_NORMAL, tegrafw_read_denver, NULL);
 
-#if IS_ENABLED(CONFIG_TRUSTY)
-        check_out_of_bounds(dev, 0);
-        *dev++ = tegrafw_register("trusty", TFW_DONT_CACHE,
-                                tegrafw_read_trusty, NULL);
-#endif
-
         for (v = 0; v < ARRAY_SIZE(versions); v++) {
                 check_out_of_bounds(dev, 0);
                 *dev++ = tegrafw_register_dt_string(versions[v],
diff --git a/drivers/trusty/trusty.c b/drivers/trusty/trusty.c
index 62f897644..cb186381d 100644
--- a/drivers/trusty/trusty.c
+++ b/drivers/trusty/trusty.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2013 Google, Inc.
- * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -26,6 +26,7 @@
 #include <linux/trusty/sm_err.h>
 #include <linux/trusty/trusty.h>
 #include <soc/tegra/virt/syscalls.h>
+#include <linux/tegra-firmwares.h>
 #include "trusty-workitem.h"
 
 struct trusty_state;
@@ -639,6 +640,7 @@ static int trusty_probe(struct platform_device *pdev)
                 goto err_add_children;
         }
 
+        devm_tegrafw_register_string(&pdev->dev, "trusty", s->version_str);
         return 0;
 
 err_add_children: