13 Jan, 2012

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)
    ASoC: twl6040 - Add method to query optimum PDM_DL1 gain
    ALSA: hda - Fix the lost power-setup of seconary pins after PM resume
    ALSA: usb-audio: add Yamaha MOX6/MOX8 support
    ALSA: virtuoso: add S/PDIF input support for all Xonars
    ALSA: ice1724 - Support for ooAoo SQ210a
    ALSA: ice1724 - Allow card info based on model only
    ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations
    ALSA: hdspm - Provide unique driver id based on card serial
    ASoC: Dynamically allocate the rtd device for a non-empty release()
    ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC
    ALSA: hda - Fix the detection of "Loopback Mixing" control for VIA codecs
    ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs
    ALSA: hda - Use auto-parser for HP laptops with cx20459 codec
    ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()
    ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()
    ALSA: hda/cirrus - support for iMac12,2 model
    ASoC: cx20442: add bias control over a platform provided regulator
    ALSA: usb-audio - Avoid flood of frame-active debug messages
    ALSA: snd-usb-us122l: Delete calls to preempt_disable
    mfd: Put WM8994 into cache only mode when suspending
    ...

    Fix up trivial conflicts in:
    - arch/arm/mach-s3c64xx/mach-crag6410.c:
    renamed speyside_wm8962 to tobermory, added littlemill right
    next to it
    - drivers/base/regmap/{regcache.c,regmap.c}:
    duplicate diff that had already come in with other changes in
    the regmap tree

    Linus Torvalds
     

10 Jan, 2012

1 commit


05 Jan, 2012

1 commit


02 Jan, 2012

1 commit


14 Nov, 2011

1 commit


01 Nov, 2011

1 commit


17 Oct, 2011

1 commit

  • Get rid of the mdesc pointer in the fixup function call. No one uses
    the mdesc pointer, it shouldn't be modified anyway, and we can't wrap
    it, so let's remove it.

    Platform files found by:

    $ regexp=$(git grep -h '\.fixup.*=' arch/arm |
    sed 's!.*= *\([^,]*\),* *!\1!' | sort -u |
    tr '\n' '|' | sed 's,|$,,;s,|,\\|,g')
    $ git grep $regexp arch/arm

    Acked-by: Nicolas Pitre
    Signed-off-by: Russell King

    Russell King
     

12 Jul, 2011

1 commit


26 Mar, 2011

1 commit


21 Mar, 2011

1 commit

  • This patch moves the platform data definition from
    arch/arm/plat-pxa/include/plat/i2c.h to include/linux/i2c/pxa-i2c.h so
    it can be accessed from x86 the same way as on ARM.

    This change should make no functional change to the PXA code. The move
    is verified by building the following defconfigs:
    cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig
    imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig
    raumfeld_defconfig magician_defconfig mmp2_defconfig pxa168_defconfig
    pxa910_defconfig

    Signed-off-by: Sebastian Andrzej Siewior
    Signed-off-by: Dirk Brandewie
    Signed-off-by: Ben Dooks

    Sebastian Andrzej Siewior
     

16 Mar, 2011

1 commit


08 Jan, 2011

1 commit

  • * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (77 commits)
    spi/omap: Fix DMA API usage in OMAP MCSPI driver
    spi/imx: correct the test on platform_get_irq() return value
    spi/topcliff: Typo fix threhold to threshold
    spi/dw_spi Typo change diable to disable.
    spi/fsl_espi: change the read behaviour of the SPIRF
    spi/mpc52xx-psc-spi: move probe/remove to proper sections
    spi/dw_spi: add DMA support
    spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs
    spi/dw_spi: Fix too short timeout in spi polling loop
    spi/pl022: convert running variable
    spi/pl022: convert busy flag to a bool
    spi/pl022: pass the returned sglen to the DMA engine
    spi/pl022: map the buffers on the DMA engine
    spi/topcliff_pch: Fix data transfer issue
    spi/imx: remove autodetection
    spi/pxa2xx: pass of_node to spi device and set a parent device
    spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
    spi/pxa2xx: Add chipselect support for Sodaville
    spi/pxa2xx: Consider CE4100's FIFO depth
    spi/pxa2xx: Add CE4100 support
    ...

    Linus Torvalds
     

