1. 08 5月, 2012 1 次提交
  2. 18 4月, 2012 1 次提交
    • P
      ARM: OMAP1: DMTIMER: fix broken timer clock source selection · 6aaec67d
      Paul Walmsley 提交于
      DMTIMER source selection on OMAP1 is broken.  omap1_dm_timer_set_src()
      tries to use __raw_{read,write}l() to read from and write to physical
      addresses, but those functions take virtual addresses.
      
      sparse caught this:
      
      arch/arm/mach-omap1/timer.c:50:13: warning: incorrect type in argument 1 (different base types)
      arch/arm/mach-omap1/timer.c:50:13:    expected void const volatile [noderef] <asn:2>*<noident>
      arch/arm/mach-omap1/timer.c:50:13:    got unsigned int
      arch/arm/mach-omap1/timer.c:52:9: warning: incorrect type in argument 1 (different base types)
      arch/arm/mach-omap1/timer.c:52:9:    expected void const volatile [noderef] <asn:2>*<noident>
      arch/arm/mach-omap1/timer.c:52:9:    got unsigned int
      
      Fix by using omap_{read,writel}(), just like the other users of the
      MOD_CONF_CTRL_1 register in the OMAP1 codebase.  Of course, in the long term,
      removing omap_{read,write}l() is the appropriate thing to do; but
      this will take some work to do this cleanly.
      
      Looks like this was caused by 97933d6c (ARM: OMAP1: dmtimer: conversion
      to platform devices) that dangerously moved code and changed it in
      the same patch.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Tarun Kanti DebBarma <tarun.kanti@ti.com>
      Cc: stable@vger.kernel.org
      [tony@atomide.com: updated comments to include the breaking commit]
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      6aaec67d
  3. 10 4月, 2012 1 次提交
  4. 06 4月, 2012 1 次提交
    • R
      ARM: fix __io macro for PCMCIA · 1ac02d79
      Rob Herring 提交于
      With commit c334bc15 (ARM: make mach/io.h include optional), PCMCIA was
      broken. PCMCIA depends on __io() returning a valid i/o address, and most
      ARM platforms require IO_SPACE_LIMIT be set to 0xffffffff for PCMCIA. This
      needs a better fix with a fixed i/o address mapping, but for now we just
      restore things to the previous behavior.
      
      This fixes at91, omap1, pxa and sa11xx. pxa needs io.h if PCI is enabled,
      but PCMCIA is not. sa11xx already has IO_SPACE_LIMIT set to 0xffffffff,
      so it doesn't need an io.h.
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      Cc: Joachim Eastwood <joachim.eastwood@jotron.com>
      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>
      Tested-by: Paul Parsons <lost.distance@yahoo.com> (pxa270)
      Acked-by: NTony Lindgren <tony@atomide.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      1ac02d79
  5. 30 3月, 2012 1 次提交
    • G
      ARM: OMAP: pm: fix compilation break · 335aece5
      Govindraj.R 提交于
      Fix the compilation break observed on latest mainline caused
      by 9f97da78 (Disintegrate asm/system.h for ARM):
      
      arch/arm/mach-omap1/pm.c: In function 'omap_pm_prepare':
      arch/arm/mach-omap1/pm.c:587: error: implicit declaration of function 'disable_hlt'
      arch/arm/mach-omap1/pm.c: In function 'omap_pm_finish':
      arch/arm/mach-omap1/pm.c:624: error: implicit declaration of function 'enable_hlt'
      arch/arm/mach-omap1/pm.c: In function 'omap_pm_init':
      arch/arm/mach-omap1/pm.c:681: error: 'arm_pm_idle' undeclared (first use in this function)
      ...
      
      arch/arm/mach-omap2/pm.c: In function 'omap_pm_begin':
      arch/arm/mach-omap2/pm.c:239: error: implicit declaration of function 'disable_hlt'
      arch/arm/mach-omap2/pm.c: In function 'omap_pm_end':
      arch/arm/mach-omap2/pm.c:247: error: implicit declaration of function 'enable_hlt'
      Signed-off-by: NGovindraj.R <govindraj.raja@ti.com>
      Acked-by: NKevin Hilman <khilman@ti.com>
      [tony@atomide.com: updated to fix omap1 too]
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      335aece5
  6. 29 3月, 2012 2 次提交
  7. 27 3月, 2012 1 次提交
  8. 14 3月, 2012 1 次提交
  9. 12 3月, 2012 4 次提交
  10. 07 3月, 2012 2 次提交
  11. 06 3月, 2012 5 次提交
    • T
      ARM: OMAP1: Fix section mismatch for omap1_init_early() · 8eaa7bb0
      Tony Lindgren 提交于
      Fix the following warning:
      
      WARNING: vmlinux.o(.text+0x1286c): Section mismatch in reference
      from the function omap1_init_early() to the function .init.text:omap1_clk_init()
      The function omap1_init_early() references
      the function __init omap1_clk_init().
      This is often because omap1_init_early lacks a __init 
      annotation or the annotation of omap1_clk_init is wrong.
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      8eaa7bb0
    • M
      ARM: OMAP1: Fix typo in lcd_dma.c · 33c3f71c
      Masanari Iida 提交于
      Correct spelling "resulotion" to "resolution" in
      arch/arm/mach-omap1/lcd_dma.c
      Signed-off-by: NMasanari Iida <standby24x7@gmail.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      33c3f71c
    • J
      ASoC: OMAP: ams-delta: drop .set_bias_level callback · 0379c1f5
      Janusz Krzysztofik 提交于
      This functionality has already been implemented in the cx20442 codec
      driver (commit f75a8ff6, "ASoC: cx20442:
      add bias control over a platform provided regulator"), no need to keep
      it here duplicated.
      
      Once done, remove the no longer used AMS_DELTA_LATCH2_MODEM_NRESET
      symbol from the board header file and a call to the regulator_toggle()
      helper function from the old API wrapper found in the board file.  While
      being at it, simplify the way the modem .pm callback handles the
      regulator and drop that helper function and its related consumer setup
      completely.
      
      Depends on patches 1/3 and 2/3 for clean apply and keep things working.
      Signed-off-by: NJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
      Acked-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      Cc: Tony Lindgren <tony@atomide.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      0379c1f5
    • J
      ARM: OMAP1: ams-delta: update the modem to use regulator API · aabf3173
      Janusz Krzysztofik 提交于
      After the CX20442 codec driver already takes care of enabling the codec
      power for itself (commit f75a8ff6,
      "ASoC: cx20442: add bias control over a platform provided regulator"),
      but before dropping the old bias control method from the Amstrad Delta
      ASoC sound card file, which in fact keeps the modem power always on,
      even on the ASoC device close for now, extend the modem setup with a
      power management callback which toggles the regulator up to the modem's
      needs, reusing the previously set up regulator consumer for this. Also,
      drop the MODEM_NRESET pin setup from the modem initialization procedure,
      as this operation was already ineffective since patch 1/3, and not
      needed because the regulator is set up as initially enabled.
      
      Depends on patch 1/3 "ARM: OMAP1: ams-delta: set up regulator over modem
      reset GPIO pin" to apply cleanly.
      Signed-off-by: NJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
      Cc: Tony Lindgren <tony@atomide.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      aabf3173
    • J
      ARM: OMAP1: ams-delta: set up regulator over modem reset GPIO pin · ac2885df
      Janusz Krzysztofik 提交于
      The Amstrad Delta on-board latch2 bit named MODEM_NRESET, now available
      as a GPIO pin AMS_DELTA_GPIO_PIN_NMODEM_RESET, is used to power up/down
      (bring into/out of a reset state) two distinct on-board devices
      simultaneously: the modem, and the voice codec. As a consequence, that
      bit is, or can be, manipulated concurrently by two drivers, or their
      platform provided hooks.
      
      Instead of updating those drivers to use the gpiolib API as a new method
      of controlling the MODEM_NRESET pin state, like it was done to other
      drivers accessing latch2 pins, and still being vulnerable to potential
      concurrency conflicts, or trying to solve that sharing issue with a
      custom piece of code, set up a fixed regulator device on top of that
      GPIO pin, with the intention of updating both drivers to manipulate that
      regulator, not the GPIO pin directly.
      
      Before the ASoC driver is updated and the modem platform data expanded
      with a power management callback for switching its power, the
      ams_delta_latch_write() function, which still provides the old API for
      accessing latch2 functionality from not updated drivers, is modified to
      toggle the regulator instead of the MODEM_NRESET GPIO pin.  A helper
      function provided for balancing the regulator enable/disable operations,
      together with the consumer data needed for tracking the regulator state,
      will be removed once the drivers are updated.
      
      Depends on patch series "ARM: OMAP1: ams-delta: replace custom I/O with
      GPIO".
      Signed-off-by: NJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      ac2885df
  12. 02 3月, 2012 2 次提交
  13. 25 2月, 2012 4 次提交
  14. 23 2月, 2012 3 次提交
  15. 22 2月, 2012 2 次提交
  16. 10 2月, 2012 1 次提交
  17. 06 2月, 2012 7 次提交
  18. 21 1月, 2012 1 次提交