16 Sep, 2011

2 commits


10 Mar, 2011

1 commit

  • On OMAP2 and OMAP3 the reset ctrl shift doesn't match the
    status bit, as it does on OMAP4, when handling the reset lines.

    This patch adds a new member in the reset info structure, so now it
    can be added as part of hwmod data, and checked accordingly for
    OMAP2 or 3; otherwise, there could be cases when the shift masks
    doesn't match both of the registers, and a successful reset might
    throw an error message or vice versa.

    Signed-off-by: Omar Ramirez Luna
    [paul@pwsan.com: added a warning if st_shift used on OMAP4; renamed 'r'
    variable; improved some documentation]
    Signed-off-by: Paul Walmsley

    omar ramirez
     

08 Jan, 2011

1 commit

  • 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: Santosh Shilimkar
    Acked-by: Paul Walmsley
    Signed-off-by: Kevin Hilman

    Santosh Shilimkar
     

22 Dec, 2010

2 commits

  • Now that OMAP4-specific PRCM functions have been added, distinguish the
    existing OMAP2/3-specific PRCM functions by prefixing them with "omap2_".

    This patch should not result in any functional change.

    Signed-off-by: Paul Walmsley
    Cc: Kevin Hilman
    Cc: Jarkko Nikula
    Cc: Peter Ujfalusi
    Cc: Liam Girdwood
    Cc: Mark Brown
    Tested-by: Santosh Shilimkar
    Tested-by: Rajendra Nayak

    Paul Walmsley
     
  • 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