Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4c060db authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: Split plat/cpu.h into local soc.h for mach-omap1 and mach-omap2 



We want to remove plat/cpu.h. To do this, let's first split
it to private soc.h to mach-omap1 and mach-omap2. We have to
keep plat/cpu.h around until the remaining drivers are fixed,
so let's include the local soc.h in plat/cpu.h and for drivers
still including plat/cpu.h.

Once the drivers are fixed not to include plat/cpu.h, we
can remove the file.

This is needed for the ARM common zImage support.

[tony@atomide.com: updated to not print a warning]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e10dd62f

arch/arm/mach-omap1/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#include <asm/mach-types.h>



#include <plat/cpu.h>

#include "soc.h"

#include <plat/usb.h>



#include <mach/hardware.h>

arch/arm/mach-omap1/clock_data.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#include <asm/mach-types.h>  /* for machine_is_* */



#include <plat/cpu.h>

#include "soc.h"



#include <mach/hardware.h>

#include <mach/usb.h>   /* for OTG_BASE */

arch/arm/mach-omap1/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#include <linux/i2c-omap.h>

#include <mach/mux.h>

#include <plat/cpu.h>

#include "soc.h"



#include "../plat-omap/i2c.h"

arch/arm/mach-omap1/id.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/io.h>

#include <asm/system_info.h>



#include <plat/cpu.h>

#include "soc.h"



#include <mach/hardware.h>

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

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <asm/sizes.h>

#ifndef __ASSEMBLER__

#include <asm/types.h>

#include <plat/cpu.h>

#include "../../mach-omap1/soc.h"



/*

 * NOTE: Please use ioremap + __raw_read/write where possible instead of these