Skip to content

Commit

Permalink
ARM: OMAP: Make plat/sram.h local to plat-omap
Browse files Browse the repository at this point in the history
We can move this from plat to be local to plat-omap
for common ARM zImage support.

Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Tony Lindgren committed Oct 17, 2012
1 parent a8f7445 commit 622297f
Show file tree
Hide file tree
Showing 18 changed files with 131 additions and 126 deletions.
3 changes: 2 additions & 1 deletion arch/arm/mach-omap1/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@
#include <plat/cpu.h>
#include <plat/usb.h>
#include <plat/clock.h>
#include <plat/sram.h>
#include <plat/clkdev_omap.h>

#include <mach/hardware.h>

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

#include "iomap.h"
#include "clock.h"
#include "opp.h"
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-omap1/clock_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@
#include <plat/clock.h>
#include <plat/cpu.h>
#include <plat/clkdev_omap.h>
#include <plat/sram.h> /* for omap_sram_reprogram_clock() */

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

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

#include "iomap.h"
#include "clock.h"

Expand Down
2 changes: 2 additions & 0 deletions arch/arm/mach-omap1/devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
#include <mach/camera.h>
#include <mach/hardware.h>

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

#include "common.h"
#include "clock.h"
#include "dma.h"
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-omap1/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,15 @@

#include <plat/cpu.h>
#include <plat/clock.h>
#include <plat/sram.h>
#include <mach/tc.h>
#include <mach/mux.h>
#include <plat-omap/dma-omap.h>
#include <plat/dmtimer.h>

#include <mach/irqs.h>

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

#include "iomap.h"
#include "pm.h"

Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-omap2/clkt2xxx_dpllcore.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
#include <linux/io.h>

#include <plat/clock.h>
#include <plat/sram.h>

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

#include "clock.h"
#include "clock2xxx.h"
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
#include <linux/slab.h>

#include <plat/clock.h>
#include <plat/sram.h>

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

#include "soc.h"
#include "clock.h"
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-omap2/clkt34xx_dpll3m2.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
#include <linux/io.h>

#include <plat/clock.h>
#include <plat/sram.h>

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

#include "clock.h"
#include "clock3xxx.h"
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-omap2/io.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@
#include <asm/tlb.h>
#include <asm/mach/map.h>

#include <plat/sram.h>
#include <plat/serial.h>
#include <plat/omap-pm.h>
#include <plat/omap_hwmod.h>
#include <plat/multi.h>
#include <plat-omap/dma-omap.h>

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

#include "soc.h"
#include "iomap.h"
#include "voltage.h"
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-omap2/omap4-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
#include <asm/mach/map.h>
#include <asm/memblock.h>

#include <plat/sram.h>
#include <plat/omap-secure.h>

#include "omap-wakeupgen.h"
#include "../plat-omap/sram.h"

#include "omap-wakeupgen.h"
#include "soc.h"
#include "common.h"
#include "mmc.h"
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-omap2/pm24xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@
#include <asm/system_misc.h>

#include <plat/clock.h>
#include <plat/sram.h>
#include <plat-omap/dma-omap.h>

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

#include "common.h"
#include "prm2xxx_3xxx.h"
#include "prm-regbits-24xx.h"
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-omap2/pm34xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,13 @@
#include <asm/suspend.h>
#include <asm/system_misc.h>

#include <plat/sram.h>
#include "clockdomain.h"
#include "powerdomain.h"
#include <plat/prcm.h>
#include <plat-omap/dma-omap.h>

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

#include "common.h"
#include "cm2xxx_3xxx.h"
#include "cm-regbits-34xx.h"
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/sdrc.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include "common.h"
#include <plat/clock.h>
#include <plat/sram.h>
#include "../plat-omap/sram.h"

#include "sdrc.h"

Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-omap2/sdrc2xxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
#include <linux/io.h>

#include <plat/clock.h>
#include <plat/sram.h>

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

#include "soc.h"
#include "iomap.h"
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/sleep34xx.S
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include <asm/assembler.h>

#include <plat/sram.h>
#include "../plat-omap/sram.h"

#include "omap34xx.h"
#include "iomap.h"
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/plat-omap/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,4 @@ extern void omap_reserve(void);
struct omap_hwmod;
extern int omap_dss_reset(struct omap_hwmod *);

void omap_sram_init(void);

#endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */
105 changes: 0 additions & 105 deletions arch/arm/plat-omap/include/plat/sram.h

This file was deleted.

1 change: 0 additions & 1 deletion arch/arm/plat-omap/sram.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

#include <asm/mach/map.h>

#include <plat/sram.h>
#include <plat/cpu.h>

#include "sram.h"
Expand Down
Loading

0 comments on commit 622297f

Please sign in to comment.