From 753583f1e3e5e36e24c3275e5783c638b86d2fc4 Mon Sep 17 00:00:00 2001
From: Jon Hunter <jonathanh@nvidia.com>
Date: Mon, 22 Jan 2024 12:15:10 +0000
Subject: [PATCH] misc: mods: Fix headers for Linux v6.8

For Linux v6.8, commit ef175b29a242 ("of: Stop circularly including
of_device.h and of_platform.h") updated the OF headers included by these
header files. This breaks the build for various drivers and so fix this
by including the headers that are actually needed for each driver.

Bug 4448428

Change-Id: Ifb484189524a3ec86aa252e71b4489f4dba5aacd
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3059458
(cherry picked from commit 0899829704aa6946dbdf1bb69d1ac37528f93ca5)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3063002
Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
---
 drivers/misc/mods/mods_irq.c      | 5 ++---
 drivers/misc/mods/mods_smmu_drv.c | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/misc/mods/mods_irq.c b/drivers/misc/mods/mods_irq.c
index 15b35fd6..4838b94c 100644
--- a/drivers/misc/mods/mods_irq.c
+++ b/drivers/misc/mods/mods_irq.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* SPDX-FileCopyrightText: Copyright (c) 2008-2023, NVIDIA CORPORATION.  All rights reserved. */
+/* SPDX-FileCopyrightText: Copyright (c) 2008-2024, NVIDIA CORPORATION.  All rights reserved. */
 
 #include "mods_internal.h"
 
@@ -8,11 +8,10 @@
 #include <linux/interrupt.h>
 #include <linux/pci_regs.h>
 #if defined(MODS_HAS_TEGRA) && defined(CONFIG_OF) && defined(CONFIG_OF_IRQ)
-#include <linux/of.h>
 #include <linux/of_irq.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
-#include <linux/of_device.h>
+#include <linux/of_platform.h>
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
 #endif
diff --git a/drivers/misc/mods/mods_smmu_drv.c b/drivers/misc/mods/mods_smmu_drv.c
index c7a73fa5..ac062633 100644
--- a/drivers/misc/mods/mods_smmu_drv.c
+++ b/drivers/misc/mods/mods_smmu_drv.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* SPDX-FileCopyrightText: Copyright (c) 2019-2023, NVIDIA CORPORATION.  All rights reserved. */
+/* SPDX-FileCopyrightText: Copyright (c) 2019-2024, NVIDIA CORPORATION.  All rights reserved. */
 
 #include <linux/kernel.h>
 #include <linux/device.h>
@@ -12,8 +12,8 @@
 #include <linux/version.h>
 #include <linux/dma-buf.h>
 
-#include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/platform_device.h>
 #include <linux/acpi.h>
 #include "mods_internal.h"