From b0824932575763fb0c32f7ecb372aa81c2d2a229 Mon Sep 17 00:00:00 2001
From: Stephen Wolfe <swolfe@nvidia.com>
Date: Tue, 24 Jul 2018 14:11:29 -0700
Subject: trusty: k4.14 porting

address K4.14 trusty driver build fixes

Bug 200422831

Change-Id: I96d41f3eab3a95979a387df009adc503ec0f49c2
Signed-off-by: Stephen Wolfe <swolfe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1787793
Reviewed-by: Mahesh Lagadapati <mlagadapati@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 include/linux/trusty/trusty.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'include/linux')

diff --git a/include/linux/trusty/trusty.h b/include/linux/trusty/trusty.h
index 096608e24..f1cca78dd 100644
--- a/include/linux/trusty/trusty.h
+++ b/include/linux/trusty/trusty.h
@@ -19,7 +19,12 @@
 #include <linux/trusty/sm_err.h>
 #include <linux/device.h>
 #include <linux/pagemap.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
+#include <soc/tegra/chip-id.h>
+#else
 #include <linux/tegra-soc.h>
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) */
 
 enum {
 	TRUSTY_DEV_UNINIT = -1,
-- 
cgit v1.2.2