Merge tag 'omap-for-v3.8/cleanup-headers-iommu-signed' of git://git.kernel.org/pub...
authorOlof Johansson <olof@lixom.net>
Sat, 1 Dec 2012 05:40:59 +0000 (21:40 -0800)
committerOlof Johansson <olof@lixom.net>
Sat, 1 Dec 2012 05:40:59 +0000 (21:40 -0800)
From Tony Lindgren:
Move most of remaining omap iommu code to drivers/iommu.
This is needed for the multiplatform kernels as the plat
and mach headers cannot be included.

These changes were agreed to be merged via the arm-soc
tree by Joerg and Ohad as these will cause some merge
conflicts with the other related clean-up branches.

So omap-for-v3.8/cleanup-headers-iommu should be added
as one of the depends branches for arm-soc.

* tag 'omap-for-v3.8/cleanup-headers-iommu-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Move iommu/iovmm headers to platform_data
  ARM: OMAP2+: Make some definitions local
  ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c
  ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h
  ARM: OMAP2+: Move iopgtable header to drivers/iommu/
  ARM: OMAP: Merge iommu2.h into iommu.h

Conflicts due to surrounding changes in:
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
drivers/media/platform/omap3isp/ispvideo.c

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
drivers/media/platform/omap3isp/ispvideo.c

index c94d495b8d95b4cb63223822ba5c35ef2378cc95,d6721a7f4c3bd88fc1e9d124fcfc78aa92ab0ea5..d5e834a9075d3be9f10940feb30ff59df4b174f4
@@@ -4,37 -4,30 +4,37 @@@
  
  # 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
 -
 -# 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
 +       common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
 +       omap_device.o sram.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
  endif
  
 -obj-$(CONFIG_TWL4030_CORE)            += omap_twl.o
 +obj-$(CONFIG_TWL4030_CORE) += omap_twl.o
 +obj-$(CONFIG_SOC_HAS_OMAP2_SDRC)      += sdrc.o
  
  # SMP support ONLY available for OMAP4
  
  obj-$(CONFIG_SMP)                     += omap-smp.o omap-headsmp.o
  obj-$(CONFIG_HOTPLUG_CPU)             += omap-hotplug.o
 -obj-$(CONFIG_ARCH_OMAP4)              += omap4-common.o omap-wakeupgen.o
 -obj-$(CONFIG_SOC_OMAP5)                       += omap4-common.o omap-wakeupgen.o
 +omap-4-5-common                               =  omap4-common.o omap-wakeupgen.o \
 +                                         sleep44xx.o
 +obj-$(CONFIG_ARCH_OMAP4)              += $(omap-4-5-common)
 +obj-$(CONFIG_SOC_OMAP5)                       += $(omap-4-5-common)
  
  plus_sec := $(call as-instr,.arch_extension sec,+sec)
  AFLAGS_omap-headsmp.o                 :=-Wa,-march=armv7-a$(plus_sec)
@@@ -59,6 -52,7 +59,6 @@@ obj-$(CONFIG_ARCH_OMAP4)              += mux44xx.
  # SMS/SDRC
  obj-$(CONFIG_ARCH_OMAP2)              += sdrc2xxx.o
  # obj-$(CONFIG_ARCH_OMAP3)            += sdrc3xxx.o
 -obj-$(CONFIG_SOC_HAS_OMAP2_SDRC)      += sdrc.o
  
  # OPP table initialization
  ifeq ($(CONFIG_PM_OPP),y)
