1. 02 2月, 2011 3 次提交
  2. 01 2月, 2011 3 次提交
  3. 28 1月, 2011 3 次提交
  4. 27 1月, 2011 1 次提交
    • K
      OMAP3: PM: fix save secure RAM to restore MPU power state · 617fcc98
      Kevin Hilman 提交于
      Currently, on HS/EMU devices, MPU power state forced to on during PM
      init by the save secure RAM code.  Rather than forcing the state of
      MPU powerdomain to on, simply read the current value and restore it
      after the ROM code has run.
      
      This only affects the !CPUidle case since when CPUidle is enabled, the
      MPU power state is dynamically changed by CPUidle.  In the !CPUidle
      case, MPU power state is initialized once at init and never touched.
      Acked-by: NTero Kristo <tero.kristo@nokia.com>
      Signed-off-by: NKevin Hilman <khilman@ti.com>
      617fcc98
  5. 26 1月, 2011 1 次提交
    • T
      console: rename acquire/release_console_sem() to console_lock/unlock() · ac751efa
      Torben Hohn 提交于
      The -rt patches change the console_semaphore to console_mutex.  As a
      result, a quite large chunk of the patches changes all
      acquire/release_console_sem() to acquire/release_console_mutex()
      
      This commit makes things use more neutral function names which dont make
      implications about the underlying lock.
      
      The only real change is the return value of console_trylock which is
      inverted from try_acquire_console_sem()
      
      This patch also paves the way to switching console_sem from a semaphore to
      a mutex.
      
      [akpm@linux-foundation.org: coding-style fixes]
      [akpm@linux-foundation.org: make console_trylock return 1 on success, per Geert]
      Signed-off-by: NTorben Hohn <torbenh@gmx.de>
      Cc: Thomas Gleixner <tglx@tglx.de>
      Cc: Greg KH <gregkh@suse.de>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ac751efa
  6. 25 1月, 2011 1 次提交
  7. 20 1月, 2011 3 次提交
  8. 19 1月, 2011 3 次提交
    • F
      OMAP: PRCM: remove duplicated headers · bc9fcaf3
      Felipe Balbi 提交于
      A few headers are included twice, remove them.
      
      Found the following errors using make includecheck:
      arch/arm/mach-omap2/clock44xx_data.c: prm44xx.h is
      included more than once.
      arch/arm/mach-omap2/clockdomains44xx_data.c: cm1_44xx.h
      is included more than once.
      arch/arm/mach-omap2/clockdomains44xx_data.c: cm2_44xx.h
      is included more than once.
      arch/arm/mach-omap2/powerdomain2xxx_3xxx.c: prm-regbits-34xx.h
      is included more than once.
      
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tony Lindgren <tony@atomide.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      Signed-off-by: NFelipe Balbi <balbi@ti.com>
      [paul@pwsan.com: dropped lists from patch cc:s; tweaked subject line]
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      bc9fcaf3
    • P
      OMAP4: clockdomain: bypass unimplemented wake-up dependency functions on OMAP4 · 56bc78d4
      Paul Walmsley 提交于
      Commit 56a6a19d ("omap2plus: prm:
      Trvial build break fix for undefined reference to
      'omap2_prm_read_mod_reg'") generates a lot of warnings on boot since
      clockdomain functions that manipulate wake-up dependencies are not
      implemented yet on OMAP4 for 2.6.38.  This patch bypasses the OMAP2/3
      functions on OMAP4, which in turn avoids the warnings when the
      functions would attempt to call the underlying OMAP2/3 PRCM functions.
      A one-line warning is still logged from the clockdomain code that the
      OMAP4 wake-up dependency code is not yet implemented.
      
      A clockdomain wake-up and sleep dependency implementation for OMAP4
      from Rajendra should be possible to merge during the 2.6.39 merge
      window:
      
          http://www.mail-archive.com/linux-omap@vger.kernel.org/msg41748.html
      
          http://www.mail-archive.com/linux-omap@vger.kernel.org/msg42222.htmlReported-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      Cc: Rajendra Nayak <rnayak@ti.com>
      Cc: Benoît Cousson <b-cousson@ti.com>
      Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
      Acked-by: NSantosh Shilimkar <santosh.shilimkar@ti.com>
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      56bc78d4
    • P
      OMAP: counter_32k: init clocksource as part of machine timer init · d8328f3b
      Paul Walmsley 提交于
      After commit dc548fbb ("ARM: omap: convert
      sched_clock() to use new infrastructure"), OMAPs that use the 32KiHz
      "synchronization timer" as their clocksource crash during boot:
      
      [    0.000000] OMAP clockevent source: GPTIMER1 at 32768 Hz
      [    0.000000] Unable to handle kernel NULL pointer dereference at virtual address 00000000
      [    0.000000] pgd = c0004000
      [    0.000000] [00000000] *pgd=00000000
      [    0.000000] Internal error: Oops: 80000005 [#1] SMP
      [    0.000000] last sysfs file:
      [    0.000000] Modules linked in:
      [    0.000000] CPU: 0    Tainted: G        W    (2.6.37-07734-g2467802 #7)
      [    0.000000] PC is at 0x0
      [    0.000000] LR is at sched_clock_poll+0x2c/0x3c
      [    0.000000] pc : [<00000000>]    lr : [<c0060b74>]    psr: 600001d3
      [    0.000000] sp : c058bfd0  ip : c058a000  fp : 00000000
      [    0.000000] r10: 00000000  r9 : 411fc092  r8 : 800330c8
      [    0.000000] r7 : c05a08e0  r6 : c0034c48  r5 : c05ffc40  r4 : c0034c4c
      [    0.000000] r3 : c05ffe6c  r2 : c05a0bc0  r1 : c059f098  r0 : 00000000
      [    0.000000] Flags: nZCv  IRQs off  FIQs off  Mode SVC_32  ISA ARM  Segment kernel
      [    0.000000] Control: 10c53c7f  Table: 8000404a  DAC: 00000017
      
      This is due to the recent ARM init_sched_clock() changes and the late
      initialization of the counter_32k clock source.  More information here:
      
         http://marc.info/?l=linux-omap&m=129513468605208&w=2
      
      Fix by initializing the counter_32k clocksource during the machine timer
      initialization.
      Reported-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      Tested-by: NThomas Weber <weber@corscience.de>
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      d8328f3b
  9. 14 1月, 2011 2 次提交
  10. 13 1月, 2011 1 次提交
  11. 12 1月, 2011 4 次提交
  12. 11 1月, 2011 5 次提交
  13. 10 1月, 2011 3 次提交
  14. 08 1月, 2011 6 次提交
    • S
      omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg' · 56a6a19d
      Santosh Shilimkar 提交于
      omap2plus_defocnfig build breaks when customised with only ARCH_OMAP4
      selected. This is because common files make references to the functions
      which are defined only for omap2xxx and omap3xxx.
      
       LD      .tmp_vmlinux1
      arch/arm/mach-omap2/built-in.o: In function `pm_dbg_regset_store':
      arch/arm/mach-omap2/pm-debug.c:335: undefined reference to `omap2_prm_read_mod_reg'
      arch/arm/mach-omap2/built-in.o: In function `omap2_pm_dump':
      arch/arm/mach-omap2/pm-debug.c:121: undefined reference to `omap2_prm_read_mod_reg'
      arch/arm/mach-omap2/pm-debug.c:123: undefined reference to `omap2_prm_read_mod_reg'
      arch/arm/mach-omap2/pm-debug.c:124: undefined reference to `omap2_prm_read_mod_reg'
      arch/arm/mach-omap2/pm-debug.c:125: undefined reference to `omap2_prm_read_mod_reg'
      arch/arm/mach-omap2/built-in.o: In function `omap_prcm_arch_reset':
      arch/arm/mach-omap2/prcm.c:106: undefined reference to `omap2_prm_set_mod_reg_bits'
      arch/arm/mach-omap2/prcm.c:108: undefined reference to `omap2_prm_read_mod_reg'
      arch/arm/mach-omap2/built-in.o: In function `omap_prcm_get_reset_sources':
      arch/arm/mach-omap2/prcm.c:53: undefined reference to `omap2_prm_read_mod_reg'
      arch/arm/mach-omap2/built-in.o: In function `clkdm_clear_all_wkdeps':
      arch/arm/mach-omap2/clockdomain.c:545: undefined reference to `omap2_prm_clear_mod_reg_bits'
      arch/arm/mach-omap2/built-in.o: In function `clkdm_del_wkdep':
      arch/arm/mach-omap2/clockdomain.c:475: undefined reference to `omap2_prm_clear_mod_reg_bits'
      arch/arm/mach-omap2/built-in.o: In function `clkdm_read_wkdep':
      arch/arm/mach-omap2/clockdomain.c:511: undefined reference to `omap2_prm_read_mod_bits_shift'
      arch/arm/mach-omap2/built-in.o: In function `clkdm_add_wkdep':
      arch/arm/mach-omap2/clockdomain.c:440: undefined reference to `omap2_prm_set_mod_reg_bits'
      make: *** [.tmp_vmlinux1] Error 1
      
      This patch adds stubs for these functions so that build continues to work.
      Signed-off-by: NSantosh Shilimkar <santosh.shilimkar@ti.com>
      Acked-by: NPaul Walmsley <paul@pwsan.com>
      Signed-off-by: NKevin Hilman <khilman@ti.com>
      56a6a19d
    • S
      omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask · 30299137
      Santosh Shilimkar 提交于
      struct clockdomain member clktrctrl_mask is available for only for OMAP2
      and OMAP3 architectures. Technially it is also used only for these archs
      but this breaks the build with custom OMAP4 configuration.
      
       CC      arch/arm/mach-omap2/clockdomain.o
      arch/arm/mach-omap2/clockdomain.c: In function '_enable_hwsup':
      arch/arm/mach-omap2/clockdomain.c:251: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
      arch/arm/mach-omap2/clockdomain.c:254: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
      arch/arm/mach-omap2/clockdomain.c: In function '_disable_hwsup':
      arch/arm/mach-omap2/clockdomain.c:277: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
      arch/arm/mach-omap2/clockdomain.c:280: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
      arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_sleep':
      arch/arm/mach-omap2/clockdomain.c:744: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
      arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_wakeup':
      arch/arm/mach-omap2/clockdomain.c:789: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
      arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_clk_enable':
      arch/arm/mach-omap2/clockdomain.c:922: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
      arch/arm/mach-omap2/clockdomain.c:926: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
      arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_clk_disable':
      arch/arm/mach-omap2/clockdomain.c:994: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
      arch/arm/mach-omap2/clockdomain.c:998: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
      make[1]: *** [arch/arm/mach-omap2/clockdomain.o] Error 1
      make: *** [arch/arm/mach-omap2] Error 2
      
      Fix the build break by dropping the #ifdef as suggested by Paul Walmsley
      Signed-off-by: NSantosh Shilimkar <santosh.shilimkar@ti.com>
      Acked-by: NPaul Walmsley <paul@pwsan.com>
      Signed-off-by: NKevin Hilman <khilman@ti.com>
      30299137
    • N
      omap2+: pm_bus: make functions used as pointers as static · b97c374d
      Nishanth Menon 提交于
      omap_pm_runtime_suspend and omap_pm_runtime_resume are used
      as function pointers and does not really need to be exposed
      to the world.
      
      Fixes sparse warnings:
      arch/arm/mach-omap2/pm_bus.c:23:5: warning: symbol 'omap_pm_runtime_suspend' was not declared. Should it be static?
      arch/arm/mach-omap2/pm_bus.c:40:5: warning: symbol 'omap_pm_runtime_resume' was not declared. Should it be static?
      Signed-off-by: NNishanth Menon <nm@ti.com>
      Signed-off-by: NKevin Hilman <khilman@ti.com>
      b97c374d
    • N
      OMAP2+: TWL: include pm header for init protos · dda0aea7
      Nishanth Menon 提交于
      twl_init functions are declared in pm.h and used in pm.c
      pm.h header defining the protos need to be included to
      ensure that omap_twl.c has consistent function definition.
      This fixes sparse warning:
      arch/arm/mach-omap2/omap_twl.c:237:12: warning: symbol 'omap4_twl_init' was not declared. Should it be static?
      arch/arm/mach-omap2/omap_twl.c:256:12: warning: symbol 'omap3_twl_init' was not declared. Should it be static?
      Signed-off-by: NNishanth Menon <nm@ti.com>
      Signed-off-by: NKevin Hilman <khilman@ti.com>
      dda0aea7
    • N
      OMAP2+: TWL: make conversion routines static · c84ff1cc
      Nishanth Menon 提交于
      The uv_to_vsel, vsel_to_uv functions don't need to be exposed to the
      world as they are used as function pointers. make them static.
      
      Fixes sparse warnings:
      arch/arm/mach-omap2/omap_twl.c:63:15: warning: symbol 'twl4030_vsel_to_uv' was not declared. Should it be static?
      arch/arm/mach-omap2/omap_twl.c:68:4: warning: symbol 'twl4030_uv_to_vsel' was not declared. Should it be static?
      arch/arm/mach-omap2/omap_twl.c:73:15: warning: symbol 'twl6030_vsel_to_uv' was not declared. Should it be static?
      arch/arm/mach-omap2/omap_twl.c:105:4: warning: symbol 'twl6030_uv_to_vsel' was not declared. Should it be static?
      Signed-off-by: NNishanth Menon <nm@ti.com>
      Signed-off-by: NKevin Hilman <khilman@ti.com>
      c84ff1cc
    • N
      OMAP3+: sr_device: include pm header · d0eadf6d
      Nishanth Menon 提交于
      omap_enable_smartreflex_on_init is meant to be used by boards
      which would like to have SR enabled by default on the platform, while
      omap_devinit_smartreflex is used by pm code, the protos are defined
      in pm.h. This header should be included to ensure that sr_device
      function definitions match the prototypes.
      
      including pm.h fixes the sparse warnings (with CONFIG_OMAP_SMARTREFLEX=y):
      arch/arm/mach-omap2/sr_device.c:138:13: warning: symbol 'omap_enable_smartreflex_on_init' was not declared. Should it be static?
      arch/arm/mach-omap2/sr_device.c:143:12: warning: symbol 'omap_devinit_smartreflex' was not declared. Should it be static?
      Signed-off-by: NNishanth Menon <nm@ti.com>
      Signed-off-by: NKevin Hilman <khilman@ti.com>
      d0eadf6d
  15. 07 1月, 2011 1 次提交
    • N
      omap2+: wdt: trivial sparse fixes · a9b365bd
      Nishanth Menon 提交于
      omap2_wd_timer_disable is declared in wdtimer.h and used by hwmod
      function pointers for usage, the header inclusion is necessary
      to ensure that the prototype and function remains consistent.
      omap_wdt_latency is passed as a pointer and does not need global scope
      
      Fixes sparse warnings:
      arch/arm/mach-omap2/devices.c:981:31: warning: symbol 'omap_wdt_latency' was not declared. Should it be static?
      arch/arm/mach-omap2/wd_timer.c:27:5: warning: symbol 'omap2_wd_timer_disable' was not declared. Should it be static?
      Signed-off-by: NNishanth Menon <nm@ti.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      a9b365bd