Doug / smarc-fsl-linux-kernel

02 Oct, 2012

1 commit

  • 9cd11c0c4   Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull ARM soc multiplatform enablement from Olof Johansson:
    "This is a pretty significant branch. It's the introduction of the
    first multiplatform support on ARM, and with this (and the later
    branch) merged, it is now possible to build one kernel that contains
    support for highbank, vexpress, mvebu, socfpga, and picoxcell. More
    platforms will be convered over in the next few releases.

    Two critical last things had to be done for this to be practical and
    possible:
    * Today each platform has its own include directory under
    mach-/include/mach/*, and traditionally that is where a lot
    of driver/platform shared definitions have gone, such as platform
    data structures. They now need to move out to a common location
    instead, and this branch moves a large number of those out to
    include/linux/platform_data.
    * Each platform used to list the device trees to compile for its
    boards in mach-/Makefile.boot.

    Both of the above changes will mean that there are some merge
    conflicts to come (and some to resolve here). It's a one-time move
    and once it settles in, we should be good for quite a while. Sorry
    for the overhead."

    Fix conflicts as per Olof.

    * tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (51 commits)
    ARM: add v7 multi-platform defconfig
    ARM: msm: Move core.h contents into common.h
    ARM: highbank: call highbank_pm_init from .init_machine
    ARM: dtb: move all dtb targets to common Makefile
    ARM: spear: move platform_data definitions
    ARM: samsung: move platform_data definitions
    ARM: orion: move platform_data definitions
    ARM: vexpress: convert to multi-platform
    ARM: initial multiplatform support
    ARM: mvebu: move armada-370-xp.h in mach dir
    ARM: vexpress: remove dependency on mach/* headers
    ARM: picoxcell: remove dependency on mach/* headers
    ARM: move all dtb targets out of Makefile.boot
    ARM: picoxcell: move debug macros to include/debug
    ARM: socfpga: move debug macros to include/debug
    ARM: mvebu: move debug macros to include/debug
    ARM: vexpress: move debug macros to include/debug
    ARM: highbank: move debug macros to include/debug
    ARM: move debug macros to common location
    ARM: make mach/gpio.h headers optional
    ...

    Linus Torvalds
     

14 Sep, 2012

1 commit

  • db298da2c   ARM: nomadik: move platform_data definitions ... Browse Code »

    Platform data for device drivers should be defined in
    include/linux/platform_data/*.h, not in the architecture
    and platform specific directories.

    This moves such data out of the nomadik include directories

    Signed-off-by: Arnd Bergmann
    Acked-by: Mark Brown
    Acked-by: Greg Kroah-Hartman
    Acked-by: Nicolas Pitre
    Acked-by: Felipe Balbi
    Acked-by: Alessandro Rubini
    Acked-by: Linus Walleij
    Cc: STEricsson
    Cc: Srinidhi Kasagar
    Cc: Herbert Xu
    Cc: "David S. Miller"
    Cc: Dmitry Torokhov
    Cc: David Woodhouse
    Cc: Andreas Westin

    Arnd Bergmann
     

09 Aug, 2012

1 commit

  • 07a67bbb9   usb: musb: Make dma_controller_create __devinit ... Browse Code »

    dma_controller_create is called only from musb_init_controller
    which is __devint so annotate dma_controller_create also with
    __devint.

    fixes the warn

    WARNING: vmlinux.o(.devinit.text+0x6fa8): Section mismatch in reference from the function musb_init_controller() to the function .init.text:dma_controller_create()
    The function __devinit musb_init_controller() references
    a function __init dma_controller_create().
    If dma_controller_create is only used by musb_init_controller then
    annotate dma_controller_create with a matching annotation.

    Signed-off-by: Shubhrajyoti D
    Signed-off-by: Felipe Balbi

    Shubhrajyoti D
     

21 Mar, 2012

1 commit

  • 16052827d   dmaengine/dma_slave: introduce inline wrappers ... Browse Code »

    Add inline wrappers for device_prep_slave_sg() and device_prep_dma_cyclic()
    interfaces to hide new parameter from current users of affected interfaces.
    Convert current users to use new wrappers instead of direct calls.
    Suggested by Russell King [https://lkml.org/lkml/2012/2/3/269].

    Signed-off-by: Alexandre Bounine
    Signed-off-by: Vinod Koul

    Alexandre Bounine
     

22 Feb, 2012

1 commit

18 Jan, 2012

1 commit

  • 57f2685c1   Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ... Browse Code »

    * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)
    ARM: mach-shmobile: specify CHCLR registers on SH7372
    dma: shdma: fix runtime PM: clear channel buffers on reset
    dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit
    dmaengine/ste_dma40: clear LNK on channel startup
    dmaengine: intel_mid_dma: remove legacy pm interface
    ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
    dmaengine: intel_mid_dma: error path fix
    dmaengine: intel_mid_dma: locking and freeing fixes
    mtd: gpmi-nand: move to dma_transfer_direction
    mtd: fix compile error for gpmi-nand
    mmc: mxs-mmc: fix the dma_transfer_direction migration
    dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
    dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels
    dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe
    dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.
    dma: mxs-dma: fix a typo in comment
    DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove
    video i.MX IPU: Fix display connections
    i.MX IPU DMA: Fix wrong burstsize settings
    dmaengine/ste_dma40: allow fixed physical channel
    ...

    Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}

    The conflicts looked pretty trivial, but I'll ask people to verify them.

    Linus Torvalds
     

12 Dec, 2011

1 commit

  • be18a2518   usb: musb: ux500: optimize DMA callback routine ... Browse Code »

    Skip the use of work queue and call musb_dma_completion() directly from
    DMA callback context.

    Here follows measurements on a Snowball board with ondemand governor active.

    Performance using work queue:
    (105 MB) copied, 6.23758 s, 16.8 MB/s
    (105 MB) copied, 5.7151 s, 18.3 MB/s
    (105 MB) copied, 5.83583 s, 18.0 MB/s
    (105 MB) copied, 5.93611 s, 17.7 MB/s

    Performance without work queue
    (105 MB) copied, 5.62173 s, 18.7 MB/s
    (105 MB) copied, 5.61811 s, 18.7 MB/s
    (105 MB) copied, 5.57817 s, 18.8 MB/s
    (105 MB) copied, 5.58549 s, 18.8 MB/s

    Signed-off-by: Per Forlin
    Acked-by: Mian Yousaf Kaukab
    Signed-off-by: Felipe Balbi

    Per Forlin
     

17 Nov, 2011

1 commit

12 Aug, 2011

2 commits

18 May, 2011

1 commit