OSDN Git Service

Merge tag 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3-signed' of git...
authorArnd Bergmann <arnd@arndb.de>
Mon, 12 Nov 2012 21:53:22 +0000 (22:53 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 12 Nov 2012 21:53:22 +0000 (22:53 +0100)
From Tony Lindgren <tony@atomide.com>:

These changes deal with the issues of relative includes
introduced by the earlier clean-up and clean up few more
things for enabling multiplatform support.

The multiplatform kernel has been booted on omaps on
top of this branch with the work-in-progress patches
applied manually.

We cannot yet enable the multiplatform support though.
We still need the common clock framework patches, some
solution for dma-omap.h, and serial-omap.h moved before
we can enable it.

* tag 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP: Remove omap_init_consistent_dma_size()
  ARM: OMAP: Remove NEED_MACH_GPIO_H
  ARM: OMAP: Remove unnecessary mach and plat includes
  ARM: OMAP2+: Fix relative includes for serial.h
  ARM: OMAP: Fix relative includes for fpga.h
  ARM: OMAP1: Remove relative includes
  ARM: OMAP: Remove cpu_is_omap usage from plat-omap/dma.c
  ARM: OMAP: Fix relative includes for debug-devices.h
  ARM: OMAP: Remove plat-omap/common.h
  ARM: OMAP: Move omap-pm-noop.c local to mach-omap2
  ARM: OMAP: Fix relative includes for shared i2c.h file
  ARM: OMAP: Make plat-omap/i2c.c port checks local
  ARM: OMAP: Move omap2+ specific parts of sram.c to mach-omap2
  ARM: OMAP: Move omap1 specific code to local sram.c
  ARM: OMAP: Introduce common omap_map_sram() and omap_sram_reset()
  ARM: OMAP: Split sram.h to local headers and minimal shared header
  ARM: OMAP1: usb: fix sparse warnings

Conflicts:
arch/arm/mach-omap2/cm33xx.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
arch/arm/mach-omap1/common.h
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/cm33xx.c
arch/arm/mach-omap2/pm24xx.c
arch/arm/mach-omap2/pm34xx.c
arch/arm/mach-omap2/prm33xx.c
arch/arm/mach-omap2/prm_common.c
arch/arm/mach-omap2/sdrc2xxx.c
arch/arm/mach-omap2/sleep34xx.S

Simple merge
@@@ -5,20 -5,17 +5,20 @@@
  # Common support
  obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \
         common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
-        omap_device.o
+        omap_device.o sram.o
  
 -# INTCPS IP block support - XXX should be moved to drivers/
 -obj-$(CONFIG_ARCH_OMAP2)              += irq.o
 -obj-$(CONFIG_ARCH_OMAP3)              += irq.o
 -obj-$(CONFIG_SOC_AM33XX)              += irq.o
 -
 -# Secure monitor API support
 -obj-$(CONFIG_ARCH_OMAP3)              += omap-smc.o omap-secure.o
 -obj-$(CONFIG_ARCH_OMAP4)              += omap-smc.o omap-secure.o
 -obj-$(CONFIG_SOC_OMAP5)                       += omap-smc.o omap-secure.o
 +omap-2-3-common                               = irq.o
 +hwmod-common                          = omap_hwmod.o \
 +                                        omap_hwmod_common_data.o
 +clock-common                          = clock.o clock_common_data.o \
 +                                        clkt_dpll.o clkt_clksel.o
 +secure-common                         = omap-smc.o omap-secure.o
 +
 +obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)
 +obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
 +obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common)
 +obj-$(CONFIG_SOC_AM33XX) += irq.o $(hwmod-common)
 +obj-$(CONFIG_SOC_OMAP5)        += prm44xx.o $(hwmod-common) $(secure-common)
  
  ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)
  obj-y += mcbsp.o
