1. 22 12月, 2010 2 次提交
  2. 09 10月, 2010 1 次提交
    • P
      OMAP2+: clock: reduce the amount of standard debugging while disabling unused clocks · 6041c27f
      Paul Walmsley 提交于
      Reduce the amount of debugging generated by default when unused clocks
      are being disabled by the clock code.  The previous code would only
      generate debug-level messages, but some people who wished to run
      production kernels with debug-level messages enabled reported that the
      large number of clock disable messages were slowing boot.  Now to
      enable clock-by-clock disable messages, DEBUG needs to be defined in
      mach-omap2/clock.c.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Tuukka Tikkanen <tuukka.tikkanen@nokia.com>
      Cc: Tim Bird <tim.bird@am.sony.com>
      6041c27f
  3. 21 5月, 2010 1 次提交
    • P
      OMAP2+ clock: clean up clkt_clksel.c · 435699db
      Paul Walmsley 提交于
      This patch cleans up arch/arm/mach-omap2/clkt_clksel.c.  It:
      
      - makes several functions static that are not called outside the file;
      
      - adds documentation;
      
      - makes some code paths easier to read (hopefully), by breaking up
        compound statements and removing redundant checks;
      
      - converts some pr_err()s that indicate clock tree data problems into WARN()s,
        so they are more likely to be noticed;
      
      - and moves omap2_clk_round_rate() back into mach-omap2/clock.c, its proper
        home, since it is not clksel-specific.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      435699db
  4. 25 2月, 2010 6 次提交
    • P
      OMAP2+ clock: revise omap2_clk_{disable,enable}() · 30962d9d
      Paul Walmsley 提交于
      Simplify the code in the omap2_clk_disable() and omap2_clk_enable()
      functions, reducing levels of indentation.  This makes the code easier
      to read.  Add some additional debugging pr_debug()s here also to help
      others understand what is going on.
      
      Revise the omap2_clk_disable() logic so that it now attempts to
      disable the clock's clockdomain before recursing up the clock tree.
      Simultaneously, ensure that omap2_clk_enable() is called on parent
      clocks first, before enabling the clockdomain.  This ensures that a
      parent clock's clockdomain is enabled before the child clock's
      clockdomain.  These sequences should be the inverse of each other.
      
      Revise the omap2_clk_enable() logic so that it now cleans up after
      itself upon encountering an error.  Previously, an error enabling a
      parent clock could have resulted in inconsistent usecounts on the
      enclosing clockdomain.
      
      Remove the trivial _omap2_clk_disable() and _omap2_clk_enable() static
      functions, and replace it with the clkops calls that they were
      executing.
      
      For all this to work, the clockdomain omap2_clkdm_clk_enable() and
      omap2_clkdm_clk_disable() code must not return an error on clockdomains
      without CLKSTCTRL registers; so modify those functions to simply return 0
      in that case.
      
      While here, add some basic kerneldoc documentation on both functions,
      and get rid of some old non-CodingStyle-compliant comments that have
      existed since the dawn of time (at least, the OMAP clock framework's
      time).
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Richard Woodruff <r-woodruff2@ti.com>
      Cc: Rajendra Nayak <rnayak@ti.com>
      30962d9d
    • P
      OMAP2/3 clock: combine OMAP2 & 3 boot-time MPU rate change code · 4d30e82c
      Paul Walmsley 提交于
      The OMAP2 and OMAP3 boot-time MPU rate change code is almost
      identical.  Merge them into mach-omap2/clock.c, and add kerneldoc
      documentation.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      4d30e82c
    • P
      OMAP2 clock: drop DELAYED_APP clock flag · 8c34974a
      Paul Walmsley 提交于
      All of the clocks that are marked with DELAYED_APP are changed as part
      of the virt_prcm_set OPP virtual clock.  On 24xx, these clocks all
      need to be changed as part of a group to keep the clock tree
      functional - hence the need for the VALID_CONFIG bit, which is not
      present on later OMAPs.  These clocks should not be rate-changed
      independently.  So prevent these clocks from being changed
      independently by dropping their .round_rate and .set_rate function
      pointers.  It then turns out that the DELAYED_APP clock flag is no
      longer useful, so drop it and the associated code and renumber the
      clock flags.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Richard Woodruff <r-woodruff2@ti.com>
      8c34974a
    • P
      OMAP3/4 clock: split into per-chip family files · 657ebfad
      Paul Walmsley 提交于
      clock34xx_data.c now contains data for the OMAP34xx family, the
      OMAP36xx family, and the OMAP3517 family, so rename it to
      clock3xxx_data.c.  Rename clock34xx.c to clock3xxx.c, and move the
      chip family-specific clock functions to clock34xx.c, clock36xx.c, or
      clock3517.c, as appropriate.  So now "clock3xxx.*" refers to the OMAP3
      superset.
      
      The main goal here is to prepare to compile chip family-specific clock
      functions only for kernel builds that target that chip family.  To get to
      that point, we also need to add CONFIG_SOC_* options for those other
      chip families; that will be done in future patches, planned for 2.6.35.
      
      OMAP4 is also affected by this.  It duplicated the OMAP3 non-CORE DPLL
      clkops structure.  The OMAP4 variant of this clkops structure has been
      removed, and since there was nothing else currently in clock44xx.c, it
      too has been removed -- it can always be added back later when there
      is some content for it.  (The OMAP4 clock autogeneration scripts have been
      updated accordingly.)
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Benoît Cousson <b-cousson@ti.com>
      Cc: Rajendra Nayak <rnayak@ti.com>
      Cc: Ranjith Lohithakshan <ranjithl@ti.com>
      Cc: Tony Lindgren <tony@atomide.com>
      657ebfad
    • P
      OMAP2 clock: drop CONFIG_PARTICIPANT clock flag · 1a337717
      Paul Walmsley 提交于
      It turns out that the only purpose of the CONFIG_PARTICIPANT clock
      flag is to prevent omap2_clk_set_rate() and omap2_clk_set_parent()
      from being executed on clocks with that flag set.  The rate-changing
      component can be more directly accomplished by dropping the .set_rate
      and .round_rate function pointers from those CONFIG_PARTICIPANT struct
      clks.  As far as the parent-changing component is concerned, it turns
      out that none of the CONFIG_PARTICIPANT clocks have multiple parent
      choices, so all that is necessary is for omap2_clk_set_parent() to
      bail out early if the new parent is equal to the old parent.
      Implement this change and get rid of the flag, which has always had a
      confusing name (it appears to be a Kconfig option, falsely).
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Richard Woodruff <r-woodruff2@ti.com>
      1a337717
    • R
      OMAP2/3 clock: Extend find_idlest() to pass back idle state value · 419cc97d
      Ranjith Lohithakshan 提交于
      Current implementation defines clock idle state indicators based on the
      cpu information (cpu_is_omap24xx() or cpu_is_omap34xx()) in a system wide
      manner. This patch extends the find_idlest() function in clkops to pass
      back the idle state indicator for that clock, thus allowing idle state
      indicators to be defined on a per clock basis if required.
      
      This is specifically needed on AM35xx devices as the new IPSS clocks
      indicates the idle status (0 is idle, 1 is ready) in a way just
      opposite to how its handled in OMAP3 (0 is ready, 1 is idle).
      Signed-off-by: NRanjith Lohithakshan <ranjithl@ti.com>
      [paul@pwsan.com: updated to apply after commit 98c45457 et seq.]
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      419cc97d
  5. 27 1月, 2010 6 次提交
    • P
      OMAP2/3/4 clock: combine all omap2_clk_functions · 69ecefca
      Paul Walmsley 提交于
      The struct clk_functions for OMAP2, 3, and 4 are all essentially the
      same, so combine them.  This removes one multi-OMAP kernel impediment
      and saves memory on multi-OMAP builds.
      
      The stubs for omap2_clk_{init,exit}_cpufreq() code will removed once
      the OPP layer code that's currently in Kevin's PM branch is merged.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Kevin Hilman <khilman@deeprootsystems.com>
      69ecefca
    • P
      OMAP2 clock: move all static functions to the top of the file · 4b1f76ed
      Paul Walmsley 提交于
      Move static functions to the top of the file and ensure that their names
      are prefixed with an underscore to conform with the practice in the newer
      OMAP clock code files.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      4b1f76ed
    • P
      OMAP2/3/4 clock: move clksel clock functions into mach-omap2/clkt_clksel.c · df791b3e
      Paul Walmsley 提交于
      Move all clksel-related clock functions from mach-omap2/clock.c to
      mach-omap2/clkt_clksel.c.  This is intended to make the clock code
      easier to understand, since all of the functions needed to manage
      clksel clocks are now located in their own file, rather than being
      mixed with other, unrelated functions.
      
      Clock debugging is also now more finely-grained, since the DEBUG macro
      can now be defined for clksel clocks alon.  This should reduce
      unnecessary console noise when debugging.
      
      Also, if at some future point the mach-omap2/ directory is split
      into OMAP2/3/4 variants, this clkt file can be moved to the plat-omap/
      directory to be shared.
      
      Thanks to Alexander Shishkin <virtuoso@slind.org> for his comments to
      improve the patch description.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Alexander Shishkin <virtuoso@slind.org>
      df791b3e
    • P
      OMAP2/3/4 clock: move DPLL clock functions into mach-omap2/clkt_dpll.c · 0b96af68
      Paul Walmsley 提交于
      Move all DPLL-related clock functions from mach-omap2/clock.c to
      mach-omap2/clkt_dpll.c.  This is intended to make the clock code
      easier to understand, since all of the functions needed to manage
      DPLLs are now located in their own file, rather than being mixed with
      other, unrelated functions.
      
      Clock debugging is also now more finely-grained, since the DEBUG macro
      can now be defined for DPLLs alone.  This should reduce unnecessary
      console noise when debugging.
      
      Also, if at some future point the mach-omap2/ directory is split
      into OMAP2/3/4 variants, this clkt file can be moved to the plat-omap/
      directory to be shared.
      
      Thanks to Alexander Shishkin <virtuoso@slind.org> for his comments to
      improve the patch description.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Alexander Shishkin <virtuoso@slind.org>
      0b96af68
    • A
      ARM: OMAP4 clock framework: Remove the checks preventing OMAP4 clockdomain validation · bf985401
      Abhijit Pagare 提交于
      The clockdomain related code being in place, it is not necessary to have
      some part of the clock code commented out. This would help the validation of
      the clockdomain functions using the clock level interfaces.
      Signed-off-by: NAbhijit Pagare <abhijitpagare@ti.com>
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      bf985401
    • P
      OMAP clock: make the fixed divisor clock code available for all OMAPs · e9b98f60
      Paul Walmsley 提交于
      One of the OMAP1 clocks can use the fixed divisor recalculation code
      introduced in the OMAP2 clock code, so rename the
      omap2_fixed_divisor_recalc() function to omap_fixed_divisor_recalc()
      and make it available to all OMAPs.  A followup patch converts the OMAP1
      clock.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      e9b98f60
  6. 12 12月, 2009 3 次提交
  7. 21 10月, 2009 1 次提交
    • T
      omap: headers: Move remaining headers from include/mach to include/plat · ce491cf8
      Tony Lindgren 提交于
      Move the remaining headers under plat-omap/include/mach
      to plat-omap/include/plat. Also search and replace the
      files using these headers to include using the right path.
      
      This was done with:
      
      #!/bin/bash
      mach_dir_old="arch/arm/plat-omap/include/mach"
      plat_dir_new="arch/arm/plat-omap/include/plat"
      headers=$(cd $mach_dir_old && ls *.h)
      omap_dirs="arch/arm/*omap*/ \
      drivers/video/omap \
      sound/soc/omap"
      other_files="drivers/leds/leds-ams-delta.c \
      drivers/mfd/menelaus.c \
      drivers/mfd/twl4030-core.c \
      drivers/mtd/nand/ams-delta.c"
      
      for header in $headers; do
      	old="#include <mach\/$header"
      	new="#include <plat\/$header"
      	for dir in $omap_dirs; do
      		find $dir -type f -name \*.[chS] | \
      			xargs sed -i "s/$old/$new/"
      	done
      	find drivers/ -type f -name \*omap*.[chS] | \
      		xargs sed -i "s/$old/$new/"
      	for file in $other_files; do
      		sed -i "s/$old/$new/" $file
      	done
      done
      
      for header in $(ls $mach_dir_old/*.h); do
      	git mv $header $plat_dir_new/
      done
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      ce491cf8
  8. 03 9月, 2009 1 次提交
  9. 25 7月, 2009 1 次提交
    • P
      OMAP2/3 clock: split, rename omap2_wait_clock_ready() · 72350b29
      Paul Walmsley 提交于
      Some OMAP2/3 hardware modules have CM_IDLEST attributes that are not
      handled by the current omap2_wait_clock_ready() code.  In preparation
      for patches that fix the unusual devices, rename the function
      omap2_wait_clock_ready() to omap2_wait_module_ready() and split it
      into three parts:
      
      1. A clkops-specific companion clock return function (by default,
         omap2_clk_dflt_find_companion())
      
      2. A clkops-specific CM_IDLEST register address and bit shift return
         function (by default, omap2_clk_dflt_find_idlest())
      
      3. Code to wait for the CM to indicate that the module is ready
         (omap2_cm_wait_idlest())
      
      Clocks can now specify their own custom find_companion() and find_idlest()
      functions; used in subsequent patches.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      72350b29
  10. 20 6月, 2009 1 次提交
  11. 26 5月, 2009 2 次提交
  12. 13 5月, 2009 2 次提交
  13. 03 3月, 2009 1 次提交
    • R
      [ARM] omap: clk_set_parent: deny changing parent if clock is enabled · 4da37821
      Russell King 提交于
      Richard Woodruff writes:
      | The historic usage of this has been against single use leaf clocks
      | (1st instance of gptimer).  When it was used it did:
      |       clk_get()
      |       clk_set_parent()
      |       clk_enable()
      |
      | This usage was ok for that. Use on a disabled clock is needed.
      |
      | If there are multiple users on the clock or it is enabled there are
      | problems.
      |
      | The call can still be unfriendly if 2 different drivers are using the
      | clock with their own clock get/enable. It might be the function should
      | return an error if usecount != 0 to stop surprises.  It is all around
      | better if the parenting is done when the clock is off.
      
      This is a good reason to ensure that the clock is not enabled when
      clk_set_parent() is called.
      Acked-by: NRichard Woodruff <r-woodruff2@ti.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      4da37821
  14. 20 2月, 2009 1 次提交
    • R
      [ARM] omap: add support for bypassing DPLLs · c0bf3132
      Russell King 提交于
      This roughly corresponds with OMAP commits: 7d06c48, 3241b19,
      88b5d9b, 18a5500, 9c909ac, 5c6497b, 8b1f0bd, 2ac1da8.
      
      For both OMAP2 and OMAP3, we note the reference and bypass clocks in
      the DPLL data structure.  Whenever we modify the DPLL rate, we first
      ensure that both the reference and bypass clocks are enabled.  Then,
      we decide whether to use the reference and DPLL, or the bypass clock
      if the desired rate is identical to the bypass rate, and program the
      DPLL appropriately.  Finally, we update the clock's parent, and then
      disable the unused clocks.
      
      This keeps the parents correctly balanced, and more importantly ensures
      that the bypass clock is running whenever we reprogram the DPLL.  This
      is especially important because the procedure for reprogramming the DPLL
      involves switching to the bypass clock.
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      c0bf3132
  15. 19 2月, 2009 1 次提交
  16. 14 2月, 2009 3 次提交
  17. 09 2月, 2009 7 次提交
    • R
      [ARM] omap: fix clockdomain enable/disable ordering · 8263e5b3
      Russell King 提交于
      Based on a patch from Paul Walmsley <paul@pwsan.com>:
      
       omap2_clk_enable() should enable a clock's clockdomain before
       attempting to enable its parent clock's clockdomain.  Similarly, in
       the unlikely event that the parent clock enable fails, the clockdomain
       should be disabled.
      
       linux-omap source commit is 6d6e285e5a7912b1ea68fadac387304c914aaba8.
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      8263e5b3
    • R
      [ARM] omap: fix usecount decrement bug · a7f8c599
      Russell King 提交于
      Based upon a patch from Paul Walmsley <paul@pwsan.com>:
      
       If _omap2_clk_enable() fails, the clock's usecount must be decremented
       by one no matter whether the clock has a parent or not.
      
      but reorganised a bit.
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      a7f8c599
    • P
      [ARM] OMAP2/3 clock: convert remaining MPU barriers into OCP barriers · f11fda6a
      Paul Walmsley 提交于
      Several parts of the OMAP2/3 clock code use wmb() to try to ensure
      that the hardware write completes before continuing.  This approach is
      problematic: wmb() only ensures that the write leaves the ARM.  It
      does not ensure that the write actually reaches the endpoint device.
      The endpoint device in this case - either the PRM, CM, or SCM - is
      three interconnects away from the ARM - and the final interconnect is
      low-speed.  And the OCP interconnects will post the write, and who
      knows how long that will take to complete.  So the wmb() is not what
      we want.  Worse, the wmb() is indiscriminate; it causes the ARM to
      flush any other unrelated buffered writes and wait for the local
      interconnect to acknowledge them - potentially very expensive.
      
      Fix this by converting the wmb()s into readbacks of the same PRM/CM/SCM
      register.  Since the PRM/CM/SCM devices use a single OCP thread, this
      will cause the MPU to block while waiting for posted writes to that device
      to complete.
      
      linux-omap source commit is 260f5487848681b4d8ea7430a709a601bbcb21d1.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      f11fda6a
    • P
      [ARM] OMAP2xxx clock: consolidate DELAYED_APP clock commits; fix barrier · 439764cc
      Paul Walmsley 提交于
      Consolidate the commit code for DELAYED_APP clocks into a subroutine,
      _omap2xxx_clk_commit().  Also convert the MPU barrier wmb() into an
      OCP barrier, since with an MPU barrier, we have no guarantee that the
      write actually reached the endpoint device.
      
      linux-omap source commit is 0f5bdb736515801b296125d16937a21ff7b3cfdc.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      439764cc
    • P
      [ARM] OMAP2/3 clock: don't use a barrier after clk_disable() · de07fedd
      Paul Walmsley 提交于
      clk_disable() previously used an ARM barrier, wmb(), to try to ensure
      that the hardware write completed before continuing.  There are some
      problems with this approach.
      
      The first problem is that wmb() only ensures that the write leaves the
      ARM -- not that it actually reaches the endpoint device.  In this
      case, the endpoint device - either the PRM, CM, or SCM - is three
      interconnects away from the ARM, and the final interconnect is
      low-speed.  And the OCP interconnects will post the write, who knows
      how long that will take to complete.  So the wmb() is not really what
      we want.
      
      Worse, the wmb() is indiscriminate; it will cause the ARM to flush any
      other unrelated buffered writes and wait for the local interconnect to
      acknowledge them - potentially very expensive.
      
      This first problem could be fixed by doing a readback of the same PRM/CM/SCM
      register.  Since these devices use a single OCP thread, this will cause the
      MPU to wait for the write to complete.
      
      But the primary problem is a conceptual one: clk_disable() should not
      need any kind of barrier.  clk_enable() needs one since device driver
      code must not access a device until its clocks are known to be
      enabled.  But clk_disable() has no such restriction.
      
      Since blocking the MPU on a PRM/CM/SCM write can be a very
      high-latency operation - several hundred MPU cycles - it's worth
      avoiding this barrier if possible.
      
      linux-omap source commit is f4aacad2c0ed1055622d5c1e910befece24ef0e2.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      de07fedd
    • R
      [ARM] omap: create a proper tree of clocks · 3f0a820c
      Russell King 提交于
      Traditionally, we've tracked the parent/child relationships between
      clk structures by setting the child's parent member to point at the
      upstream clock.  As a result, when decending the tree, we have had
      to scan all clocks to find the children.
      
      Avoid this wasteful scanning by keeping a list of the clock's children.
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      3f0a820c
    • T
      [ARM] OMAP3: PM: Make sure clk_disable_unused() order is correct · 8463e20a
      Tero Kristo 提交于
      Current implementation will disable clocks in the order defined in clock34xx.h,
      at least DPLL4_M2X2 will hang in certain cases (and prevent retention / off)
      if clocks are not disabled in correct order. This patch makes sure the parent
      clocks will be active when disabling a clock.
      
      linux-omap source commit is 672680063420ef8c8c4e7271984bb9cc08171d29.
      Signed-off-by: NTero Kristo <tero.kristo@nokia.com>
      Signed-off-by: NKevin Hilman <khilman@deeprootsystems.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      8463e20a