From ceb4b9f02ee5af1756cea548b3dd76b07846bc65 Mon Sep 17 00:00:00 2001
From: Bitan Biswas <bbiswas@nvidia.com>
Date: Fri, 1 May 2020 14:33:35 -0700
Subject: [PATCH] kernel: nvidia: use fuse.h instead of chip-id.h in k5.4

bug 200591811

Change-Id: If72122efdeda154f435f79da8f2cd9cad644d380
Signed-off-by: Bitan Biswas <bbiswas@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2337930
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/platform/tegra/nvadsp/amc.c      | 7 ++++++-
 drivers/platform/tegra/nvadsp/dev-t18x.c | 7 ++++++-
 drivers/platform/tegra/nvadsp/dev.c      | 5 +++++
 drivers/platform/tegra/nvadsp/os-t18x.c  | 5 +++++
 drivers/platform/tegra/nvadsp/os.c       | 5 +++++
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/tegra/nvadsp/amc.c b/drivers/platform/tegra/nvadsp/amc.c
index 7743f509..bbc1a5ab 100644
--- a/drivers/platform/tegra/nvadsp/amc.c
+++ b/drivers/platform/tegra/nvadsp/amc.c
@@ -3,7 +3,7 @@
  *
  * AMC and ARAM handling
  *
- * Copyright (C) 2014-2019, NVIDIA Corporation. All rights reserved.
+ * Copyright (C) 2014-2020, 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
@@ -19,7 +19,12 @@
 #include <linux/tegra_nvadsp.h>
 #include <linux/irqchip/tegra-agic.h>
 #include <linux/interrupt.h>
+#include <linux/version.h>
+#if KERNEL_VERSION(4, 15, 0) > LINUX_VERSION_CODE
 #include <soc/tegra/chip-id.h>
+#else
+#include <soc/tegra/fuse.h>
+#endif
 
 #include "dev.h"
 #include "amc.h"
diff --git a/drivers/platform/tegra/nvadsp/dev-t18x.c b/drivers/platform/tegra/nvadsp/dev-t18x.c
index b64e053d..c3bd9318 100644
--- a/drivers/platform/tegra/nvadsp/dev-t18x.c
+++ b/drivers/platform/tegra/nvadsp/dev-t18x.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, NVIDIA Corporation. All rights reserved.
+ * Copyright (c) 2015-2020, 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
@@ -11,7 +11,12 @@
  * GNU General Public License for more details.
  *
  */
+#include <linux/version.h>
+#if KERNEL_VERSION(4, 15, 0) > LINUX_VERSION_CODE
 #include <soc/tegra/chip-id.h>
+#else
+#include <soc/tegra/fuse.h>
+#endif
 #include <linux/platform_device.h>
 #include <linux/tegra_nvadsp.h>
 #include <linux/reset.h>
diff --git a/drivers/platform/tegra/nvadsp/dev.c b/drivers/platform/tegra/nvadsp/dev.c
index ead43e69..b59e6979 100644
--- a/drivers/platform/tegra/nvadsp/dev.c
+++ b/drivers/platform/tegra/nvadsp/dev.c
@@ -27,7 +27,12 @@
 #include <linux/moduleparam.h>
 #include <linux/io.h>
 #include <linux/tegra_nvadsp.h>
+#include <linux/version.h>
+#if KERNEL_VERSION(4, 15, 0) > LINUX_VERSION_CODE
 #include <soc/tegra/chip-id.h>
+#else
+#include <soc/tegra/fuse.h>
+#endif
 #include <linux/pm_runtime.h>
 #include <linux/version.h>
 #if KERNEL_VERSION(5, 4, 0) > LINUX_VERSION_CODE
diff --git a/drivers/platform/tegra/nvadsp/os-t18x.c b/drivers/platform/tegra/nvadsp/os-t18x.c
index 29f8dd3b..eec5e333 100644
--- a/drivers/platform/tegra/nvadsp/os-t18x.c
+++ b/drivers/platform/tegra/nvadsp/os-t18x.c
@@ -12,7 +12,12 @@
  *
  */
 
+#include <linux/version.h>
+#if KERNEL_VERSION(4, 15, 0) > LINUX_VERSION_CODE
 #include <soc/tegra/chip-id.h>
+#else
+#include <soc/tegra/fuse.h>
+#endif
 #include <linux/platform_device.h>
 #include <linux/tegra_nvadsp.h>
 #include <linux/tegra-hsp.h>
diff --git a/drivers/platform/tegra/nvadsp/os.c b/drivers/platform/tegra/nvadsp/os.c
index 5f4c70c4..129bf6a4 100644
--- a/drivers/platform/tegra/nvadsp/os.c
+++ b/drivers/platform/tegra/nvadsp/os.c
@@ -29,7 +29,12 @@
 #include <linux/dma-mapping.h>
 #include <linux/firmware.h>
 #include <linux/tegra_nvadsp.h>
+#include <linux/version.h>
+#if KERNEL_VERSION(4, 15, 0) > LINUX_VERSION_CODE
 #include <soc/tegra/chip-id.h>
+#else
+#include <soc/tegra/fuse.h>
+#endif
 #include <linux/elf.h>
 #include <linux/device.h>
 #include <linux/clk.h>