1. 25 12月, 2012 8 次提交
    • S
      ARM: remove struct sys_timer suspend and resume fields · 7704c095
      Stephen Warren 提交于
      These fields duplicate e.g. struct clock_event_device's suspend and
      resume fields, so remove them now that nothing is using them. The aim
      is to remove all fields from struct sys_timer except .init, then replace
      the ARM machine descriptor's .timer field with a .init_time function
      instead, and delete struct sys_timer.
      Reviewed-by: NLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      7704c095
    • S
      ARM: samsung: register syscore_ops for timer resume directly · 656c669b
      Stephen Warren 提交于
      Instead of using struct sys_timer's resume function, register syscore_ops
      directly in s3c2410_timer_init(). This will allow the sys_timer suspend/
      resume fields to be removed, and eventually lead to a complete removal of
      struct sys_timer.
      
      Cc: Ben Dooks <ben-linux@fluff.org>
      Cc: Kukjin Kim <kgene.kim@samsung.com>
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      656c669b
    • S
      ARM: ux500: convert timer suspend/resume to clock_event_device · 8726e96f
      Stephen Warren 提交于
      Move ux500's timer suspend/resume functions from struct sys_timer
      ux500_timer into struct clock_event_device nmdk_clkevt. This
      will allow the sys_timer suspend/resume fields to be removed, and
      eventually lead to a complete removal of struct sys_timer.
      
      Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
      Acked-by: NLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      8726e96f
    • S
      ARM: sa1100: convert timer suspend/resume to clock_event_device · e3cbfb62
      Stephen Warren 提交于
      Move sa1100's timer suspend/resume functions from struct sys_timer
      sa1100_timer into struct clock_event_device ckevt_sa1100_osmr0. This
      will allow the sys_timer suspend/resume fields to be removed, and
      eventually lead to a complete removal of struct sys_timer.
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      e3cbfb62
    • S
      ARM: pxa: convert timer suspend/resume to clock_event_device · 5b30d5bf
      Stephen Warren 提交于
      Move PXA's timer suspend/resume functions from struct sys_timer
      pxa_timer into struct clock_event_device ckevt_pxa_osmr0. This
      will allow the sys_timer suspend/resume fields to be removed, and
      eventually lead to a complete removal of struct sys_timer.
      
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
      Acked-by: NEric Miao <eric.y.miao@gmail.com>
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      5b30d5bf
    • S
      ARM: at91: convert timer suspend/resume to clock_event_device · 49356ae9
      Stephen Warren 提交于
      Move at91's timer suspend/resume functions from struct sys_timer
      at91sam926x_timer into struct clock_event_device pit_clkevt. This
      will allow the sys_timer suspend/resume fields to be removed, and
      eventually lead to a complete removal of struct sys_timer.
      
      Cc: Andrew Victor <linux@maxim.org.za>
      Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
      Acked-by: NJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      49356ae9
    • S
      ARM: set arch_gettimeoffset directly · 23c197b7
      Stephen Warren 提交于
      remove ARM's struct sys_timer .offset function pointer, and instead
      directly set the arch_gettimeoffset function pointer when the timer
      driver is initialized. This requires multiplying all function results
      by 1000, since the removed arm_gettimeoffset() did this. Also,
      s/unsigned long/u32/ just to make the function prototypes exactly
      match that of arch_gettimeoffset.
      
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Andrew Victor <linux@maxim.org.za>
      Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
      Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
      Cc: Hartley Sweeten <hsweeten@visionengravers.com>
      Cc: Ryan Mallon <rmallon@gmail.com>
      Cc: Ben Dooks <ben-linux@fluff.org>
      Cc: Kukjin Kim <kgene.kim@samsung.com>
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      23c197b7
    • S
      time: convert arch_gettimeoffset to a pointer · 7b1f6207
      Stephen Warren 提交于
      Currently, whenever CONFIG_ARCH_USES_GETTIMEOFFSET is enabled, each
      arch core provides a single implementation of arch_gettimeoffset(). In
      many cases, different sub-architectures, different machines, or
      different timer providers exist, and so the arch ends up implementing
      arch_gettimeoffset() as a call-through-pointer anyway. Examples are
      ARM, Cris, M68K, and it's arguable that the remaining architectures,
      M32R and Blackfin, should be doing this anyway.
      
      Modify arch_gettimeoffset so that it itself is a function pointer, which
      the arch initializes. This will allow later changes to move the
      initialization of this function into individual machine support or timer
      drivers. This is particularly useful for code in drivers/clocksource
      which should rely on an arch-independant mechanism to register their
      implementation of arch_gettimeoffset().
      
      This patch also converts the Cris architecture to set arch_gettimeoffset
      directly to the final implementation in time_init(), because Cris already
      had separate time_init() functions per sub-architecture. M68K and ARM
      are converted to set arch_gettimeoffset to the final implementation in
      later patches, because they already have function pointers in place for
      this purpose.
      
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Mike Frysinger <vapier@gentoo.org>
      Cc: Mikael Starvik <starvik@axis.com>
      Cc: Hirokazu Takata <takata@linux-m32r.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Acked-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: NJesper Nilsson <jesper.nilsson@axis.com>
      Acked-by: NJohn Stultz <johnstul@us.ibm.com>
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      7b1f6207
  2. 22 12月, 2012 1 次提交
  3. 21 12月, 2012 4 次提交
  4. 20 12月, 2012 14 次提交
  5. 19 12月, 2012 4 次提交
  6. 18 12月, 2012 6 次提交
    • A
      ARM: davinci: remove rtc kicker release · 852168c9
      Afzal Mohammed 提交于
      rtc-omap driver is now capable of handling kicker mechanism, hence remove
      kicker handling at platform level, instead provide proper device name so
      that driver can handle kicker mechanism by itself
      Signed-off-by: NAfzal Mohammed <afzal@ti.com>
      Acked-by: NSekhar Nori <nsekhar@ti.com>
      Cc: Grant Likely <grant.likely@secretlab.ca>
      Cc: Sekhar Nori <nsekhar@ti.com>
      Cc: Kevin Hilman <khilman@ti.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Cc: Daniel Mack <zonque@gmail.com>
      Cc: Vaibhav Hiremath <hvaibhav@ti.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      852168c9
    • M
      ARM: sunxi: Change device tree naming scheme for sunxi · 68136b10
      Maxime Ripard 提交于
      There is several different SoCs sharing the sun5i codename: A10s, A12
      and A13. Since there is enough differences to not consider those the
      same SoCs, change a bit the naming scheme to reflect this.
      
      Moreover, some boards like the olinuxino come in A10s and A13 variants,
      which also share the same SoC codename.
      
      So change the naming scheme to reflect both the codename and the market
      name of the SoCs used in the dtsi and in the board files
      Signed-off-by: NMaxime Ripard <maxime.ripard@free-electrons.com>
      Acked-by: NArnd Bergmann <arnd@arndb.de>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      68136b10
    • L
      ARM: ux500: fix missing include · 2cdda350
      Linus Walleij 提交于
      Commit db298da2
      "ARM: nomadik: move platform_data definition"
      moved the Ux500-specific musb header from <mach/usb.h>
      to <linux/platform_data/usb-musb-ux500.h>
      
      However that makes some board code fail to compile
      now:
      
      CC      arch/arm/mach-ux500/board-mop500.o
      linux/arch/arm/mach-ux500/cpu-db8500.c: In function 'u8500_init_devices':
      linux/arch/arm/mach-ux500/cpu-db8500.c:226:2: error: implicit declaration of function 'ux500_add_usb' [-Werror=implicit-function-declaration]
      cc1: some warnings being treated as errors
      make[3]: *** [arch/arm/mach-ux500/cpu-db8500.o] Error 1
      make[3]: *** Waiting for unfinished jobs....
      make[2]: *** [arch/arm/mach-ux500] Error 2
      make[2]: *** Waiting for unfinished jobs....
      
      So fix this up by adding the proper include file that
      appears to have been brought in implicitly one or another
      way in the past.
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      2cdda350
    • L
      ARM: u300: delete custom pin hog code · 761dc26d
      Linus Walleij 提交于
      With recent changes in the kernel, the MMCI and PL011 UART
      drivers will autonomously request their pins to be muxed in,
      so this machine-specific pin hogging code is just interfering
      with the proper mechanism and causing regressions in the v3.8
      kernel. Delete it and the problems go away.
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      761dc26d
    • O
      ARM: davinci: fix build break due to missing include · 6a2461a4
      Olof Johansson 提交于
      arch/arm/mach-davinci/board-da850-evm.c: In function 'da850_evm_init':
      arch/arm/mach-davinci/board-da850-evm.c:1516:2: error: implicit declaration of function 'sram_get_gen_pool' [-Werror=implicit-function-declaration]
      arch/arm/mach-davinci/board-da850-evm.c:1516:31: warning: assignment makes pointer from integer without a cast [enabled by default]
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      Cc: Sekhar Nori <nsekhar@ti.com>
      Cc: Kevin Hilman <khilman@ti.com>
      6a2461a4
    • O
      ARM: exynos: Fix warning due to missing 'inline' in stub · d0c2e4e4
      Olof Johansson 提交于
      In file included from arch/arm/mach-exynos/clock-exynos5.c:29:0:
      arch/arm/mach-exynos/common.h:28:12: warning: 'exynos_pm_late_initcall' defined but not used [-Wunused-function]
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      Cc: Kukjin Kim <kgene.kim@samsung.com>
      Cc: Shawn Guo <shawn.guo@linaro.org>
      d0c2e4e4
  7. 17 12月, 2012 3 次提交