From: Olof Johansson <olof@lixom.net>
Date: Wed, 14 Aug 2013 06:33:07 +0000 (-0700)
Subject: Merge tag 'v3.12-pwm-cleanup-for-olof' of git://github.com/tom3q/linux into next... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8b2496a22810531cb9157191cd0264bae8efeca0;p=linux-beck.git

Merge tag 'v3.12-pwm-cleanup-for-olof' of git://github.com/tom3q/linux into next/cleanup

From Tomasz Figa:
Here is the Samsung PWM cleanup series. Particular patches of the series
involve following modifications:
 - fixing up few things in samsung_pwm_timer clocksource driver,
 - moving remaining Samsung platforms to the new clocksource driver,
 - removing old clocksource driver,
 - adding new multiplatform- and DT-aware PWM driver,
 - moving all Samsung platforms to use the new PWM driver,
 - removing old PWM driver,
 - removing all PWM-related code that is not used anymore.

* tag 'v3.12-pwm-cleanup-for-olof' of git://github.com/tom3q/linux: (684 commits)
  ARM: SAMSUNG: Remove plat/regs-timer.h header
  ARM: SAMSUNG: Remove remaining uses of plat/regs-timer.h header
  ARM: SAMSUNG: Remove pwm-clock infrastructure
  ARM: SAMSUNG: Remove old PWM timer platform devices
  pwm: Remove superseded pwm-samsung-legacy driver
  ARM: SAMSUNG: Modify board files to use new PWM platform device
  ARM: SAMSUNG: Rework private data handling in dev-backlight
  pwm: Add new pwm-samsung driver
  pwm: samsung: Rename to pwm-samsung-legacy
  ARM: SAMSUNG: Remove unused PWM timer IRQ chip code
  ARM: SAMSUNG: Remove old samsung-time driver
  ARM: SAMSUNG: Move all platforms to new clocksource driver
  ARM: SAMSUNG: Set PWM platform data
  ARM: SAMSUNG: Add new PWM platform device
  ARM: SAMSUNG: Unify base address definitions of timer block
  clocksource: samsung_pwm_timer: Handle suspend/resume correctly
  clocksource: samsung_pwm_timer: Do not use clocksource_mmio
  clocksource: samsung_pwm_timer: Cache clocksource register address
  clocksource: samsung_pwm_timer: Correct definition of AUTORELOAD bit
  clocksource: samsung_pwm_timer: Do not request PWM mem region
  + v3.11-rc4

Conflicts:
	arch/arm/Kconfig.debug

Signed-off-by: Olof Johansson <olof@lixom.net>
---

8b2496a22810531cb9157191cd0264bae8efeca0
diff --cc arch/arm/Kconfig.debug
index 4a62a8d4f3b6,583f4a00ec32..15337833d05d
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -809,9 -804,19 +809,19 @@@ config DEBUG_LL_INCLUD
  
  config DEBUG_UNCOMPRESS
  	bool
- 	default y if (ARCH_MULTIPLATFORM || ARCH_MSM) && DEBUG_LL && \
- 		     !DEBUG_OMAP2PLUS_UART && \
 -	depends on ARCH_MULTIPLATFORM
++	depends on ARCH_MULTIPLATFORM || ARCH_MSM
+ 	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
  		     !DEBUG_TEGRA_UART
+ 	help
+ 	  This option influences the normal decompressor output for
+ 	  multiplatform kernels.  Normally, multiplatform kernels disable
+ 	  decompressor output because it is not possible to know where to
+ 	  send the decompressor output.
+ 
+ 	  When this option is set, the selected DEBUG_LL output method
+ 	  will be re-used for normal decompressor output on multiplatform
+ 	  kernels.
+ 	  
  
  config UNCOMPRESS_INCLUDE
  	string