@@@ -69,16 -63,15 +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)
@@@ -90,82 -83,76 +90,82 @@@ endi
  endif
  
  ifeq ($(CONFIG_CPU_IDLE),y)
 -obj-$(CONFIG_ARCH_OMAP3)              += cpuidle34xx.o
 -obj-$(CONFIG_ARCH_OMAP4)              += cpuidle44xx.o
 +obj-$(CONFIG_ARCH_OMAP3)                += cpuidle34xx.o
 +obj-$(CONFIG_ARCH_OMAP4)                += cpuidle44xx.o
  endif
  
  # PRCM
 -obj-y                                 += prcm.o prm_common.o
 -obj-$(CONFIG_ARCH_OMAP2)              += cm2xxx_3xxx.o prm2xxx_3xxx.o
 -obj-$(CONFIG_ARCH_OMAP3)              += cm2xxx_3xxx.o prm2xxx_3xxx.o
 +obj-y                                 += prcm.o prm_common.o cm_common.o
 +obj-$(CONFIG_ARCH_OMAP2)              += prm2xxx_3xxx.o prm2xxx.o cm2xxx.o
 +obj-$(CONFIG_ARCH_OMAP3)              += prm2xxx_3xxx.o prm3xxx.o cm3xxx.o
  obj-$(CONFIG_ARCH_OMAP3)              += vc3xxx_data.o vp3xxx_data.o
  obj-$(CONFIG_SOC_AM33XX)              += prm33xx.o cm33xx.o
  omap-prcm-4-5-common                  =  cminst44xx.o cm44xx.o prm44xx.o \
                                           prcm_mpu44xx.o prminst44xx.o \
 -                                         vc44xx_data.o vp44xx_data.o \
 -                                         prm44xx.o
 +                                         vc44xx_data.o vp44xx_data.o
  obj-$(CONFIG_ARCH_OMAP4)              += $(omap-prcm-4-5-common)
  obj-$(CONFIG_SOC_OMAP5)                       += $(omap-prcm-4-5-common)
  
  # OMAP voltage domains
 -obj-y                                 += voltage.o vc.o vp.o
 +voltagedomain-common                  := voltage.o vc.o vp.o
 +obj-$(CONFIG_ARCH_OMAP2)              += $(voltagedomain-common)
  obj-$(CONFIG_ARCH_OMAP2)              += voltagedomains2xxx_data.o
 +obj-$(CONFIG_ARCH_OMAP3)              += $(voltagedomain-common)
  obj-$(CONFIG_ARCH_OMAP3)              += voltagedomains3xxx_data.o
 +obj-$(CONFIG_ARCH_OMAP4)              += $(voltagedomain-common)
  obj-$(CONFIG_ARCH_OMAP4)              += voltagedomains44xx_data.o
 -obj-$(CONFIG_SOC_AM33XX)              += voltagedomains33xx_data.o
 +obj-$(CONFIG_SOC_AM33XX)              += $(voltagedomain-common)
 +obj-$(CONFIG_SOC_AM33XX)                += voltagedomains33xx_data.o
 +obj-$(CONFIG_SOC_OMAP5)                       += $(voltagedomain-common)
  
  # OMAP powerdomain framework
 -obj-y                                 += powerdomain.o powerdomain-common.o
 +powerdomain-common                    += powerdomain.o powerdomain-common.o
 +obj-$(CONFIG_ARCH_OMAP2)              += $(powerdomain-common)
  obj-$(CONFIG_ARCH_OMAP2)              += powerdomains2xxx_data.o
 -obj-$(CONFIG_ARCH_OMAP2)              += powerdomain2xxx_3xxx.o
  obj-$(CONFIG_ARCH_OMAP2)              += powerdomains2xxx_3xxx_data.o
 -obj-$(CONFIG_ARCH_OMAP3)              += powerdomain2xxx_3xxx.o
 +obj-$(CONFIG_ARCH_OMAP3)              += $(powerdomain-common)
  obj-$(CONFIG_ARCH_OMAP3)              += powerdomains3xxx_data.o
  obj-$(CONFIG_ARCH_OMAP3)              += powerdomains2xxx_3xxx_data.o
 -obj-$(CONFIG_ARCH_OMAP4)              += powerdomain44xx.o
 +obj-$(CONFIG_ARCH_OMAP4)              += $(powerdomain-common)
  obj-$(CONFIG_ARCH_OMAP4)              += powerdomains44xx_data.o
 -obj-$(CONFIG_SOC_AM33XX)              += powerdomain33xx.o
 +obj-$(CONFIG_SOC_AM33XX)              += $(powerdomain-common)
  obj-$(CONFIG_SOC_AM33XX)              += powerdomains33xx_data.o
 -obj-$(CONFIG_SOC_OMAP5)                       += powerdomain44xx.o
 +obj-$(CONFIG_SOC_OMAP5)                       += $(powerdomain-common)
  
  # PRCM clockdomain control
 -obj-y                                 += clockdomain.o
 -obj-$(CONFIG_ARCH_OMAP2)              += clockdomain2xxx_3xxx.o
 +clockdomain-common                    += clockdomain.o
 +obj-$(CONFIG_ARCH_OMAP2)              += $(clockdomain-common)
  obj-$(CONFIG_ARCH_OMAP2)              += clockdomains2xxx_3xxx_data.o
  obj-$(CONFIG_SOC_OMAP2420)            += clockdomains2420_data.o
  obj-$(CONFIG_SOC_OMAP2430)            += clockdomains2430_data.o
 -obj-$(CONFIG_ARCH_OMAP3)              += clockdomain2xxx_3xxx.o
 +obj-$(CONFIG_ARCH_OMAP3)              += $(clockdomain-common)
  obj-$(CONFIG_ARCH_OMAP3)              += clockdomains2xxx_3xxx_data.o
  obj-$(CONFIG_ARCH_OMAP3)              += clockdomains3xxx_data.o
 -obj-$(CONFIG_ARCH_OMAP4)              += clockdomain44xx.o
 +obj-$(CONFIG_ARCH_OMAP4)              += $(clockdomain-common)
  obj-$(CONFIG_ARCH_OMAP4)              += clockdomains44xx_data.o
 -obj-$(CONFIG_SOC_AM33XX)              += clockdomain33xx.o
 +obj-$(CONFIG_SOC_AM33XX)              += $(clockdomain-common)
  obj-$(CONFIG_SOC_AM33XX)              += clockdomains33xx_data.o
 -obj-$(CONFIG_SOC_OMAP5)                       += clockdomain44xx.o
 +obj-$(CONFIG_SOC_OMAP5)                       += $(clockdomain-common)
  
  # Clock framework
 -obj-y                                 += clock.o clock_common_data.o \
 -                                         clkt_dpll.o clkt_clksel.o
 -obj-$(CONFIG_ARCH_OMAP2)              += clock2xxx.o
 -obj-$(CONFIG_ARCH_OMAP2)              += clkt2xxx_dpllcore.o clkt2xxx_sys.o
 +obj-$(CONFIG_ARCH_OMAP2)              += $(clock-common) clock2xxx.o
 +obj-$(CONFIG_ARCH_OMAP2)              += clkt2xxx_sys.o
 +obj-$(CONFIG_ARCH_OMAP2)              += clkt2xxx_dpllcore.o
  obj-$(CONFIG_ARCH_OMAP2)              += clkt2xxx_virt_prcm_set.o
  obj-$(CONFIG_ARCH_OMAP2)              += clkt2xxx_apll.o clkt2xxx_osc.o
  obj-$(CONFIG_ARCH_OMAP2)              += clkt2xxx_dpll.o clkt_iclk.o
  obj-$(CONFIG_SOC_OMAP2420)            += clock2420_data.o
  obj-$(CONFIG_SOC_OMAP2430)            += clock2430.o clock2430_data.o
 -obj-$(CONFIG_ARCH_OMAP3)              += clock3xxx.o
 +obj-$(CONFIG_ARCH_OMAP3)              += $(clock-common) clock3xxx.o
  obj-$(CONFIG_ARCH_OMAP3)              += clock34xx.o clkt34xx_dpll3m2.o
 -obj-$(CONFIG_ARCH_OMAP3)              += clock3517.o clock36xx.o clkt_iclk.o
 +obj-$(CONFIG_ARCH_OMAP3)              += clock3517.o clock36xx.o
  obj-$(CONFIG_ARCH_OMAP3)              += dpll3xxx.o clock3xxx_data.o
 -obj-$(CONFIG_ARCH_OMAP4)              += clock44xx_data.o
 +obj-$(CONFIG_ARCH_OMAP3)              += clkt_iclk.o
 +obj-$(CONFIG_ARCH_OMAP4)              += $(clock-common) clock44xx_data.o
  obj-$(CONFIG_ARCH_OMAP4)              += dpll3xxx.o dpll44xx.o
 -obj-$(CONFIG_SOC_AM33XX)              += dpll3xxx.o clock33xx_data.o
 +obj-$(CONFIG_SOC_AM33XX)              += $(clock-common) dpll3xxx.o
 +obj-$(CONFIG_SOC_AM33XX)              += clock33xx_data.o
 +obj-$(CONFIG_SOC_OMAP5)                       += $(clock-common)
  obj-$(CONFIG_SOC_OMAP5)                       += dpll3xxx.o dpll44xx.o
  
  # OMAP2 clock rate set data (old "OPP" data)