16 Dec, 2010

1 commit

  • This patch introduces pxa2xx_map_io() and pxa3xx_map_io() to distinguish
    between PXA25x/PXA27x and PXA3xx memory mapping.

    Also, fixup for platforms broken after introducing pxa{25x,27x}_map_io()
    and pxa3xx_map_io() is included.

    Signed-off-by: Marek Vasut
    Signed-off-by: Eric Miao

    Marek Vasut
     

01 Dec, 2010

1 commit

  • The PXA-SPI driver relies on some files / defines which are arm specific
    and are within the ARM tree. The CE4100 SoC which is x86 has also the
    SPI core.
    This patch moves the ssp and spi files from arm/mach-pxa and plat-pxa to
    include/linux where the CE4100 can access them.

    This move got verified by building the following defconfigs:
    cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig
    imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig
    raumfeld_defconfig magician_defconfig

    Signed-off-by: Sebastian Andrzej Siewior
    Signed-off-by: Dirk Brandewie

    Sebastian Andrzej Siewior
     

20 Oct, 2010

1 commit

  • Since we're now using addruart to establish the debug mapping, we can
    remove the io_pg_offst and phys_io members of struct machine_desc.

    The various declarations were removed using the following script:

    grep -rl MACHINE_START arch/arm | xargs \
    sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }'

    [ Initial patch was from Jeremy Kerr, example script from Russell King ]

    Signed-off-by: Nicolas Pitre
    Acked-by: Eric Miao

    Nicolas Pitre
     

07 Aug, 2010

1 commit


05 Aug, 2010

2 commits


31 Jul, 2010

1 commit


16 Jul, 2010

1 commit


13 Jul, 2010

1 commit


14 Jun, 2010

1 commit


11 May, 2010

3 commits


13 Jan, 2010

1 commit


01 Dec, 2009

1 commit

  • For some platforms, it is inappropriate to register all PXA UARTs.
    In some cases, the UARTs may not be used, and in others we may want
    to avoid registering the UARTs to allow other drivers (eg, FICP) to
    make use of the UART.

    In addition, a while back there was a request to be able to pass
    platform data to the UART driver.

    This patch enables all of this by providing functions platforms can
    call to register each individual UART.

    Signed-off-by: Russell King
    Acked-by: Mike Rapoport
    Acked-by: Robert Jarzmik
    Signed-off-by: Eric Miao

    Russell King
     

10 Sep, 2009

3 commits


16 Jun, 2009

1 commit


05 Jun, 2009

2 commits


27 Apr, 2009

1 commit


20 Mar, 2009

1 commit

  • OMAP wishes to pass state to the boot loader upon reboot in order to
    instruct it whether to wait for USB-based reflashing or not. There is
    already a facility to do this via the reboot() syscall, except we ignore
    the string passed to machine_restart().

    This patch fixes things to pass this string to arch_reset(). This means
    that we keep the reboot mode limited to telling the kernel _how_ to
    perform the reboot which should be independent of what we request the
    boot loader to do.

    Acked-by: Tony Lindgren
    Signed-off-by: Russell King

    Russell King
     

09 Mar, 2009

1 commit

  • Considering the header mess ATM, it is not always possible to include
    the correct header files within board code. Let's keep this simple:

    - for pxa25x based platforms
    - for pxa27x based platforms
    - for pxa300 based platforms
    - for pxa320 based platforms
    - for pxa930 based platforms

    NOTE:

    1. one header one board file, they are not compatible (i.e. they have
    conflicting definitions which won't compile if included together).

    2. Unless strictly necessary, the following header files are considered
    to be SoC files use _only_, and is not recommended to be included in
    board code:












    Signed-off-by: Eric Miao

    Eric Miao
     

05 Jan, 2009

1 commit


02 Dec, 2008

1 commit


30 Oct, 2008

1 commit


10 Oct, 2008

1 commit