Eric Lee / smarc-fsl-linux-kernel

19 Dec, 2011

1 commit

  • 2f0778afa   ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime ... Browse Code »
    86

    sched_clock() is yet another blocker on the road to the single
    image. This patch implements an idea by Russell King:

    http://www.spinics.net/lists/linux-omap/msg49561.html

    Instead of asking the platform to implement both sched_clock()
    itself and the rollover callback, simply register a read()
    function, and let the ARM code care about sched_clock() itself,
    the conversion to ns and the rollover. sched_clock() uses
    this read() function as an indirection to the platform code.
    If the platform doesn't provide a read(), the code falls back
    to the jiffy counter (just like the default sched_clock).

    This allow some simplifications and possibly some footprint gain
    when multiple platforms are compiled in. Among the drawbacks,
    the removal of the *_fixed_sched_clock optimization which could
    negatively impact some platforms (sa1100, tegra, versatile
    and omap).

    Tested on 11MPCore, OMAP4 and Tegra.

    Cc: Imre Kaloz
    Cc: Eric Miao
    Cc: Colin Cross
    Cc: Erik Gilling
    Cc: Olof Johansson
    Cc: Sascha Hauer
    Cc: Alessandro Rubini
    Cc: STEricsson
    Cc: Lennert Buytenhek
    Cc: Ben Dooks
    Tested-by: Jamie Iles
    Tested-by: Tony Lindgren
    Tested-by: Kyungmin Park
    Acked-by: Linus Walleij
    Acked-by: Nicolas Pitre
    Acked-by: Krzysztof Halasa
    Acked-by: Kukjin Kim
    Signed-off-by: Marc Zyngier
    Signed-off-by: Russell King

    Marc Zyngier
     

02 Nov, 2011

2 commits

  • ac5761a65   Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc ... Browse Code »

    * 'next/timer' of git://git.linaro.org/people/arnd/arm-soc:
    clocksource: fixup ux500 build problems
    ARM: omap: use __devexit_p in dmtimer driver
    ARM: ux500: Reprogram timers upon resume
    ARM: plat-nomadik: timer: Export reset functions
    ARM: plat-nomadik: timer: Add support for periodic timers
    ARM: ux500: Move timer code to separate file
    ARM: ux500: add support for clocksource DBX500 PRCMU
    clocksource: add DBX500 PRCMU Timer support
    ARM: plat-nomadik: MTU sched_clock as an option
    ARM: OMAP: dmtimer: add error handling to export APIs
    ARM: OMAP: dmtimer: low-power mode support
    ARM: OMAP: dmtimer: skip reserved timers
    ARM: OMAP: dmtimer: pm_runtime support
    ARM: OMAP: dmtimer: switch-over to platform device driver
    ARM: OMAP: dmtimer: platform driver
    ARM: OMAP2+: dmtimer: convert to platform devices
    ARM: OMAP1: dmtimer: conversion to platform devices
    ARM: OMAP2+: dmtimer: add device names to flck nodes
    ARM: OMAP: Add support for dmtimer v2 ip

    Linus Torvalds
     
  • 952414505   Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc ... Browse Code »

    * 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc: (125 commits)
    ARM: mach-mxs: fix machines' initializers order
    mmc: mxcmmc: explicitly includes mach/hardware.h
    arm/imx: explicitly includes mach/hardware.h in pm-imx27.c
    arm/imx: remove mx27_setup_weimcs() from mx27.h
    arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c
    arm/imx: remove mx31_setup_weimcs() from mx31.h
    ARM: tegra: devices.c should include devices.h
    ARM: tegra: cpu-tegra: unexport two functions
    ARM: tegra: cpu-tegra: sparse type fix
    ARM: tegra: dma: staticify some tables and functions
    ARM: tegra: tegra2_clocks: don't export some tables
    ARM: tegra: tegra_powergate_is_powered should be static
    ARM: tegra: tegra_rtc_read_ms should be static
    ARM: tegra: tegra_init_cache should be static
    ARM: tegra: pcie: 0 -> NULL changes
    ARM: tegra: pcie: include board.h
    ARM: tegra: pcie: don't cast __iomem pointers
    ARM: tegra: tegra2_clocks: 0 -> NULL changes
    ARM: tegra: tegra2_clocks: don't cast __iomem pointers
    ARM: tegra: timer: don't cast __iomem pointers
    ...

    Fix up trivial conflicts in
    arch/arm/mach-omap2/Makefile,
    arch/arm/mach-u300/{Makefile.boot,core.c}
    arch/arm/plat-{mxc,omap}/devices.c

    Linus Torvalds
     

01 Nov, 2011

2 commits

29 Oct, 2011

1 commit

  • 41684f67a   Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 ... Browse Code »

    * 'gpio/next' of git://git.secretlab.ca/git/linux-2.6:
    h8300: Move gpio.h to gpio-internal.h
    gpio: pl061: add DT binding support
    gpio: fix build error in include/asm-generic/gpio.h
    gpiolib: Ensure struct gpio is always defined
    irq: Add EXPORT_SYMBOL_GPL to function of irq generic-chip
    gpio-ml-ioh: Use NUMA_NO_NODE not GFP_KERNEL
    gpio-pch: Use NUMA_NO_NODE not GFP_KERNEL
    gpio: langwell: ensure alternate function is cleared
    gpio-pch: Support interrupt function
    gpio-pch: Save register value in suspend()
    gpio-pch: modify gpio_nums and mask
    gpio-pch: support ML7223 IOH n-Bus
    gpio-pch: add spinlock in suspend/resume processing
    gpio-pch: Delete invalid "restore" code in suspend()
    gpio-ml-ioh: Fix suspend/resume issue
    gpio-ml-ioh: Support interrupt function
    gpio-ml-ioh: Delete unnecessary code
    gpio/mxc: add chained_irq_enter/exit() to mx3_gpio_irq_handler()
    gpio/nomadik: use genirq core to track enablement
    gpio/nomadik: disable clocks when unused

    Linus Torvalds
     