@@@ -173,6 -160,7 +173,6 @@@ obj-$(CONFIG_SOC_OMAP2420)         += opp2420_
  obj-$(CONFIG_SOC_OMAP2430)            += opp2430_data.o
  
  # hwmod data
 -obj-y                                 += omap_hwmod_common_data.o
  obj-$(CONFIG_SOC_OMAP2420)            += omap_hwmod_2xxx_ipblock_data.o
  obj-$(CONFIG_SOC_OMAP2420)            += omap_hwmod_2xxx_3xxx_ipblock_data.o
  obj-$(CONFIG_SOC_OMAP2420)            += omap_hwmod_2xxx_interconnect_data.o
@@@ -196,8 -184,6 +196,6 @@@ obj-$(CONFIG_HW_PERF_EVENTS)               += pmu.
  obj-$(CONFIG_OMAP_MBOX_FWK)           += mailbox_mach.o
  mailbox_mach-objs                     := mailbox.o
  
- obj-$(CONFIG_OMAP_IOMMU)              += iommu2.o
  iommu-$(CONFIG_OMAP_IOMMU)            := omap-iommu.o
  obj-y                                 += $(iommu-m) $(iommu-y)
  
@@@ -218,10 -204,10 +216,10 @@@ obj-$(CONFIG_MACH_OMAP_H4)              += board-h4
  obj-$(CONFIG_MACH_OMAP_2430SDP)               += board-2430sdp.o
  obj-$(CONFIG_MACH_OMAP_APOLLON)               += board-apollon.o
  obj-$(CONFIG_MACH_OMAP3_BEAGLE)               += board-omap3beagle.o
 -obj-$(CONFIG_MACH_DEVKIT8000)         += board-devkit8000.o
 +obj-$(CONFIG_MACH_DEVKIT8000)         += board-devkit8000.o
  obj-$(CONFIG_MACH_OMAP_LDP)           += board-ldp.o
 -obj-$(CONFIG_MACH_OMAP3530_LV_SOM)    += board-omap3logic.o
 -obj-$(CONFIG_MACH_OMAP3_TORPEDO)      += board-omap3logic.o
 +obj-$(CONFIG_MACH_OMAP3530_LV_SOM)      += board-omap3logic.o
 +obj-$(CONFIG_MACH_OMAP3_TORPEDO)        += board-omap3logic.o
  obj-$(CONFIG_MACH_ENCORE)             += board-omap3encore.o
  obj-$(CONFIG_MACH_OVERO)              += board-overo.o
  obj-$(CONFIG_MACH_OMAP3EVM)           += board-omap3evm.o
