Skip to content

Commit

Permalink
ARM: OMAP2+ Move SoC specific headers to be local to mach-omap2
Browse files Browse the repository at this point in the history
These can now be moved to be local headers in mach-omap2.

Note that this patch removes arch/arm/plat-omap/devices.c as it
will get removed anyways with Paul Walmsley's patch
"ARM: OMAP: split OMAP1, OMAP2+ RNG device registration".

Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Tony Lindgren committed Sep 13, 2012
1 parent dbc0416 commit c49f34b
Show file tree
Hide file tree
Showing 15 changed files with 13 additions and 111 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/clock33xx_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include <linux/list.h>
#include <linux/clk.h>
#include <plat/clkdev_omap.h>
#include <plat/am33xx.h>

#include "am33xx.h"
#include "iomap.h"
#include "control.h"
#include "clock.h"
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/control.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <mach/ctrl_module_pad_core_44xx.h>
#include <mach/ctrl_module_pad_wkup_44xx.h>

#include <plat/am33xx.h>
#include "am33xx.h"

#ifndef __ASSEMBLY__
#define OMAP242X_CTRL_REGADDR(reg) \
Expand Down
3 changes: 1 addition & 2 deletions arch/arm/mach-omap2/omap-mpuss-lowpower.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,8 @@
#include <asm/suspend.h>
#include <asm/hardware/cache-l2x0.h>

#include <plat/omap44xx.h>

#include "common.h"
#include "omap44xx.h"
#include "omap4-sar-layout.h"
#include "pm.h"
#include "prcm_mpu44xx.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
/*
* arch/arm/plat-omap/include/mach/omap24xx.h
*
* This file contains the processor specific definitions
* of the TI OMAP24XX.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
/*
* arch/arm/plat-omap/include/mach/omap34xx.h
*
* This file contains the processor specific definitions of the TI OMAP34XX.
*
* Copyright (C) 2007 Texas Instruments.
Expand Down
File renamed without changes.
File renamed without changes.
3 changes: 1 addition & 2 deletions arch/arm/mach-omap2/sleep24xx.S
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
#include <linux/linkage.h>
#include <asm/assembler.h>

#include <plat/omap24xx.h>

#include "omap24xx.h"
#include "sdrc.h"

/* First address of reserved address space? apparently valid for OMAP2 & 3 */
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,9 +26,9 @@

#include <asm/assembler.h>

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

#include "omap34xx.h"
#include "iomap.h"
#include "cm2xxx_3xxx.h"
#include "prm2xxx_3xxx.h"
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/sleep44xx.S
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#include <asm/memory.h>
#include <asm/hardware/cache-l2x0.h>

#include <plat/omap44xx.h>
#include <mach/omap-secure.h>

#include "common.h"
#include "omap44xx.h"
#include "omap4-sar-layout.h"

#if defined(CONFIG_SMP) && defined(CONFIG_PM)
Expand Down
12 changes: 6 additions & 6 deletions arch/arm/mach-omap2/soc.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <plat/cpu.h>
#include <plat/omap24xx.h>
#include <plat/omap34xx.h>
#include <plat/omap44xx.h>
#include <plat/ti81xx.h>
#include <plat/am33xx.h>
#include <plat/omap54xx.h>
#include "omap24xx.h"
#include "omap34xx.h"
#include "omap44xx.h"
#include "ti81xx.h"
#include "am33xx.h"
#include "omap54xx.h"
File renamed without changes.
3 changes: 1 addition & 2 deletions arch/arm/plat-omap/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
#

# Common support
obj-y := common.o sram.o clock.o devices.o dma.o mux.o \
fb.o counter_32k.o
obj-y := common.o sram.o clock.o dma.o mux.o fb.o counter_32k.o
obj-m :=
obj-n :=
obj- :=
Expand Down
91 changes: 0 additions & 91 deletions arch/arm/plat-omap/devices.c

This file was deleted.

0 comments on commit c49f34b

Please sign in to comment.