nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

drivers: Fix missing headers for Linux v6.8

Browse Source 
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 ab65399274)
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>
This commit is contained in:
Jon Hunter
2023-12-11 11:57:22 -08:00
committed by mobile promotions
parent 753583f1e3
commit 233a7eb320
19 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/crypto/tegra-hv-vse-safety.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // 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. * Cryptographic API.
*/ */
@@ -15,8 +15,8 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/hw_random.h> #include <linux/hw_random.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_platform.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/errno.h> #include <linux/errno.h>

1
drivers/gpu/drm/tegra/dc.c
View File

@@ -14,6 +14,7 @@
#include <linux/interconnect.h> #include <linux/interconnect.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/platform_device.h>
#include <linux/pm_domain.h> #include <linux/pm_domain.h>
#include <linux/pm_opp.h> #include <linux/pm_opp.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>

1
drivers/gpu/drm/tegra/dpaux.c
View File

@@ -11,6 +11,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/platform_device.h>
#include <linux/pinctrl/pinconf-generic.h> #include <linux/pinctrl/pinconf-generic.h>
#include <linux/pinctrl/pinctrl.h> #include <linux/pinctrl/pinctrl.h>
#include <linux/pinctrl/pinmux.h> #include <linux/pinctrl/pinmux.h>

1
drivers/gpu/drm/tegra/gr2d.c
View File

@@ -8,6 +8,7 @@
#include <linux/iommu.h> #include <linux/iommu.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/reset.h> #include <linux/reset.h>

2
drivers/gpu/drm/tegra/hub.c
View File

@@ -8,9 +8,9 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/host1x-next.h> #include <linux/host1x-next.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_graph.h> #include <linux/of_graph.h>
#include <linux/of_platform.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/reset.h> #include <linux/reset.h>

5
drivers/gpu/host1x-fence/dev.c
View File

@@ -2,7 +2,7 @@
/* /*
* Host1x fence UAPI * 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> #include <nvidia/conftest.h>
@@ -14,7 +14,8 @@
#include <linux/host1x-next.h> #include <linux/host1x-next.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.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/poll.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/sync_file.h> #include <linux/sync_file.h>

4
drivers/gpu/host1x/context.c
View File

@@ -1,12 +1,12 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2021, NVIDIA Corporation. * Copyright (c) 2021-2024, NVIDIA Corporation.
*/ */
#include <linux/device.h> #include <linux/device.h>
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_platform.h> #include <linux/of_device.h>
#include <linux/pid.h> #include <linux/pid.h>
#include <linux/slab.h> #include <linux/slab.h>

2
drivers/gpu/host1x/dev.c
View File

@@ -13,8 +13,8 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_platform.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/slab.h> #include <linux/slab.h>

3
drivers/pci/controller/tegra-pcie-edma.c
View File

@@ -2,7 +2,7 @@
/* /*
* PCIe EDMA Library Framework * 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> #include <linux/module.h>
@@ -11,6 +11,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/iopoll.h> #include <linux/iopoll.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/tegra-pcie-edma.h> #include <linux/tegra-pcie-edma.h>

7
drivers/platform/tegra/dce/dce-module.c
View File

@@ -1,16 +1,13 @@
// SPDX-FileCopyrightText: Copyright (c) 2019-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2019-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
*/
#include <dce.h> #include <dce.h>
#include <linux/of.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_irq.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/platform_device.h>
#include <linux/device.h> #include <linux/device.h>
/** /**

4
drivers/platform/tegra/mce/tegra23x-mce.c
View File

@@ -1,12 +1,12 @@
// SPDX-License-Identifier: GPL-2.0 // 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/cpumask.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h> #include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <asm/cputype.h> #include <asm/cputype.h>

4
drivers/platform/tegra/psc/psc_debug.c
View File

@@ -1,9 +1,9 @@
// SPDX-License-Identifier: GPL-2.0 // 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/ioctl.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/of_platform.h> #include <linux/platform_device.h>
#include <linux/mailbox_client.h> #include <linux/mailbox_client.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/fs.h> #include <linux/fs.h>

5
drivers/platform/tegra/tegra-cactmon-mc-all.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // 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> #include <linux/clk.h>
@@ -9,7 +9,8 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h> #include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/types.h> #include <linux/types.h>
#define CENTRAL_ACTMON_CTRL_REG 0x0 #define CENTRAL_ACTMON_CTRL_REG 0x0

6
drivers/ras/arm64-ras.c
View File

@@ -1,11 +1,13 @@
// SPDX-License-Identifier: GPL-2.0 // 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/module.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_platform.h>
#include <linux/platform_device.h>
#include <linux/arm64-ras.h> #include <linux/arm64-ras.h>
#include <linux/of_irq.h>
#include <linux/cpuhotplug.h> #include <linux/cpuhotplug.h>
static int fhi_irq[CONFIG_NR_CPUS]; static int fhi_irq[CONFIG_NR_CPUS];

3
drivers/soc/tegra/fuse/kfuse.c
View File

@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only // 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 /* The kfuse block stores downstream and upstream HDCP keys for use by HDMI
* module. * module.
@@ -14,6 +14,7 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <soc/tegra/fuse.h> #include <soc/tegra/fuse.h>
#include <soc/tegra/kfuse.h> #include <soc/tegra/kfuse.h>

4
drivers/spi/spi-aurix-tegra.c
View File

@@ -1,11 +1,11 @@
// SPDX-License-Identifier: GPL-2.0 // 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 <nvidia/conftest.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h> #include <linux/of.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
//#include <soc/tegra/virt/tegra_hv_pm_ctl.h> //#include <soc/tegra/virt/tegra_hv_pm_ctl.h>
#include <linux/version.h> #include <linux/version.h>

5
drivers/video/tegra/nvmap/nvmap_init.c
View File

@@ -1,14 +1,13 @@
// SPDX-License-Identifier: GPL-2.0-only // 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__ #define pr_fmt(fmt) "%s: " fmt, __func__
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_fdt.h> #include <linux/of_device.h>
#include <linux/of_platform.h>
#include <linux/nvmap.h> #include <linux/nvmap.h>
#include <linux/version.h> #include <linux/version.h>
#include <linux/kmemleak.h> #include <linux/kmemleak.h>

4
drivers/video/tegra/tsec/tsec_linux.h
View File

@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* 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 * Tegra TSEC Module Support
*/ */
@@ -10,7 +10,7 @@
#include <linux/types.h> /* for types like u8, u32 etc */ #include <linux/types.h> /* for types like u8, u32 etc */
#include <linux/platform_device.h> /* for platform_device */ #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/slab.h> /* for kzalloc */
#include <linux/delay.h> /* for udelay */ #include <linux/delay.h> /* for udelay */
#include <linux/clk.h> /* for clk_prepare_enable */ #include <linux/clk.h> /* for clk_prepare_enable */

4
sound/soc/tegra-virt-alt/tegra_virt_ref_alt.c
View File

@@ -1,13 +1,13 @@
// SPDX-License-Identifier: GPL-2.0-only // 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 <nvidia/conftest.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/version.h> #include <linux/version.h>
#include <linux/of.h> #include <linux/of_device.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/soc.h> #include <sound/soc.h>