From 233a7eb320eb9cfe1c99b620f3ba07a282f3a19f Mon Sep 17 00:00:00 2001
From: Jon Hunter <jonathanh@nvidia.com>
Date: Mon, 11 Dec 2023 11:57:22 -0800
Subject: [PATCH] drivers: Fix missing 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: Ia40ab13f865d5631c96855ecc49145848f99c996
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3032442
(cherry picked from commit ab65399274c85e1be3e2347125e76be9f4268e6b)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3063003
Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
---
 drivers/crypto/tegra-hv-vse-safety.c          | 4 ++--
 drivers/gpu/drm/tegra/dc.c                    | 1 +
 drivers/gpu/drm/tegra/dpaux.c                 | 1 +
 drivers/gpu/drm/tegra/gr2d.c                  | 1 +
 drivers/gpu/drm/tegra/hub.c                   | 2 +-
 drivers/gpu/host1x-fence/dev.c                | 5 +++--
 drivers/gpu/host1x/context.c                  | 4 ++--
 drivers/gpu/host1x/dev.c                      | 2 +-
 drivers/pci/controller/tegra-pcie-edma.c      | 3 ++-
 drivers/platform/tegra/dce/dce-module.c       | 7 ++-----
 drivers/platform/tegra/mce/tegra23x-mce.c     | 4 ++--
 drivers/platform/tegra/psc/psc_debug.c        | 4 ++--
 drivers/platform/tegra/tegra-cactmon-mc-all.c | 5 +++--
 drivers/ras/arm64-ras.c                       | 6 ++++--
 drivers/soc/tegra/fuse/kfuse.c                | 3 ++-
 drivers/spi/spi-aurix-tegra.c                 | 4 ++--
 drivers/video/tegra/nvmap/nvmap_init.c        | 5 ++---
 drivers/video/tegra/tsec/tsec_linux.h         | 4 ++--
 sound/soc/tegra-virt-alt/tegra_virt_ref_alt.c | 4 ++--
 19 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/drivers/crypto/tegra-hv-vse-safety.c b/drivers/crypto/tegra-hv-vse-safety.c
index 22331f02..3517b0d1 100644
--- a/drivers/crypto/tegra-hv-vse-safety.c
+++ b/drivers/crypto/tegra-hv-vse-safety.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2019-2023, NVIDIA Corporation. All Rights Reserved.
+ * Copyright (c) 2019-2024, NVIDIA Corporation. All Rights Reserved.
  *
  * Cryptographic API.
  */
@@ -15,8 +15,8 @@
 #include <linux/dma-mapping.h>
 #include <linux/hw_random.h>
 #include <linux/io.h>
-#include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/of_platform.h>
 #include <linux/mutex.h>
 #include <linux/types.h>
 #include <linux/errno.h>
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index 3ca7e0f5..4d10dfe4 100644
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -14,6 +14,7 @@
 #include <linux/interconnect.h>
 #include <linux/module.h>
 #include <linux/of_device.h>
+#include <linux/platform_device.h>
 #include <linux/pm_domain.h>
 #include <linux/pm_opp.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/gpu/drm/tegra/dpaux.c b/drivers/gpu/drm/tegra/dpaux.c
index 81ff3c99..fb45477e 100644
--- a/drivers/gpu/drm/tegra/dpaux.c
+++ b/drivers/gpu/drm/tegra/dpaux.c
@@ -11,6 +11,7 @@
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/of_device.h>
+#include <linux/platform_device.h>
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinmux.h>
diff --git a/drivers/gpu/drm/tegra/gr2d.c b/drivers/gpu/drm/tegra/gr2d.c
index c6db15c7..a5131eaf 100644
--- a/drivers/gpu/drm/tegra/gr2d.c
+++ b/drivers/gpu/drm/tegra/gr2d.c
@@ -8,6 +8,7 @@
 #include <linux/iommu.h>
 #include <linux/module.h>
 #include <linux/of_device.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/reset.h>
 
diff --git a/drivers/gpu/drm/tegra/hub.c b/drivers/gpu/drm/tegra/hub.c
index 9b2dd9df..9ba941a4 100644
--- a/drivers/gpu/drm/tegra/hub.c
+++ b/drivers/gpu/drm/tegra/hub.c
@@ -8,9 +8,9 @@
 #include <linux/dma-mapping.h>
 #include <linux/host1x-next.h>
 #include <linux/module.h>
