kernel_optimize_test/arch/arm/plat-omap/include/plat
Olof Johansson b612a85792 Merge branch 'next/soc' into next/multiplatform
* next/soc: (50 commits)
  ARM: OMAP: AM33xx hwmod: fixup SPI after platform_data move
  MAINTAINERS: add an entry for the BCM2835 ARM sub-architecture
  ARM: bcm2835: instantiate console UART
  ARM: bcm2835: add stub clock driver
  ARM: bcm2835: add system timer
  ARM: bcm2835: add interrupt controller driver
  ARM: add infra-structure for BCM2835 and Raspberry Pi
  ARM: tegra20: add CPU hotplug support
  ARM: tegra30: add CPU hotplug support
  ARM: tegra: clean up the common assembly macros into sleep.h
  ARM: tegra: replace the CPU CAR access code by tegra_cpu_car_ops
  ARM: tegra: introduce tegra_cpu_car_ops structures
  ARM: Tegra: Add smp_twd clock for Tegra20
  ARM: AM33XX: clock: Add dcan clock aliases for device-tree
  ARM: OMAP2+: dpll: Add missing soc_is_am33xx() check for common functions
  ARM: OMAP: omap_device: idle devices with no driver bound
  ARM: OMAP: omap_device: don't attempt late suspend if no driver bound
  ARM: OMAP: omap_device: keep track of driver bound status
  ARM: OMAP3+: hwmod: Add AM33XX HWMOD data
  ARM: OMAP2+: hwmod: Hook-up am33xx support in omap_hwmod framework
  ...

Change/remove conflict in arch/arm/mach-ux500/clock.c resolved.

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-09-20 21:27:41 -07:00
..
clkdev_omap.h ARM: OMAP3+: clock33xx: Add AM33XX clock tree data 2012-06-29 16:16:40 -06:00
clock.h ARM: OMAP2+: CLEANUP: Remove ARCH_OMAPx ifdef from struct dpll_data 2012-06-18 16:17:44 -06:00
common.h arm-soc: cleanups, part 2 2012-05-26 12:31:49 -07:00
cpu.h ARM: OMAP: Split plat/hardware.h, use local soc.h for omap2+ 2012-09-12 18:06:31 -07:00
dma-44xx.h
dma.h ARM: OMAP1: Move define of OMAP_LCD_DMA to dma.h 2012-09-12 18:06:29 -07:00
dmtimer.h ARM: OMAP2+: Move dmtimer clock set function to dmtimer driver 2012-06-14 02:39:47 -07:00
fpga.h
gpmc.h ARM: OMAP2+: gpmc: Modify interrupt handling 2012-08-30 12:53:23 -07:00
i2c.h OMAP: hwmod: fix the i2c-reset timeout during bootup 2011-07-10 05:27:16 -06:00
iommu.h iommu/omap: eliminate the public omap_find_iommu_device() method 2011-12-05 15:47:39 +02:00
iommu2.h omap: iommu: omapify 'struct iommu' and exposed API 2011-08-26 11:46:01 +02:00
iopgtable.h omap: iommu: omapify 'struct iommu' and exposed API 2011-08-26 11:46:01 +02:00
iovmm.h iommu/omap: eliminate the public omap_find_iommu_device() method 2011-12-05 15:47:39 +02:00
led.h
mailbox.h
menelaus.h
mmc.h ARM: OMAP: remove plat/board.h file 2012-09-10 16:39:21 -07:00
multi.h omap: Fix multi.h when only ARCH_OMAP3 and SOC_AM33XX are selected 2012-08-08 07:22:45 -07:00
omap_device.h ARM: OMAP: omap_device: keep track of driver bound status 2012-09-12 10:51:49 -07:00
omap_hwmod.h Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
omap-pm.h ARM: OMAP: change get_context_loss_count ret value to int 2011-11-04 17:41:07 -07:00
omap-secure.h ARM: OMAP2+: Move stubbed secure_sram_reserve function to a common.c and call it __weak 2012-07-09 19:14:38 +05:30
omap-serial.h ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
prcm.h
sdrc.h ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds 2012-07-09 01:44:11 -07:00
serial.h ARM: OMAP5: Add minimal support for OMAP5430 SOC 2012-07-09 19:14:39 +05:30
sram.h ARM: OMAP: sram: Add am33xx SRAM support (minimal) 2012-03-05 16:11:01 -08:00
tc.h ARM: OMAP: Remove plat/io.h by splitting it into mach/io.h and mach/hardware.h 2012-02-24 10:34:35 -08:00
timex.h
uncompress.h OMAP: remove unused parameter arch_id from uncompress.h 2012-08-07 03:57:59 -07:00
usb.h ARM: OMAP: remove plat/board.h file 2012-09-10 16:39:21 -07:00
vram.h OMAPDSS: Remove video SRAM support 2012-02-23 09:38:26 +02:00
vrfb.h