22 Sep, 2011

3 commits

21 Sep, 2011

1 commit

  • 3c0227d26   gpio/nomadik: disable clocks when unused ... Browse Code »

    The GPIO clock is required for register access and interrupt detection.
    When interrupt detection is not required on any of the pin in a block,
    the block's clock can be disabled when the registers are not being
    accessed.

    Signed-off-by: Rabin Vincent
    Reviewed-by: Rickard Andersson
    Reviewed-by: Jonas Aberg
    [Adjust for new IRQ chip core code, use only local functions]
    Signed-off-by: Linus Walleij
    Signed-off-by: Grant Likely

    Rabin Vincent
     

30 Aug, 2011

1 commit

23 Aug, 2011

1 commit

22 Aug, 2011

1 commit

12 Aug, 2011

3 commits

  • 8f3c4537b   ARM: gpio: make trivial GPIOLIB implementation the default ... Browse Code »

    Rather than marking the mach/gpio.h header files which want to use the
    trivial GPIOLIB implementation, mark those which do not want to use it
    instead. This means that by default, you get the trivial implementation
    and only have to do something extra if you need to. This should
    encourage the use of the trivial default implementation.

    As an additional bonus, several gpio.h header files become empty.

    Acked-by: H Hartley Sweeten
    Tested-by: Jamie Iles
    Acked-by: Kukjin Kim
    Signed-off-by: Russell King

    Russell King
     
  • 01e7dc89d   ARM: gpio: consolidate gpio_to_irq ... Browse Code »

    Many of the gpio_to_irq implementations use the gpiolib version of this
    function. Provide the standard gpiolib gpio_to_irq() for everyone, but
    allow platforms to override it if they wish. Add the neccessary
    overrides for those platforms which do not use the standard definition.

    Acked-by: Kukjin Kim
    Signed-off-by: Russell King

    Russell King
     
  • 22fe67837   ARM: gpio: consolidate trivial gpiolib implementations ... Browse Code »

    Consolidate 24 trivial gpiolib implementions out of mach/gpio.h
    into asm/gpio.h. This is basically the include of asm-generic/gpio.h
    and the definition of gpio_get_value, gpio_set_value, and gpio_cansleep
    as described in Documentation/gpio.txt

    Acked-by: H Hartley Sweeten
    Tested-by: David Brown
    Acked-by: David Brown
    Tested-by: Linus Walleij
    Acked-by: Kukjin Kim
    Tested-by: Shawn Guo
    Signed-off-by: Russell King

    Russell King
     

22 Jun, 2011

1 commit

  • b7f080cfe   net: remove mm.h inclusion from netdevice.h ... Browse Code »

    Remove linux/mm.h inclusion from netdevice.h -- it's unused (I've checked manually).

    To prevent mm.h inclusion via other channels also extract "enum dma_data_direction"
    definition into separate header. This tiny piece is what gluing netdevice.h with mm.h
    via "netdevice.h => dmaengine.h => dma-mapping.h => scatterlist.h => mm.h".
    Removal of mm.h from scatterlist.h was tried and was found not feasible
    on most archs, so the link was cutoff earlier.

    Hope people are OK with tiny include file.

    Note, that mm_types.h is still dragged in, but it is a separate story.

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: David S. Miller

    Alexey Dobriyan
     

10 Jun, 2011

1 commit

  • 33d78647d   gpio/nomadik: fix sleepmode for elder Nomadik ... Browse Code »

    The mach-nomadik machine did not compile properly due to bad
    ux500-specific functions being called. Introduce new state
    variables to fix this up.

    Reported-by: Axel Lin
    Cc: Alessandro Rubini
    Cc: Prafulla Wadaskar
    Signed-off-by: Linus Walleij
    Signed-off-by: Grant Likely

    Linus Walleij
     

27 May, 2011

2 commits

25 May, 2011

2 commits

24 May, 2011

2 commits

11 May, 2011

1 commit

29 Mar, 2011

4 commits

25 Mar, 2011

1 commit

23 Mar, 2011

1 commit

  • 6447f55da   Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx ... Browse Code »

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (66 commits)
    avr32: at32ap700x: fix typo in DMA master configuration
    dmaengine/dmatest: Pass timeout via module params
    dma: let IMX_DMA depend on IMX_HAVE_DMA_V1 instead of an explicit list of SoCs
    fsldma: make halt behave nicely on all supported controllers
    fsldma: reduce locking during descriptor cleanup
    fsldma: support async_tx dependencies and automatic unmapping
    fsldma: fix controller lockups
    fsldma: minor codingstyle and consistency fixes
    fsldma: improve link descriptor debugging
    fsldma: use channel name in printk output
    fsldma: move related helper functions near each other
    dmatest: fix automatic buffer unmap type
    drivers, pch_dma: Fix warning when CONFIG_PM=n.
    dmaengine/dw_dmac fix: use readl & writel instead of __raw_readl & __raw_writel
    avr32: at32ap700x: Specify DMA Flow Controller, Src and Dst msize
    dw_dmac: Setting Default Burst length for transfers as 16.
    dw_dmac: Allow src/dst msize & flow controller to be configured at runtime
    dw_dmac: Changing type of src_master and dest_master to u8.
    dw_dmac: Pass Channel Priority from platform_data
    dw_dmac: Pass Channel Allocation Order from platform_data
    ...

    Linus Torvalds
     

14 Mar, 2011

9 commits