-#include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_graph.h>
+#include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/reset.h>
diff --git a/drivers/gpu/host1x-fence/dev.c b/drivers/gpu/host1x-fence/dev.c
index e37c6a3c..01c83f57 100644
--- a/drivers/gpu/host1x-fence/dev.c
+++ b/drivers/gpu/host1x-fence/dev.c
@@ -2,7 +2,7 @@
 /*
  * Host1x fence UAPI
  *
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.  All rights reserved.
  */
 
 #include <nvidia/conftest.h>
@@ -14,7 +14,8 @@
 #include <linux/host1x-next.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
 #include <linux/poll.h>
 #include <linux/slab.h>
 #include <linux/sync_file.h>
diff --git a/drivers/gpu/host1x/context.c b/drivers/gpu/host1x/context.c
index bdb05fb0..a3c9c489 100644
--- a/drivers/gpu/host1x/context.c
+++ b/drivers/gpu/host1x/context.c
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2021, NVIDIA Corporation.
+ * Copyright (c) 2021-2024, NVIDIA Corporation.
  */
 
 #include <linux/device.h>
 #include <linux/kref.h>
 #include <linux/of.h>
-#include <linux/of_platform.h>
+#include <linux/of_device.h>
 #include <linux/pid.h>
 #include <linux/slab.h>
 
diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
index 9b1bb1e4..8919d73e 100644
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -13,8 +13,8 @@
 #include <linux/io.h>
 #include <linux/list.h>
 #include <linux/module.h>
-#include <linux/of_device.h>
 #include <linux/of.h>
+#include <linux/of_platform.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 
diff --git a/drivers/pci/controller/tegra-pcie-edma.c b/drivers/pci/controller/tegra-pcie-edma.c
index 78768836..17efa5d8 100644
--- a/drivers/pci/controller/tegra-pcie-edma.c
+++ b/drivers/pci/controller/tegra-pcie-edma.c
@@ -2,7 +2,7 @@
 /*
  * PCIe EDMA Library Framework
  *
- * Copyright (C) 2021-2023 NVIDIA Corporation. All rights reserved.
+ * Copyright (C) 2021-2024 NVIDIA Corporation. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -11,6 +11,7 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/of_platform.h>
+#include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/tegra-pcie-edma.h>
diff --git a/drivers/platform/tegra/dce/dce-module.c b/drivers/platform/tegra/dce/dce-module.c
index 5fce7704..6a538d34 100644
--- a/drivers/platform/tegra/dce/dce-module.c
+++ b/drivers/platform/tegra/dce/dce-module.c
@@ -1,16 +1,13 @@
+// SPDX-FileCopyrightText: Copyright (c) 2019-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 // SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2019-2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
- */
 
 #include <dce.h>
-#include <linux/of.h>
 #include <linux/module.h>
-#include <linux/of_irq.h>
 #include <linux/interrupt.h>
 #include <linux/of_device.h>
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
+#include <linux/platform_device.h>
 #include <linux/device.h>
 
 /**
diff --git a/drivers/platform/tegra/mce/tegra23x-mce.c b/drivers/platform/tegra/mce/tegra23x-mce.c
index 9b56418d..29b838a0 100644
--- a/drivers/platform/tegra/mce/tegra23x-mce.c
+++ b/drivers/platform/tegra/mce/tegra23x-mce.c
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0
-// Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 #include <linux/cpumask.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/of_device.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/debugfs.h>
 #include <asm/cputype.h>
diff --git a/drivers/platform/tegra/psc/psc_debug.c b/drivers/platform/tegra/psc/psc_debug.c
index 4174e614..4d04acdb 100644
--- a/drivers/platform/tegra/psc/psc_debug.c
+++ b/drivers/platform/tegra/psc/psc_debug.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0
-// Copyright (c) 2020-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// Copyright (c) 2020-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
 #include <linux/ioctl.h>
 #include <linux/types.h>
-#include <linux/of_platform.h>
+#include <linux/platform_device.h>
 #include <linux/mailbox_client.h>
 #include <linux/debugfs.h>
 #include <linux/fs.h>
diff --git a/drivers/platform/tegra/tegra-cactmon-mc-all.c b/drivers/platform/tegra/tegra-cactmon-mc-all.c
index 3b57c168..49d50c1c 100644
--- a/drivers/platform/tegra/tegra-cactmon-mc-all.c
+++ b/drivers/platform/tegra/tegra-cactmon-mc-all.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (C) 2023 NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (C) 2023-2024 NVIDIA CORPORATION.  All rights reserved.
  */
 
 #include <linux/clk.h>
@@ -9,7 +9,8 @@
 #include <linux/fs.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/of_device.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
 #include <linux/types.h>
 
 #define	CENTRAL_ACTMON_CTRL_REG			0x0
