Commit 583ddafe authored by Hartley Sweeten's avatar Hartley Sweeten Committed by Russell King
Browse files

[ARM] 5592/1: ep93xx: cleanup platform header includes 



arch/arm/mach-ep93xx/include/mach/hardware.h
  1. Properly name the include files so that they are loaded
     from the <mach/*> directory and not the local directory.
  2. Remove including the ts72xx.h header.  This header is not
     generic to the ep93xx platform.  It should only be included
     by the ts72xx specific files that require it.  The only
     two users in the tree are arch/arm/mach-ep93xx/ts72xx.c
     and drivers/mtd/nand/ts7250.c.

arch/arm/mach-ep93xx/include/mach/ts72xx.h
  1. <linux/io.h> should already be included by any user of this
     header.  Doing the include here hides it from being needed
     by the calling source file.

arch/arm/mach-ep93xx/core.c
  1. Remove unnecessary headers.  They were probably included
     originally due to cut-and-paste from other files.
  2. <linux/io.h> should be included not <mach/gpio.h>

arch/arm/mach-ep93xx/adsphere.c
arch/arm/mach-ep93xx/edb93xx.c
arch/arm/mach-ep93xx/gesbc9312.c
arch/arm/mach-ep93xx/micro9.c
arch/arm/mach-ep93xx/ts72xx.c
  1. Remove unnecessary headers.

arch/arm/mach-ep93xx/ts72xx.c
  1. Remove unnecessary headers.
  2. Add platform specific header <mach/ts72xx.h>.

drivers/mtd/nand/ts7250.c
  1. <linux/io.h> should be included not <asm/io.h>.
  2. Add platform specific header <mach/ts72xx.h>.

Cc: Ryan Mallon <ryan@bluewatersys.com>
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 701fac82

arch/arm/mach-ep93xx/adssphere.c

+4 −7
Original line number Diff line number Diff line
@@ -12,18 +12,15 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/mm.h>

#include <linux/sched.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <linux/mtd/physmap.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/i2c.h>

#include <linux/mtd/physmap.h>



#include <mach/hardware.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>





static struct physmap_flash_data adssphere_flash_data = {

	.width		= 4,

};

arch/arm/mach-ep93xx/core.c

+3 −20
Original line number Diff line number Diff line
@@ -16,40 +16,23 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/spinlock.h>

#include <linux/sched.h>

#include <linux/platform_device.h>

#include <linux/interrupt.h>

#include <linux/serial.h>

#include <linux/tty.h>

#include <linux/bitops.h>

#include <linux/serial_8250.h>

#include <linux/serial_core.h>

#include <linux/device.h>

#include <linux/mm.h>

#include <linux/dma-mapping.h>

#include <linux/time.h>

#include <linux/timex.h>

#include <linux/delay.h>

#include <linux/io.h>

#include <linux/gpio.h>

#include <linux/termios.h>

#include <linux/amba/bus.h>

#include <linux/amba/serial.h>

#include <linux/io.h>

#include <linux/i2c.h>

#include <linux/i2c-gpio.h>



#include <asm/types.h>

#include <asm/setup.h>

#include <asm/memory.h>

#include <mach/hardware.h>

#include <asm/irq.h>

#include <asm/system.h>

#include <asm/tlbflush.h>

#include <asm/pgtable.h>



#include <asm/mach/map.h>

#include <asm/mach/time.h>

#include <asm/mach/irq.h>

#include <mach/gpio.h>



#include <asm/hardware/vic.h>

arch/arm/mach-ep93xx/edb93xx.c

+4 −6
Original line number Diff line number Diff line
@@ -26,18 +26,16 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/mm.h>

#include <linux/sched.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <linux/mtd/physmap.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/i2c.h>

#include <linux/mtd/physmap.h>



#include <mach/hardware.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>





static struct physmap_flash_data edb93xx_flash_data;



static struct resource edb93xx_flash_resource = {

arch/arm/mach-ep93xx/gesbc9312.c

+4 −7
Original line number Diff line number Diff line
@@ -12,18 +12,15 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/mm.h>

#include <linux/sched.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <linux/mtd/physmap.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/i2c.h>

#include <linux/mtd/physmap.h>



#include <mach/hardware.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>





static struct physmap_flash_data gesbc9312_flash_data = {

	.width		= 4,

};

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

+2 −5
Original line number Diff line number Diff line
@@ -4,14 +4,11 @@ 
#ifndef __ASM_ARCH_HARDWARE_H

#define __ASM_ARCH_HARDWARE_H



#include "ep93xx-regs.h"

#include <mach/ep93xx-regs.h>

#include <mach/platform.h>



#define pcibios_assign_all_busses()	0



#include "platform.h"



#include "ts72xx.h"



/*

 * The EP93xx has two external crystal oscillators.  To generate the

 * required high-frequency clocks, the processor uses two phase-locked-

CRA Git | Maintained and supported by SUSTech CRA and CCSE