@@@ -69,15 -64,16 +69,16 @@@ endi
  
  # Power Management
  ifeq ($(CONFIG_PM),y)
 -obj-$(CONFIG_ARCH_OMAP2)              += pm24xx.o sleep24xx.o
 +obj-$(CONFIG_ARCH_OMAP2)              += pm24xx.o
 +obj-$(CONFIG_ARCH_OMAP2)              += sleep24xx.o
  obj-$(CONFIG_ARCH_OMAP3)              += pm34xx.o sleep34xx.o
  obj-$(CONFIG_ARCH_OMAP4)              += pm44xx.o omap-mpuss-lowpower.o
 -obj-$(CONFIG_ARCH_OMAP4)              += sleep44xx.o
 -obj-$(CONFIG_SOC_OMAP5)                       += omap-mpuss-lowpower.o sleep44xx.o
 +obj-$(CONFIG_SOC_OMAP5)                       += omap-mpuss-lowpower.o
  obj-$(CONFIG_PM_DEBUG)                        += pm-debug.o
+ obj-$(CONFIG_OMAP_PM_NOOP)            += omap-pm-noop.o
  
  obj-$(CONFIG_POWER_AVS_OMAP)          += sr_device.o
 -obj-$(CONFIG_POWER_AVS_OMAP_CLASS3)   += smartreflex-class3.o
 +obj-$(CONFIG_POWER_AVS_OMAP_CLASS3)    += smartreflex-class3.o
  
  AFLAGS_sleep24xx.o                    :=-Wa,-march=armv6
  AFLAGS_sleep34xx.o                    :=-Wa,-march=armv7-a$(plus_sec)
@@@ -22,9 -22,6 +22,7 @@@
  #include <linux/err.h>
  #include <linux/io.h>
  
- #include "../plat-omap/common.h"
 +#include "clockdomain.h"
  #include "cm.h"
  #include "cm33xx.h"
  #include "cm-regbits-34xx.h"
  #include "soc.h"
  #include "common.h"
  #include "clock.h"
 -#include "prm2xxx_3xxx.h"
 +#include "prm2xxx.h"
  #include "prm-regbits-24xx.h"
 -#include "cm2xxx_3xxx.h"
 +#include "cm2xxx.h"
  #include "cm-regbits-24xx.h"
  #include "sdrc.h"
+ #include "sram.h"
  #include "pm.h"
  #include "control.h"
  #include "powerdomain.h"
  #include <plat/prcm.h>
  #include <plat-omap/dma-omap.h>
  
- #include "../plat-omap/sram.h"
  #include "soc.h"
  #include "common.h"
 -#include "cm2xxx_3xxx.h"
 +#include "cm3xxx.h"
  #include "cm-regbits-34xx.h"
  #include "gpmc.h"
  #include "prm-regbits-34xx.h"
 -
 -#include "prm2xxx_3xxx.h"
 +#include "prm3xxx.h"
  #include "pm.h"
  #include "sdrc.h"
+ #include "sram.h"
  #include "control.h"
  
  /* pm34xx errata defined in pm.h */
  #include <linux/err.h>
  #include <linux/io.h>
  
- #include "../plat-omap/common.h"
  #include "common.h"
 +#include "powerdomain.h"
  #include "prm33xx.h"
  #include "prm-regbits-33xx.h"
  
Simple merge
  #include "soc.h"
  #include "iomap.h"
  #include "common.h"
 -#include "prm2xxx_3xxx.h"
 +#include "prm2xxx.h"
  #include "clock.h"
  #include "sdrc.h"
+ #include "sram.h"
  
  /* Memory timing, DLL mode flags */
  #define M_DDR         1
  
  #include <asm/assembler.h>
  
- #include "../plat-omap/sram.h"
  #include "omap34xx.h"
  #include "iomap.h"
 -#include "cm2xxx_3xxx.h"
 -#include "prm2xxx_3xxx.h"
 +#include "cm3xxx.h"
 +#include "prm3xxx.h"
  #include "sdrc.h"
+ #include "sram.h"
  #include "control.h"
  
  /*