Commit a3814e55 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Krzysztof Kozlowski
Browse files

ARM: s3c24xx: stop including mach/hardware.h from mach/io.h 



A number of other files rely on mach/map.h to be indirectly
included from mach/io.h through mach/hardware.h.

Reduce this to the minimal plat/map-base.h and add explicit
includes everywhere else.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20200806182059.2431-38-krzk@kernel.org


Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent c38758e3

arch/arm/mach-s3c24xx/common.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/clk/samsung.h>



#include <mach/hardware.h>

#include <mach/map.h>

#include <mach/regs-clock.h>

#include <asm/irq.h>

#include <asm/cacheflush.h>

arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#ifndef GPIO_SAMSUNG_S3C24XX_H

#define GPIO_SAMSUNG_S3C24XX_H



#include <mach/map.h>



/*

 * GPIO sizes for various SoCs:

 *

arch/arm/mach-s3c24xx/include/mach/hardware.h

+0 −7
Original line number Diff line number Diff line
@@ -9,13 +9,6 @@ 
#ifndef __ASM_ARCH_HARDWARE_H

#define __ASM_ARCH_HARDWARE_H



#ifndef __ASSEMBLY__



extern unsigned int s3c2410_modify_misccr(unsigned int clr, unsigned int chg);



#endif /* __ASSEMBLY__ */



#include <linux/sizes.h>

#include <mach/map.h>



#endif /* __ASM_ARCH_HARDWARE_H */

arch/arm/mach-s3c24xx/include/mach/io.h

+1 −2
Original line number Diff line number Diff line
@@ -10,8 +10,7 @@ 
#ifndef __ASM_ARM_ARCH_IO_H

#define __ASM_ARM_ARCH_IO_H



#include <mach/hardware.h>



#include <plat/map-base.h>



/*

 * ISA style IO, for each machine to sort out mappings for,

arch/arm/mach-s3c24xx/include/mach/regs-clock.h

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#ifndef __ASM_ARM_REGS_CLOCK

#define __ASM_ARM_REGS_CLOCK



#include <mach/map.h>



#define S3C2410_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR)



#define S3C2410_PLLVAL(_m,_p,_s) ((_m) << 12 | ((_p) << 4) | ((_s)))

CRA Git | Maintained and supported by SUSTech CRA and CCSE