tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Arnd Bergmann c888d347 56fdaf48

+5 -7
+1 -1
arch/arm/mach-socfpga/l2_cache.c
··· 3 3 * Copyright Altera Corporation (C) 2016. All rights reserved. 4 4 */ 5 5 #include <linux/io.h> 6 - #include <linux/of_platform.h> 6 + #include <linux/of.h> 7 7 #include <linux/of_address.h> 8 8 9 9 #include "core.h"
+1 -3
arch/arm/mach-socfpga/ocram.c
··· 4 4 */ 5 5 #include <linux/delay.h> 6 6 #include <linux/io.h> 7 - #include <linux/genalloc.h> 8 - #include <linux/module.h> 7 + #include <linux/of.h> 9 8 #include <linux/of_address.h> 10 - #include <linux/of_platform.h> 11 9 12 10 #include "core.h" 13 11
+2
arch/arm/mach-socfpga/pm.c
··· 13 13 #include <linux/genalloc.h> 14 14 #include <linux/init.h> 15 15 #include <linux/io.h> 16 + #include <linux/of.h> 16 17 #include <linux/of_platform.h> 18 + #include <linux/platform_device.h> 17 19 #include <linux/suspend.h> 18 20 #include <asm/suspend.h> 19 21 #include <asm/fncpy.h>
+1 -3
arch/arm/mach-socfpga/socfpga.c
··· 3 3 * Copyright (C) 2012-2015 Altera Corporation 4 4 */ 5 5 #include <linux/irqchip.h> 6 + #include <linux/of.h> 6 7 #include <linux/of_address.h> 7 - #include <linux/of_irq.h> 8 - #include <linux/of_platform.h> 9 8 #include <linux/reboot.h> 10 9 #include <linux/reset/socfpga.h> 11 10 12 - #include <asm/hardware/cache-l2x0.h> 13 11 #include <asm/mach/arch.h> 14 12 #include <asm/mach/map.h> 15 13 #include <asm/cacheflush.h>