27 Sep, 2011

3 commits


08 Jul, 2011

1 commit


09 Mar, 2011

1 commit

  • Commit 3cf32bba8ca0e0052ca41d74d455a5805b7fea85 ("OMAP: McBSP: Convert
    McBSP to platform device model") breaks compilation with non-multi-OMAP1
    configs:

    CC arch/arm/mach-omap1/mcbsp.o
    arch/arm/mach-omap1/mcbsp.c: In function 'omap1_mcbsp_init':
    arch/arm/mach-omap1/mcbsp.c:384: warning: dereferencing 'void *' pointer
    arch/arm/mach-omap1/mcbsp.c:387: error: invalid use of void expression
    arch/arm/mach-omap1/mcbsp.c:390: warning: dereferencing 'void *' pointer
    arch/arm/mach-omap1/mcbsp.c:393: error: invalid use of void expression

    Fix by avoiding NULL dereferences.

    Signed-off-by: Paul Walmsley
    Cc: Kishon Vijay Abraham I
    Cc: Tony Lindgren
    Acked-by: Jarkko Nikula
    [tony@atomide.com: updated description not to remove unnecessary branch name]
    Signed-off-by: Tony Lindgren

    Paul Walmsley
     

25 Feb, 2011

1 commit

  • Implement McBSP as platform device and add support for
    registering through platform device layer using resource
    structures.

    Later in this patch series, OMAP2+ McBSP driver would be modified to
    use hwmod framework after populating the omap2+ hwmod database.

    Signed-off-by: Kishon Vijay Abraham I
    Acked-by: Peter Ujfalusi
    Acked-by: Jarkko Nikula
    Acked-by: Mark Brown
    Signed-off-by: Tony Lindgren

    Kishon Vijay Abraham I
     

11 Dec, 2010

1 commit


25 Nov, 2010

1 commit

  • Make some functions static to get rid of the following sparse warnings:

    arch/arm/mach-omap1/mcbsp.c:177:12: warning: symbol 'omap1_mcbsp_init' was not declared. Should it be static?
    arch/arm/mach-omap1/mux.c:346:22: warning: symbol 'omap1_cfg_reg' was not declared. Should it be static?
    arch/arm/plat-omap/dma.c:177:5: warning: symbol 'omap_dma_in_1510_mode' was not declared. Should it be static?
    arch/arm/plat-omap/sram.c:273:12: warning: symbol 'omap1_sram_init' was not declared. Should it be static?

    Signed-off-by: Aaro Koskinen
    Signed-off-by: Tony Lindgren

    Aaro Koskinen
     

05 Jul, 2010

1 commit

  • OMAP_DSP doesn't exist in Kconfig, therefore removing all
    references for it from the source code.

    Signed-off-by: Christoph Egger
    [tony@atomide.com: updated to apply on top of already queued patches]
    Signed-off-by: Tony Lindgren

    Christoph Egger
     

30 Mar, 2010

1 commit

  • …it slab.h inclusion from percpu.h

    percpu.h is included by sched.h and module.h and thus ends up being
    included when building most .c files. percpu.h includes slab.h which
    in turn includes gfp.h making everything defined by the two files
    universally available and complicating inclusion dependencies.

    percpu.h -> slab.h dependency is about to be removed. Prepare for
    this change by updating users of gfp and slab facilities include those
    headers directly instead of assuming availability. As this conversion
    needs to touch large number of source files, the following script is
    used as the basis of conversion.

    http://userweb.kernel.org/~tj/misc/slabh-sweep.py

    The script does the followings.

    * Scan files for gfp and slab usages and update includes such that
    only the necessary includes are there. ie. if only gfp is used,
    gfp.h, if slab is used, slab.h.

    * When the script inserts a new include, it looks at the include
    blocks and try to put the new include such that its order conforms
    to its surrounding. It's put in the include block which contains
    core kernel includes, in the same order that the rest are ordered -
    alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
    doesn't seem to be any matching order.

    * If the script can't find a place to put a new include (mostly
    because the file doesn't have fitting include block), it prints out
    an error message indicating which .h file needs to be added to the
    file.

    The conversion was done in the following steps.

    1. The initial automatic conversion of all .c files updated slightly
    over 4000 files, deleting around 700 includes and adding ~480 gfp.h
    and ~3000 slab.h inclusions. The script emitted errors for ~400
    files.

    2. Each error was manually checked. Some didn't need the inclusion,
    some needed manual addition while adding it to implementation .h or
    embedding .c file was more appropriate for others. This step added
    inclusions to around 150 files.

    3. The script was run again and the output was compared to the edits
    from #2 to make sure no file was left behind.

    4. Several build tests were done and a couple of problems were fixed.
    e.g. lib/decompress_*.c used malloc/free() wrappers around slab
    APIs requiring slab.h to be added manually.

    5. The script was run on all .h files but without automatically
    editing them as sprinkling gfp.h and slab.h inclusions around .h
    files could easily lead to inclusion dependency hell. Most gfp.h
    inclusion directives were ignored as stuff from gfp.h was usually
    wildly available and often used in preprocessor macros. Each
    slab.h inclusion directive was examined and added manually as
    necessary.

    6. percpu.h was updated not to include slab.h.

    7. Build test were done on the following configurations and failures
    were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
    distributed build env didn't work with gcov compiles) and a few
    more options had to be turned off depending on archs to make things
    build (like ipr on powerpc/64 which failed due to missing writeq).

    * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
    * powerpc and powerpc64 SMP allmodconfig
    * sparc and sparc64 SMP allmodconfig
    * ia64 SMP allmodconfig
    * s390 SMP allmodconfig
    * alpha SMP allmodconfig
    * um on x86_64 SMP allmodconfig

    8. percpu.h modifications were reverted so that it could be applied as
    a separate patch and serve as bisection point.

    Given the fact that I had only a couple of failures from tests on step
    6, I'm fairly confident about the coverage of this conversion patch.
    If there is a breakage, it's likely to be something in one of the arch
    headers which should be easily discoverable easily on most builds of
    the specific arch.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

    Tejun Heo
     

16 Feb, 2010

1 commit

  • Determine cache size required per McBSP port at init time, based on
    processor type running on.

    Allocate space for storing cached copies of McBSP register values at
    port request.

    Modify omap_msbcp_write() function to update the cache with every
    register write operation.

    Modify omap_mcbsp_read() to support reading from cache or hardware.

    Update MCBSP_READ() macro for modified omap_mcbsp_read() function API.

    Introduce a new macro that reads from the cache.

    Tested on OMAP1510 based Amstrad Delta using linux-omap for-next, commit
    fb7380d70e041e4b3892f6b19dff7efb609d15a4 (2.6.33-rc3+ dated 2010-01-11).
    Compile-tested with: omap_perseus2_730_defconfig, omap_generic_1610_defconfig,
    omap_generic_2420_defconfig, omap_2430sdp_defconfig, omap_3430sdp_defconfig,
    omap_4430sdp_defconfig with CONFIG_OMAP_MCBSP=y selected.

    Signed-off-by: Janusz Krzysztofik
    Acked-by: Peter Ujfalusi
    Acked-by: Jarkko Nikula
    Signed-off-by: Tony Lindgren

    Janusz Krzysztofik
     

21 Oct, 2009

1 commit

  • 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

    Tony Lindgren
     

08 Oct, 2009

3 commits


26 Jul, 2009

1 commit


24 Apr, 2009

1 commit


09 Feb, 2009

1 commit

  • Rather than introducing a special 'mcbsp_clk' with code behind it in
    mach-omap*/mcbsp.c to handle the SoC specifics, arrange for the mcbsp
    driver to be like any other driver. mcbsp requests its fck and ick
    clocks directly, and the SoC specific code deals with selecting the
    correct clock.

    There is one oddity to deal with - OMAP1 fiddles with the DSP clocks
    and DSP reset, so we move this to the two callback functions.

    Signed-off-by: Russell King

    Russell King
     

30 Jan, 2009

1 commit

  • A spin_lock deadlock will occur when omap_mcbsp_request() is invoked.

    omap_mcbsp_request()
    \- clk_enable(mcbsp->clk) [takes and holds clockfw_lock]
    \- omap2_clk_enable()
    \- _omap2_clk_enable()
    \- omap_mcbsp_clk_enable()
    \- clk_enable(child clock) [tries for clockfw_lock again]

    mcbsp_clk is a virtual clock and it comprises several child clocks. when
    enable mcbsp_clk in omap_mcbsp_request(), the enable function of mcbsp_clk
    will enable its child clocks, then the deadlock occurs.

    The solution is to remove the virtual clock and enable these child clocks in
    omap_mcbsp_request() directly.

    Signed-off-by: Stanley.Miao
    Signed-off-by: Tony Lindgren

    Stanley.Miao
     

15 Jan, 2009

1 commit


09 Jan, 2009

1 commit

  • arch/arm/mach-at91/at91cap9.c:337: error: 'NR_AIC_IRQS' undeclared here (not in a function)
    arch/arm/mach-at91/at91rm9200.c:301: error: 'NR_AIC_IRQS' undeclared here (not in a function)
    arch/arm/mach-at91/at91sam9260.c:351: error: 'NR_AIC_IRQS' undeclared here (not in a function)
    arch/arm/mach-at91/at91sam9261.c:287: error: 'NR_AIC_IRQS' undeclared here (not in a function)
    arch/arm/mach-at91/at91sam9263.c:312: error: 'NR_AIC_IRQS' undeclared here (not in a function)
    arch/arm/mach-at91/at91sam9rl.c:304: error: 'NR_AIC_IRQS' undeclared here (not in a function)
    arch/arm/mach-h720x/h7202-eval.c:38: error: implicit declaration of function 'IRQ_CHAINED_GPIOB'
    arch/arm/mach-ks8695/devices.c:46: error: 'KS8695_IRQ_WAN_RX_STATUS' undeclared here (not in a function)
    arch/arm/mach-msm/devices.c:28: error: 'INT_UART1' undeclared here (not in a function)
    arch/arm/mach-mx2/devices.c:233: error: 'MXC_GPIO_IRQ_START' undeclared here (not in a function)
    arch/arm/mach-mx3/devices.c:128: error: 'MXC_GPIO_IRQ_START' undeclared here (not in a function)
    arch/arm/mach-omap1/mcbsp.c:140: error: 'INT_730_McBSP1RX' undeclared here (not in a function)
    arch/arm/mach-omap1/mcbsp.c:165: error: 'INT_McBSP1RX' undeclared here (not in a function)
    arch/arm/mach-omap1/mcbsp.c:200: error: 'INT_McBSP1RX' undeclared here (not in a function)
    arch/arm/mach-omap2/board-apollon.c:286: error: implicit declaration of function 'omap_set_gpio_direction'
    arch/arm/mach-omap2/mcbsp.c:154: error: 'INT_24XX_MCBSP1_IRQ_RX' undeclared here (not in a function)
    arch/arm/mach-omap2/mcbsp.c:181: error: 'INT_24XX_MCBSP1_IRQ_RX' undeclared here (not in a function)
    arch/arm/mach-pxa/e350.c:36: error: 'IRQ_BOARD_START' undeclared here (not in a function)
    arch/arm/plat-s3c/dev-i2c0.c:32: error: 'IRQ_IIC' undeclared here (not in a function)
    ...

    Signed-off-by: Russell King

    Russell King
     

08 Oct, 2008

1 commit

  • Based on Chandra's earlier patches in linux-omap tree.

    Note that omap1_mcbsp_check and omap2_mcbsp_check are no longer
    needed as there's now omap_mcbsp_check_valid_id() defined.

    Also some functions can now be marked __init.

    Signed-off-by: Chandra Shekhar
    Signed-off-by: Tony Lindgren

    Chandra Shekhar
     

06 Sep, 2008

1 commit


05 Sep, 2008

1 commit


07 Aug, 2008

1 commit


03 Jul, 2008

1 commit