30 Nov, 2011

1 commit


07 Jan, 2011

1 commit

  • * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (243 commits)
    omap2: Make OMAP2PLUS select OMAP_DM_TIMER
    OMAP4: hwmod data: Fix alignment and end of line in structurefields
    OMAP4: hwmod data: Move the DMA structures
    OMAP4: hwmod data: Move the smartreflex structures
    OMAP4: hwmod data: Fix missing SIDLE_SMART_WKUP in smartreflexsysc
    arm: omap: tusb6010: add name for MUSB IRQ
    arm: omap: craneboard: Add USB EHCI support
    omap2+: Initialize serial port for dynamic remuxing for n8x0
    omap2+: Add struct omap_board_data and use it for platform level serial init
    omap2+: Allow hwmod state changes to mux pads based on the state changes
    omap2+: Add support for hwmod specific muxing of devices
    omap2+: Add omap_mux_get_by_name
    OMAP2: PM: fix compile error when !CONFIG_SUSPEND
    MAINTAINERS: OMAP: hwmod: update hwmod code, data maintainership
    OMAP4: Smartreflex framework extensions
    OMAP4: hwmod: Add inital data for smartreflex modules.
    OMAP4: PM: Program correct init voltages for scalable VDDs
    OMAP4: Adding voltage driver support
    OMAP4: Register voltage PMIC parameters with the voltage layer
    OMAP3: PM: Program correct init voltages for VDD1 and VDD2
    ...

    Fix up trivial conflict in arch/arm/plat-omap/Kconfig

    Linus Torvalds
     

22 Dec, 2010

2 commits

  • J-Type DPLLs have additional configuration parameters that need to
    be programmed when setting the multipler and divider for the DPLL.
    These parameters being the sigma delta divider (SD_DIV) for the DPLL
    and the digital controlled oscillator (DCO) to be used by the DPLL.

    The current code is implemented specifically to configure the
    OMAP3630 PER J-Type DPLL. The OMAP4430 USB DPLL is also a J-Type DPLL
    and so this code needs to be updated to work for both OMAP3 and OMAP4
    devices and any other future devices that have J-TYPE DPLLs.

    For the OMAP3630 PER DPLL both the SD_DIV and DCO paramenters are
    used but for the OMAP4430 USB DPLL only the SD_DIV field is used.
    The current implementation will only program the SD_DIV and DCO
    fields if the DPLL has both and hence this does not work for
    OMAP4430.

    In order to make the code more generic add two new fields to the
    dpll_data structure for the SD_DIV field and DCO field bit-masks
    and only program these fields if the masks are defined for a specific
    DPLL. This simplifies the code and allows us to remove the flag
    DPLL_NO_DCO_SEL.

    Tested on OMAP36xx Zoom3 and OMAP4 Blaze.

    Signed-off-by: Jon Hunter
    [paul@pwsan.com: removed explicit inlining and added '_' prefix on lookup_*()
    functions; added testing info to commit message; added 35xx comments back in]
    Signed-off-by: Paul Walmsley

    Jon Hunter
     
  • In preparation for adding OMAP4-specific PRCM accessor/mutator
    functions, split the existing OMAP2/3 PRCM code into OMAP2/3-specific
    files. Most of what was in mach-omap2/{cm,prm}.{c,h} has now been
    moved into mach-omap2/{cm,prm}2xxx_3xxx.{c,h}, since it was
    OMAP2xxx/3xxx-specific.

    This process also requires the #includes in each of these files to be
    changed to reference the new file name. As part of doing so, add some
    comments into plat-omap/sram.c and plat-omap/mcbsp.c, which use
    "sideways includes", to indicate that these users of the PRM/CM includes
    should not be doing so.

    Thanks to Felipe Contreras for comments on this
    patch.

    Signed-off-by: Paul Walmsley
    Cc: Jarkko Nikula
    Cc: Peter Ujfalusi
    Cc: Liam Girdwood
    Cc: Omar Ramirez Luna
    Acked-by: Omar Ramirez Luna
    Cc: Felipe Contreras
    Acked-by: Felipe Contreras
    Cc: Greg Kroah-Hartman
    Acked-by: Mark Brown
    Reviewed-by: Kevin Hilman
    Tested-by: Kevin Hilman
    Tested-by: Rajendra Nayak
    Tested-by: Santosh Shilimkar

    Paul Walmsley
     

26 Nov, 2010

1 commit


17 Jun, 2010

1 commit


25 Feb, 2010

3 commits

  • The maximum DPLL multiplier (M) values for OMAP2xxx and OMAP3xxx are
    one increment higher than they should be. See for example the
    OMAP242x TRM Rev X Section 5.10.6 "Clock Generator Registers" and the
    OMAP36xx TRM Rev C Table 3-202 "CM_CLKSEL1_PLL". Programming a 0 into
    the DPLL's M register bitfield is valid for OMAP2/3 and indicates that
    the DPLL should enter MN-bypass mode. Also, increase the minimum
    multiplier (M) value for the DPLL rate rounding code from 1 to 2, to
    ensure that it does not inadvertently put the DPLL into bypass.

    Note that the register documentation in the OMAP2xxx and OMAP3xxx TRMs
    does not make clear that the actual DPLL divider value (the "N") is
    the content of the appropriate register bitfield for the N value,
    _plus one_. (In other words, an N register bitfield of 0 indicates a
    DPLL divider value of 1.) This is only clearly documented in the
    OMAP4430 TRM, in, for example, OMAP4430 TRM Rev A Table 3-1167
    "CM_CLKSEL_DPLL_USB".

    While here, update copyrights, add kerneldoc for struct dpll_data,
    drop the unused struct dpll_data.max_tolerance field, remove some
    unnecessary #includes in DPLL-related code, and replace the #include
    of with , which is what was really
    needed. The OMAP4 clock autogenerator script has been updated
    accordingly.

    Signed-off-by: Paul Walmsley
    Cc: Benoît Cousson
    Cc: Rajendra Nayak

    Paul Walmsley
     
  • DPLL4 for 3630 introduces a changed block called j type dpll, requiring
    special divisor bits and additional reg fields. To allow for silicons to
    use this, this is introduced as a flag and is enabled for 3630 silicon.
    OMAP4 also has j type dpll for usb.

    Tested with 3630 ZOOM3 and OMAP3430 ZOOM2

    Signed-off-by: Richard Woodruff
    Signed-off-by: Nishanth Menon
    Signed-off-by: Vishwanath BS
    [paul@pwsan.com: added some comments; updated copyrights and credits; fixed
    some style issues]
    Signed-off-by: Paul Walmsley

    Richard Woodruff
     
  • DPLL_FREQSEL field in CLKEN_PLL register is no longer valid for
    OMAP3630. So remove references to that.

    Signed-off-by: Vishwanath BS
    Cc: Sergei Shtylyov
    [paul@pwsan.com: added comment fix from Sergei Shtylyov]
    Signed-off-by: Paul Walmsley

    Vishwanath BS
     

30 Jan, 2010

1 commit

  • Move all static functions up to the top of the file to match the
    practice in other OMAP clock code. Make omap3_noncore_dpll_program()
    static (noted by sparse) and prepend an underscore to the function
    name to mark that it is file-local.

    Signed-off-by: Paul Walmsley

    Paul Walmsley
     

27 Jan, 2010

1 commit