Unverified Commit c888d347 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'socfpga_update_for_v6.6' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 56fdaf48 37e2d7d2

arch/arm/mach-socfpga/l2_cache.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

arch/arm/mach-socfpga/ocram.c

+1 −3
Original line number Diff line number Diff line
@@ -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"

arch/arm/mach-socfpga/pm.c

+2 −0
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-socfpga/socfpga.c

+1 −3
Original line number Diff line number Diff line
@@ -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>