Eric Lee / smarc-fsl-linux-kernel

10 Jan, 2012

1 commit

  • 5ede3ceb7   Merge tag 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    New feature development

    This adds support for new features, and contains stuff from most
    platforms. A number of these patches could have fit into other
    branches, too, but were small enough not to cause too much
    confusion here.

    * tag 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
    mfd/db8500-prcmu: remove support for early silicon revisions
    ARM: ux500: fix the smp_twd clock calculation
    ARM: ux500: remove support for early silicon revisions
    ARM: ux500: update register files
    ARM: ux500: register DB5500 PMU dynamically
    ARM: ux500: update ASIC detection for U5500
    ARM: ux500: support DB8520
    ARM: picoxcell: implement watchdog restart
    ARM: OMAP3+: hwmod data: Add the default clockactivity for I2C
    ARM: OMAP3: hwmod data: disable multiblock reads on MMC1/2 on OMAP34xx/35xx <= ES2.1
    ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP4
    ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP3
    ARM: OMAP: hwmod data: Add support for AM35xx UART4/ttyO3
    ARM: Orion: Remove address map info from all platform data structures
    ARM: Orion: Get address map from plat-orion instead of via platform_data
    ARM: Orion: mbus_dram_info consolidation
    ARM: Orion: Consolidate the address map setup
    ARM: Kirkwood: Add configuration for MPP12 as GPIO
    ARM: Kirkwood: Recognize A1 revision of 6282 chip
    ARM: ux500: update the MOP500 GPIO assignments
    ...

    Linus Torvalds
     

05 Jan, 2012

1 commit

20 Dec, 2011

1 commit

  • 0b35a45bd   ARM: plat-orion: make gpiochip label unique ... Browse Code »

    The former implementation adds a fix gpiochip label string
    to the framework. This is confusing because orion_gpio_init
    is called more than once and this ends up in different gpiochips
    with the same label.

    This patch adds the already present orion_gpio_chip_count to the
    label string to make it unique in the system.

    Signed-off-by: Holger Brunck
    Cc: Lennert Buytenhek
    Acked-by: Nicolas Pitre
    Signed-off-by: Olof Johansson

    Holger Brunck
     

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
     

14 Dec, 2011

4 commits

24 Aug, 2011

1 commit

  • 058b96d44   ARM: 7063/1: Orion: gpio: add missing include of linux/types.h ... Browse Code »

    This patch adds missing include of linux/types.h to fix below build error.

    CC arch/arm/mach-mv78xx0/mpp.o
    In file included from arch/arm/mach-mv78xx0/include/mach/gpio.h:9,
    from /home/axel/repos/git/linux-2.6/arch/arm/include/asm/gpio.h:5,
    from include/linux/gpio.h:18,
    from arch/arm/mach-mv78xx0/mpp.c:10:
    arch/arm/plat-orion/include/plat/gpio.h:28: error: expected declaration specifiers or '...' before 'u32'
    make[1]: *** [arch/arm/mach-mv78xx0/mpp.o] Error 1
    make: *** [arch/arm/mach-mv78xx0] Error 2

    Signed-off-by: Axel Lin
    Reviewed-by: Peter Huewe
    Signed-off-by: Russell King

    Axel Lin
     

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
     

08 Jul, 2011

1 commit

  • 659fb32d1   genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd) ... Browse Code »

    This fixes a regression introduced by e59347a "arm: orion:
    Use generic irq chip".

    Depending on the device, interrupts acknowledgement is done by setting
    or by clearing a dedicated register. Replace irq_gc_ack() with some
    {set,clr}_bit variants allows to handle both cases.

    Note that this patch affects the following SoCs: Davinci, Samsung and
    Orion. Except for this last, the change is minor: irq_gc_ack() is just
    renamed into irq_gc_ack_set_bit().

    For the Orion SoCs, the edge GPIO interrupts support is currently
    broken. irq_gc_ack() try to acknowledge a such interrupt by setting
    the corresponding cause register bit. The Orion GPIO device expect the
    opposite. To fix this issue, the irq_gc_ack_clr_bit() variant is used.

    Tested on Network Space v2.

    Reported-by: Joey Oravec
    Signed-off-by: Simon Guinot
    Signed-off-by: Arnd Bergmann

    Simon Guinot
     

