Skip to content
  1. Sep 06, 2015
    • Rob Herring's avatar
      ARM: pxa: add memory resource to SA1100 RTC device · 2c4fabec
      Rob Herring authored
      
      
      The drivers for the SA1100 and PXA RTCs are now mutually exclusive, so
      add the memory resource for the sa1100-rtc device. Since the memory
      resource is already present in the pxa_rtc_resources, that makes
      sa1100_rtc_resources and pxa_rtc_resources equivalent, so use
      pxa_rtc_resources for both devices and remove the duplicate
      sa1100_rtc_resources.
      
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      Cc: Daniel Mack <daniel@zonque.org>
      Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
      Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: linux-arm-kernel@lists.infradead.org
      Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
      2c4fabec
    • Rob Herring's avatar
      rtc: pxa: convert to use shared sa1100 functions · 3cdf4ad9
      Rob Herring authored
      
      
      Currently, the rtc-sa1100 and rtc-pxa drivers co-exist as rtc-pxa has a
      superset of functionality. Having 2 drivers sharing the same memory
      resource is not allowed by the driver model if resources are properly
      declared. This problem was avoided by not adding memory resources to the
      SA1100 RTC driver, but that prevents clean-up of the SA1100 driver.
      
      This commit converts the PXA RTC to use the exported SA1100 RTC
      functions. Now the sa1100-rtc and pxa-rtc devices are mutually
      exclusive, so we must remove the sa1100-rtc from pxa27x and pxa3xx.
      
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      Cc: Daniel Mack <daniel@zonque.org>
      Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
      Cc: Robert Jarzmik <robert.jarzmik@free.fr>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
      Cc: linux-arm-kernel@lists.infradead.org
      Cc: rtc-linux@googlegroups.com
      Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
      3cdf4ad9
    • Rob Herring's avatar
      rtc: sa1100: prepare to share sa1100_rtc_ops · 8c0961ba
      Rob Herring authored
      
      
      Factor out the RTC initialization from the platform device specific
      parts in order to share the RTC device ops with other drivers.
      Specifically, it will be shared with rtc-pxa driver.
      
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      Cc: Robert Jarzmik <robert.jarzmik@free.fr>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
      Cc: rtc-linux@googlegroups.com
      Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
      8c0961ba
    • Wang Dongsheng's avatar
      rtc: ds3232: fix WARNING trace in resume function · dc2280eb
      Wang Dongsheng authored
      
      
      If ds3232 work on some platform that is not implementing
      irq_set_wake, ds3232 will get a WARNING trace in resume.
      So fix ds3232->suspended state to false when irq_set_irq_wake
      return error.
      
      WARNING: CPU: 0 PID: 729 at kernel/irq/manage.c:604 irq_set_irq_wake+0x4b/0x8c()
      Unbalanced IRQ 201 wake disable
      Modules linked in:
      CPU: 0 PID: 729 Comm: sh Not tainted 3.12.19-rt30+ #25
      [<800107d9>] (unwind_backtrace+0x1/0x88) from [<8000e4ef>] (show_stack+0xb/0xc)
      [<8000e4ef>] (show_stack+0xb/0xc) from [<802b5fa9>] (dump_stack+0x4d/0x60)
      [<802b5fa9>] (dump_stack+0x4d/0x60) from [<800186dd>] (warn_slowpath_common+0x45/0x64)
      [<800186dd>] (warn_slowpath_common+0x45/0x64) from [<80018717>] (warn_slowpath_fmt+0x1b/0x24)
      [<80018717>] (warn_slowpath_fmt+0x1b/0x24) from [<8003a8d3>] (irq_set_irq_wake+0x4b/0x8c)
      [<8003a8d3>] (irq_set_irq_wake+0x4b/0x8c) from [<80204fcb>] (ds3232_resume+0x2d/0x36)
      [<80204fcb>] (ds3232_resume+0x2d/0x36) from [<801954c7>] (dpm_run_callback.isra.13+0xb/0x28)
      [<801954c7>] (dpm_run_callback.isra.13+0xb/0x28) from [<80195b1b>] (device_resume+0x7b/0xa2)
      [<80195b1b>] (device_resume+0x7b/0xa2) from [<80195f0f>] (dpm_resume+0xbb/0x19c)
      [<80195f0f>] (dpm_resume+0xbb/0x19c) from [<801960d9>] (dpm_resume_end+0x9/0x12)
      [<801960d9>] (dpm_resume_end+0x9/0x12) from [<80037e1d>] (suspend_devices_and_enter+0x17d/0x1d0)
      [<80037e1d>] (suspend_devices_and_enter+0x17d/0x1d0) from [<80037ee1>] (pm_suspend+0x71/0x128)
      [<80037ee1>] (pm_suspend+0x71/0x128) from [<80037449>] (state_store+0x6d/0x80)
      [<80037449>] (state_store+0x6d/0x80) from [<800af4d5>] (sysfs_write_file+0x9f/0xde)
      [<800af4d5>] (sysfs_write_file+0x9f/0xde) from [<8007a437>] (vfs_write+0x7b/0x104)
      [<8007a437>] (vfs_write+0x7b/0x104) from [<8007a7f7>] (SyS_write+0x27/0x48)
      [<8007a7f7>] (SyS_write+0x27/0x48) from [<8000c121>] (ret_fast_syscall+0x1/0x44)
      
      Signed-off-by: default avatarWang Dongsheng <dongsheng.wang@freescale.com>
      Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
      dc2280eb
  2. Sep 05, 2015