diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-08-29 23:01:00 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-08-29 23:01:03 +0300 |
| commit | c888d347acc989ef93e3caf25945ecc2ffc525e9 (patch) | |
| tree | a9acdfd8d45db559ece09914a9d6f6592a460913 /arch | |
| parent | 56fdaf48e78b0b4c8080892524985eba6199af97 (diff) | |
| parent | 37e2d7d23765c3948e21cb361100f1baeb65f4f3 (diff) | |
| download | linux-c888d347acc989ef93e3caf25945ecc2ffc525e9.tar.xz | |
Merge tag 'socfpga_update_for_v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into soc/arm
SoCFPGA mach update for v6.6
- Clean up DT includes in mach-socfpga
* tag 'socfpga_update_for_v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
ARM: socfpga: Explicitly include correct DT includes
Link: https://lore.kernel.org/r/20230823021810.958072-1-dinguyen@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-socfpga/l2_cache.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/ocram.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/pm.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/socfpga.c | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/mach-socfpga/l2_cache.c b/arch/arm/mach-socfpga/l2_cache.c index 99fb95361590..86e011eeb444 100644 --- a/arch/arm/mach-socfpga/l2_cache.c +++ b/arch/arm/mach-socfpga/l2_cache.c @@ -3,7 +3,7 @@ * Copyright Altera Corporation (C) 2016. All rights reserved. */ #include <linux/io.h> -#include <linux/of_platform.h> +#include <linux/of.h> #include <linux/of_address.h> #include "core.h" diff --git a/arch/arm/mach-socfpga/ocram.c b/arch/arm/mach-socfpga/ocram.c index b4d397e834a0..9f1a249debf6 100644 --- a/arch/arm/mach-socfpga/ocram.c +++ b/arch/arm/mach-socfpga/ocram.c @@ -4,10 +4,8 @@ */ #include <linux/delay.h> #include <linux/io.h> -#include <linux/genalloc.h> -#include <linux/module.h> +#include <linux/of.h> #include <linux/of_address.h> -#include <linux/of_platform.h> #include "core.h" diff --git a/arch/arm/mach-socfpga/pm.c b/arch/arm/mach-socfpga/pm.c index 365c0428b21b..ab1c08f971f0 100644 --- a/arch/arm/mach-socfpga/pm.c +++ b/arch/arm/mach-socfpga/pm.c @@ -13,7 +13,9 @@ #include <linux/genalloc.h> #include <linux/init.h> #include <linux/io.h> +#include <linux/of.h> #include <linux/of_platform.h> +#include <linux/platform_device.h> #include <linux/suspend.h> #include <asm/suspend.h> #include <asm/fncpy.h> diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c index 9e4cb2ffd580..4332af2d8b86 100644 --- a/arch/arm/mach-socfpga/socfpga.c +++ b/arch/arm/mach-socfpga/socfpga.c @@ -3,13 +3,11 @@ * Copyright (C) 2012-2015 Altera Corporation */ #include <linux/irqchip.h> +#include <linux/of.h> #include <linux/of_address.h> -#include <linux/of_irq.h> -#include <linux/of_platform.h> #include <linux/reboot.h> #include <linux/reset/socfpga.h> -#include <asm/hardware/cache-l2x0.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/cacheflush.h> |