24 May, 2011

2 commits

17 May, 2011

13 commits

29 Mar, 2011

4 commits

04 Mar, 2011

2 commits

  • 9eac6d0a4   ARM: Remove dependency of plat-orion GPIO code on mach directory includes. ... Browse Code »

    This patch makes the various mach dirs that use the plat-orion GPIO
    code pass in GPIO-related platform info (GPIO controller base address,
    secondary base IRQ number, etc) explicitly, instead of having
    plat-orion get those values by including a mach dir include file --
    the latter mechanism is problematic if you want to support multiple
    ARM platforms in the same kernel image.

    Signed-off-by: Lennert Buytenhek
    Signed-off-by: Nicolas Pitre

    Lennert Buytenhek
     
  • 4ee1f6b57   ARM: Remove dependency of plat-orion time code on mach directory includes. ... Browse Code »

    This patch makes the various mach dirs that use the plat-orion time
    code pass in timer and bridge addresses explicitly, instead of having
    plat-orion get those values by including a mach dir include file --
    the latter mechanism is problematic if you want to support multiple
    ARM platforms in the same kernel image.

    Signed-off-by: Lennert Buytenhek
    Signed-off-by: Nicolas Pitre

    Lennert Buytenhek
     

14 Jan, 2011

1 commit

23 Dec, 2010

3 commits

22 Oct, 2010

1 commit

  • 3924996ba   [ARM] Kirkwood: restrict the scope of the PCIe reset workaround ... Browse Code »

    Commit 21f0ba90a447 "orion/kirkwood: reset PCIe unit on boot" made the
    reset of the PCIe unit unconditional. While this may fix problems on some
    targets, this also causes problems on other targets.

    Saeed Bishara said about the original problem: "We
    couln't pinpoint the root cause of this issue, actually we failed to
    reproduce that issue."

    So let's restrict the reset of the PCIe unit only to the target where
    the original problem was observed.

    Signed-off-by: Nicolas Pitre

    Nicolas Pitre
     

08 Aug, 2010

1 commit

  • faa38b5e0   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (214 commits)
    ALSA: hda - Add pin-fix for HP dc5750
    ALSA: als4000: Fix potentially invalid DMA mode setup
    ALSA: als4000: enable burst mode
    ALSA: hda - Fix initial capsrc selection in patch_alc269()
    ASoC: TWL4030: Capture route runtime DAPM ordering fix
    ALSA: hda - Add PC-beep whitelist for an Intel board
    ALSA: hda - More relax for pending period handling
    ALSA: hda - Define AC_FMT_* constants
    ALSA: hda - Fix beep frequency on IDT 92HD73xx and 92HD71Bxx codecs
    ALSA: hda - Add support for HDMI HBR passthrough
    ALSA: hda - Set Stream Type in Stream Format according to AES0
    ALSA: hda - Fix Thinkpad X300 so SPDIF is not exposed
    ALSA: hda - FIX to not expose SPDIF on Thinkpad X301, since it does not have the ability to use SPDIF
    ASoC: wm9081: fix resource reclaim in wm9081_register error path
    ASoC: wm8978: fix a memory leak if a wm8978_register fail
    ASoC: wm8974: fix a memory leak if another WM8974 is registered
    ASoC: wm8961: fix resource reclaim in wm8961_register error path
    ASoC: wm8955: fix resource reclaim in wm8955_register error path
    ASoC: wm8940: fix a memory leak if wm8940_register return error
    ASoC: wm8904: fix resource reclaim in wm8904_register error path
    ...

    Linus Torvalds