• Olof Johansson's avatar
    Merge branch 'next/soc' into next/multiplatform · b612a857
    Olof Johansson authored
    * 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: default avatarOlof Johansson <olof@lixom.net>
    b612a857
Makefile 11.3 KB