1. 24 3月, 2012 19 次提交
  2. 17 3月, 2012 1 次提交
  3. 06 3月, 2012 1 次提交
  4. 03 3月, 2012 1 次提交
    • K
      ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XX · b130d5c2
      Kukjin Kim 提交于
      This patch changes the ARCH name to "ARCH_S3C24XX" for Samsung
      S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443,
      and S3C2450 SoCs so that we can merge the mach-xxx directories
      and plat-s3c24xx dir. to just one mach-s3c24xx for them.
      
      I think this should be sent to upstream via samsung tree because
      this touches many samsung stuff.
      
      Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
      Cc: Richard Purdie <rpurdie@rpsys.net>
      Cc: Chris Ball <cjb@laptop.org>
      Cc: David Woodhouse <dwmw2@infradead.org>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Cc: Grant Likely <grant.likely@secretlab.ca>
      Cc: Greg Kroah-Hartman <gregkh@suse.de>
      [for the gadget part:]
      Acked-by: NFelipe Balbi <balbi@ti.com>
      [for the framebuffer (video) part:]
      Acked-by: NFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
      [For the watchdog-part:]
      Acked-by: NWim Van Sebroeck <wim@iguana.be>
      Cc: Sangbeom Kim <sbkim73@samsung.com>
      Cc: Liam Girdwood <lrg@ti.com>
      Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
      Cc: Russell King <rmk+kernel@arm.linux.org.uk>
      Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
      b130d5c2
  5. 28 2月, 2012 2 次提交
  6. 14 2月, 2012 1 次提交
  7. 27 1月, 2012 3 次提交
    • R
      rtc: Disable the alarm in the hardware (v2) · 41c7f742
      Rabin Vincent 提交于
      Currently, the RTC code does not disable the alarm in the hardware.
      
      This means that after a sequence such as the one below (the files are in the
      RTC sysfs), the box will boot up after 2 minutes even though we've
      asked for the alarm to be turned off.
      
      	# echo $((`cat since_epoch`)+120) > wakealarm
      	# echo 0 > wakealarm
      	# poweroff
      
      Fix this by disabling the alarm when there are no timers to run.
      
      The original version of this patch was reverted. This version
      disables the irq directly instead of setting a disabled timer
      in the future.
      
      Cc: stable@kernel.org
      Cc: John Stultz <john.stultz@linaro.org>
      Signed-off-by: NRabin Vincent <rabin.vincent@stericsson.com>
      [Merged in the second revision from Rabin]
      Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
      41c7f742
    • N
      rtc: Expire alarms after the time is set. (v2) · 5f9679d2
      NeilBrown 提交于
      If the alarm time programming in the rtc is ever in the past, it won't fire,
      and any other alarm will be queued after it so they won't fire either.
      
      So any time that the alarm might be in the past, we need to trigger
      the irq handler to ensure the old alarm is cleared and the timer queue
      is fully in the future.
      
      This is done whenever the RTC clock is set.
      
      This is the second revision of this patch, which was earlier reverted.
      This version avoids the initialization problem, which is handled by
      a different patch.
      Tested-by: NSander Eikelenboom <linux@eikelenboom.it>
      Signed-off-by: NNeilBrown <neilb@suse.de>
      [Remove problematic initialization change, update commit log, also
      catch set_mmss case -jstultz]
      Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
      5f9679d2
    • J
      rtc: Avoid setting alarm to a time in the past · bd729d72
      John Stultz 提交于
      In some cases at boot up, the RTC alarm may be set in the past,
      but still have the enabled flag on. This was causing problems,
      because we would then enqueue the alarm into the timerqueue,
      but it would never fire. This would clog up the timerqueue
      and keep other alarms from working.
      
      The fix is to check the alarm against the current rtc time at
      boot and avoid enqueueing the alarm if it is in the past.
      Reported-by: NNeilBrown <neilb@suse.de>
      Tested-by: NNeilBrown <neilb@suse.de>
      Tested-by: NSander Eikelenboom <linux@eikelenboom.it>
      Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
      bd729d72
  8. 20 1月, 2012 2 次提交
    • R
      Revert "RTC: sa1100: remove redundant code of setting alarm" · 57270fcd
      Russell King 提交于
      This reverts commit 42874759.
      
      This wasn't tested as a stand-alone patch, and it has build errors
      without the following patches applied:
      
      drivers/rtc/rtc-sa1100.c: In function 'sa1100_rtc_set_alarm':
      drivers/rtc/rtc-sa1100.c:208: error: 'now' undeclared (first use in this function)
      drivers/rtc/rtc-sa1100.c:208: error: (Each undeclared identifier is reported only once
      drivers/rtc/rtc-sa1100.c:208: error: for each function it appears in.)
      drivers/rtc/rtc-sa1100.c:210: error: incompatible type for argument 3 of 'rtc_next_alarm_time'
      drivers/rtc/rtc-sa1100.c:211: error: 'time' undeclared (first use in this function)
      
      So it too gets reverted to bring us back to a working point.
      57270fcd
    • R
      Revert "RTC: sa1100: support sa1100, pxa and mmp soc families" · a0164a57
      Russell King 提交于
      This reverts commit 7cea0065.
      
      The sa1100 cleanups fatally broke the SA1100 RTC driver - the first
      hint that something is wrong are these compiler warnings:
      
      drivers/rtc/rtc-sa1100.c:42:1: warning: "RCNR" redefined
      In file included from arch/arm/mach-sa1100/include/mach/hardware.h:73,
                       from drivers/rtc/rtc-sa1100.c:35:
      arch/arm/mach-sa1100/include/mach/SA-1100.h:877:1: warning: this is the location of the previous definition
      drivers/rtc/rtc-sa1100.c:43:1: warning: "RTAR" redefined
      arch/arm/mach-sa1100/include/mach/SA-1100.h:876:1: warning: this is the location of the previous definition
      drivers/rtc/rtc-sa1100.c:44:1: warning: "RTSR" redefined
      arch/arm/mach-sa1100/include/mach/SA-1100.h:879:1: warning: this is the location of the previous definition
      drivers/rtc/rtc-sa1100.c:45:1: warning: "RTTR" redefined
      arch/arm/mach-sa1100/include/mach/SA-1100.h:878:1: warning: this is the location of the previous definition
      drivers/rtc/rtc-sa1100.c:47:1: warning: "RTSR_HZE" redefined
      arch/arm/mach-sa1100/include/mach/SA-1100.h:891:1: warning: this is the location of the previous definition
      drivers/rtc/rtc-sa1100.c:48:1: warning: "RTSR_ALE" redefined
      arch/arm/mach-sa1100/include/mach/SA-1100.h:890:1: warning: this is the location of the previous definition
      drivers/rtc/rtc-sa1100.c:49:1: warning: "RTSR_HZ" redefined
      arch/arm/mach-sa1100/include/mach/SA-1100.h:889:1: warning: this is the location of the previous definition
      drivers/rtc/rtc-sa1100.c:50:1: warning: "RTSR_AL" redefined
      arch/arm/mach-sa1100/include/mach/SA-1100.h:888:1: warning: this is the location of the previous definition
      
      and the second problem, which is far more severe, are the different
      register layouts, resulting in the wrong registers being read on
      SA11x0 platforms.  This patch adds:
      
      	#define RCNR           0x00    /* RTC Count Register */
      	#define RTAR           0x04    /* RTC Alarm Register */
      	#define RTSR           0x08    /* RTC Status Register */
      	#define RTTR           0x0c    /* RTC Timer Trim Register */
      
      but the SA11x0 registers are:
      
      	#define RTAR            __REG(0x90010000)  /* RTC Alarm Reg. */
      	#define RCNR            __REG(0x90010004)  /* RTC CouNt Reg. */
      	#define RTTR            __REG(0x90010008)  /* RTC Trim Reg. */
      	#define RTSR            __REG(0x90010010)  /* RTC Status Reg. */
      a0164a57
  9. 11 1月, 2012 10 次提交