commit dc744ed2d91635673861a7f5e396a2b6d386d4d5
author Aaron Gamble <jgamble@nvidia.com> Tue Jan 06 12:43:12 2015 -0800
committer jinqian <jinqian@google.com> Tue Jan 20 14:57:13 2015 -0800
tree 6783de6282242731949a8312768503014992f729
parent 428f38f5e8fd1b0795e7bc12b2708f49a1253295

media: tegra: nvavp: Restore keyslots in resume

Use te_restore_keyslots.

Change-Id: I1c809856af7f155bbc858b13845c0e5340713cff
Signed-off-by: Aaron Gamble <jgamble@nvidia.com>
Reviewed-on: http://git-master/r/669845
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Mahesh Lagadapati <mlagadapati@nvidia.com>
Reviewed-by: Hyung Taek Ryoo <hryoo@nvidia.com>
Reviewed-by: Dhiren Parmar <dparmar@nvidia.com>
(cherry picked from commit b273ff2ece3c132e14e4589ee22a064fe4a20913)

drivers/media/platform/tegra/nvavp/nvavp_dev.c

diff --git a/drivers/media/platform/tegra/nvavp/nvavp_dev.c b/drivers/media/platform/tegra/nvavp/nvavp_dev.c
index 48fb4bf..fd415ed 100644
--- a/drivers/media/platform/tegra/nvavp/nvavp_dev.c
+++ b/drivers/media/platform/tegra/nvavp/nvavp_dev.c
@@ -1,7 +1,7 @@
 /*
  * drivers/media/video/tegra/nvavp/nvavp_dev.c
  *
- * Copyright (c) 2011-2014, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2011-2015, NVIDIA CORPORATION.  All rights reserved.
  *
  * This file is licensed under the terms of the GNU General Public License
  * version 2. This program is licensed "as is" without any warranty of any
@@ -55,6 +55,10 @@
 #include <linux/of_address.h>
 #include <linux/tegra-timer.h>
 
+#ifdef CONFIG_TRUSTED_LITTLE_KERNEL
+#include <linux/ote_protocol.h>
+#endif
+
 #if defined(CONFIG_TEGRA_AVP_KERNEL_ON_MMU)
 #include "../avp/headavp.h"
 #endif
@@ -2765,6 +2769,12 @@
 
 	tegra_nvavp_runtime_resume(dev);
 
+#ifdef CONFIG_TRUSTED_LITTLE_KERNEL
+	nvavp_clks_enable(nvavp);
+	te_restore_keyslots();
+	nvavp_clks_disable(nvavp);
+#endif
+
 	return 0;
 }