index 2ad491d6910ba53775f0cd398b1a617facbcd129,6cd0c2a36a251b92bce17d6e01e2d5d5c3fa4290..9adbdc846cebd940601ecf0ee9d0bd9250bcdb51
  #include <asm/mach-types.h>
  #include <asm/mach/map.h>
  
 +#include <plat-omap/dma-omap.h>
 +
  #include "iomap.h"
 -#include <plat/dma.h>
 -#include <plat/omap_hwmod.h>
 -#include <plat/omap_device.h>
 +#include "omap_hwmod.h"
 +#include "omap_device.h"
  #include "omap4-keypad.h"
  
  #include "soc.h"
@@@ -35,7 -34,6 +35,7 @@@
  #include "mux.h"
  #include "control.h"
  #include "devices.h"
 +#include "dma.h"
  
  #define L3_MODULES_MAX_LEN 12
  #define L3_MODULES 3
@@@ -128,7 -126,7 +128,7 @@@ static struct platform_device omap2cam_
  
  #if defined(CONFIG_IOMMU_API)
  
- #include <plat/iommu.h>
+ #include <linux/platform_data/iommu-omap.h>
  
  static struct resource omap3isp_resources[] = {
        {
@@@ -343,7 -341,7 +343,7 @@@ static void __init omap_init_dmic(void
  
        oh = omap_hwmod_lookup("dmic");
        if (!oh) {
 -              printk(KERN_ERR "Could not look up mcpdm hw_mod\n");
 +              pr_err("Could not look up dmic hw_mod\n");
                return;
        }
  
index abe66ced903fe0e5a032bd827f547c79640fffc1,621bc713723310fe720e67644088b5d5c4eadc72..1150f823f24e82b133d0264c0a9b65473f587b53
   *
   * XXX these should be marked initdata for multi-OMAP kernels
   */
 +
 +#include <linux/i2c-omap.h>
  #include <linux/power/smartreflex.h>
  #include <linux/platform_data/gpio-omap.h>
  
 -#include <plat/omap_hwmod.h>
 -#include <plat/dma.h>
 -#include <plat/serial.h>
 +#include <plat-omap/dma-omap.h>
  #include "l3_3xxx.h"
  #include "l4_3xxx.h"
 -#include <plat/i2c.h>
 -#include <plat/mmc.h>
  #include <linux/platform_data/asoc-ti-mcbsp.h>
  #include <linux/platform_data/spi-omap2-mcspi.h>
+ #include <linux/platform_data/iommu-omap.h>
  #include <plat/dmtimer.h>
- #include <plat/iommu.h>
  
  #include "am35xx.h"
  
  #include "soc.h"
 +#include "omap_hwmod.h"
  #include "omap_hwmod_common_data.h"
  #include "prm-regbits-34xx.h"
  #include "cm-regbits-34xx.h"
 +
 +#include "dma.h"
 +#include "i2c.h"
 +#include "mmc.h"
  #include "wd_timer.h"
 +#include "serial.h"
  
  /*
   * OMAP3xxx hardware module integration data
index 7a6132848f5d209511b51139b1d124eb7798492a,5850b3e81512f2c0df51588e36b37ef30c288da0..224bbaf73f320154192bdf3b156a184ffd9d1564
  #include <linux/io.h>
  #include <linux/platform_data/gpio-omap.h>
  #include <linux/power/smartreflex.h>
 +#include <linux/i2c-omap.h>
 +
 +#include <plat-omap/dma-omap.h>
  
 -#include <plat/omap_hwmod.h>
 -#include <plat/i2c.h>
 -#include <plat/dma.h>
  #include <linux/platform_data/spi-omap2-mcspi.h>
  #include <linux/platform_data/asoc-ti-mcbsp.h>
 -#include <plat/mmc.h>
+ #include <linux/platform_data/iommu-omap.h>
  #include <plat/dmtimer.h>
- #include <plat/iommu.h>
 -#include <plat/common.h>
  
 +#include "omap_hwmod.h"
  #include "omap_hwmod_common_data.h"
  #include "cm1_44xx.h"
  #include "cm2_44xx.h"
  #include "prm44xx.h"
  #include "prm-regbits-44xx.h"
 +#include "i2c.h"
 +#include "mmc.h"
  #include "wd_timer.h"
  
  /* Base offset for all OMAP4 interrupts external to MPUSS */
index 5bd40e6870cc36176ea787208f6a707403d86793,21f7313e6999372fe130c7d3e4d24ed3259dde33..c4be4fa8a7d7d0a4211e00b8e108fe101b2bc178
@@@ -27,6 -27,7 +27,7 @@@
  #include <linux/clk.h>
  #include <linux/mm.h>
  #include <linux/module.h>
+ #include <linux/omap-iommu.h>
  #include <linux/pagemap.h>
  #include <linux/scatterlist.h>
  #include <linux/sched.h>
@@@ -34,8 -35,7 +35,9 @@@
  #include <linux/vmalloc.h>
  #include <media/v4l2-dev.h>
  #include <media/v4l2-ioctl.h>
 +#include <plat/iommu.h>
 +#include <plat/iovmm.h>
+ #include <plat/omap-pm.h>
  
  #include "ispvideo.h"
  #include "isp.h"