• Arnd Bergmann's avatar
    Merge branch 'samsung/soc' into next/soc2 · 853a0231
    Arnd Bergmann authored
    * samsung/soc:
      ARM: EXYNOS: fix cycle count for periodic mode of clock event timers
      ARM: EXYNOS: add support JPEG
      ARM: EXYNOS: Add DMC1, allow PPMU access for DMC
      ARM: SAMSUNG: Correct MIPI-CSIS io memory resource definition
      ARM: SAMSUNG: fix __init attribute on regarding s3c_set_platdata()
      ARM: SAMSUNG: Add __init attribute to samsung_bl_set()
      ARM: S5PV210: Add usb otg phy control
      ARM: S3C64XX: Add usb otg phy control
      ARM: EXYNOS: Enable l2 configuration through device tree
      ARM: EXYNOS: remove useless code to save/restore L2
      ARM: EXYNOS: save L2 settings during bootup
      ARM: S5P: add L2 early resume code
      ARM: EXYNOS: Add support AFTR mode on EXYNOS4210
      ARM: SAMSUNG: use spin_lock_irqsave() in clk_{enable,disable}
      ARM: S3C64XX: Define some additional always off clocks
      ARM: S3C64XX: Reduce residency requirement for cpuidle WFI mode
      ARM: SAMSUNG: Add a callback 'notify_after' for PWM backlight control
      ARM: SAMSUNG: add G2D to plat-s5p and mach-exynos
      ARM: S3C64XX: Gate some more clocks by default
      ARM: S3C64XX: Add basic cpuidle driver
    
    Conflicts:
    	arch/arm/mach-exynos/clock.c
    	arch/arm/mach-exynos/common.c
    
    This merges the earlier samsung support into the next/soc2 branch to
    resolve conflicts between commits in the earlier work and the exynos5
    branch.
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    853a0231
Kconfig 2.87 KB