diff --git a/drivers/ras/arm64-ras.c b/drivers/ras/arm64-ras.c
index 52124fd8..28f4406d 100644
--- a/drivers/ras/arm64-ras.c
+++ b/drivers/ras/arm64-ras.c
@@ -1,11 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0
-// Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
+// Copyright (c) 2022-2024, NVIDIA CORPORATION.  All rights reserved.
 
 #include <linux/module.h>
 #include <linux/interrupt.h>
+#include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
 #include <linux/arm64-ras.h>
-#include <linux/of_irq.h>
 #include <linux/cpuhotplug.h>
 
 static int fhi_irq[CONFIG_NR_CPUS];
diff --git a/drivers/soc/tegra/fuse/kfuse.c b/drivers/soc/tegra/fuse/kfuse.c
index 8780c666..857648da 100644
--- a/drivers/soc/tegra/fuse/kfuse.c
+++ b/drivers/soc/tegra/fuse/kfuse.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-// Copyright (C) 2022 NVIDIA CORPORATION. All rights reserved.
+// Copyright (C) 2022-2024 NVIDIA CORPORATION. All rights reserved.
 
 /* The kfuse block stores downstream and upstream HDCP keys for use by HDMI
  * module.
@@ -14,6 +14,7 @@
 #include <linux/clk.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/of.h>
 #include <linux/of_device.h>
 #include <soc/tegra/fuse.h>
 #include <soc/tegra/kfuse.h>
diff --git a/drivers/spi/spi-aurix-tegra.c b/drivers/spi/spi-aurix-tegra.c
index f9b91280..d3befb9e 100644
--- a/drivers/spi/spi-aurix-tegra.c
+++ b/drivers/spi/spi-aurix-tegra.c
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0
-// Copyright (c) 2022-2023, NVIDIA CORPORATION.  All rights reserved.
+// Copyright (c) 2022-2024, NVIDIA CORPORATION.  All rights reserved.
 
 #include <nvidia/conftest.h>
 
 #include <linux/kthread.h>
 #include <linux/module.h>
-#include <linux/of_device.h>
+#include <linux/of.h>
 #include <linux/spi/spi.h>
 //#include <soc/tegra/virt/tegra_hv_pm_ctl.h>
 #include <linux/version.h>
diff --git a/drivers/video/tegra/nvmap/nvmap_init.c b/drivers/video/tegra/nvmap/nvmap_init.c
index dd36eebd..0cbf8a4d 100644
--- a/drivers/video/tegra/nvmap/nvmap_init.c
+++ b/drivers/video/tegra/nvmap/nvmap_init.c
@@ -1,14 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2014-2023, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2014-2024, NVIDIA CORPORATION. All rights reserved.
  */
 
 #define pr_fmt(fmt) "%s: " fmt, __func__
 
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/of_fdt.h>
-#include <linux/of_platform.h>
+#include <linux/of_device.h>
 #include <linux/nvmap.h>
 #include <linux/version.h>
 #include <linux/kmemleak.h>
diff --git a/drivers/video/tegra/tsec/tsec_linux.h b/drivers/video/tegra/tsec/tsec_linux.h
index e3624c35..ed22d08b 100644
--- a/drivers/video/tegra/tsec/tsec_linux.h
+++ b/drivers/video/tegra/tsec/tsec_linux.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.  All rights reserved.
  *
  * Tegra TSEC Module Support
  */
@@ -10,7 +10,7 @@
 
 #include <linux/types.h>                   /* for types like u8, u32 etc */
 #include <linux/platform_device.h>         /* for platform_device */
-#include <linux/of_platform.h>             /* for of_match_device etc */
+#include <linux/of_device.h>               /* for of_match_device etc */
 #include <linux/slab.h>                    /* for kzalloc */
 #include <linux/delay.h>                   /* for udelay */
 #include <linux/clk.h>                     /* for clk_prepare_enable */
diff --git a/sound/soc/tegra-virt-alt/tegra_virt_ref_alt.c b/sound/soc/tegra-virt-alt/tegra_virt_ref_alt.c
index aeeb19b9..f0bd6166 100644
--- a/sound/soc/tegra-virt-alt/tegra_virt_ref_alt.c
+++ b/sound/soc/tegra-virt-alt/tegra_virt_ref_alt.c
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2021-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * Copyright (c) 2021-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
 
 #include <nvidia/conftest.h>
 
 #include <linux/module.h>
 #include <linux/version.h>
-#include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>