Eric Lee / smarc-fsl-linux-kernel

31 Aug, 2011

1 commit

26 Jul, 2011

1 commit

  • dd58ecba4   Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc ... Browse Code »

    * 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (35 commits)
    ARM: msm: platsmp: determine number of CPU cores at boot time
    ARM: Tegra: Seaboard: Fix I2C bus numbering for ADT7461
    ARM: Tegra: Trimslice: Tri-state DAP3 pinmux
    ARM: orion5x: fixup 5181 MPP mask check
    ARM: mxs-dma: include
    ARM: i.MX53: consistently use MX53_UART_PAD_CTRL for uart txd/rxd/rts/cts
    ARM: i.MX53: UARTn_CTS pin should not change RTS input select
    ARM: i.MX53: UARTn_TXD pin should not change RXD input select
    ARM: mx25: Fix typo on CAN1_RX pad setting
    iomux-mx53: add missing 'IOMUX_CONFIG_SION' for some I2C pad definitions
    ARM: NUC93X: add UL suffix to VMALLOC_END to ensure it is properly typed
    ARM: LPC32XXX: add UL suffix to VMALLOC_END to ensure it is properly typed
    ARM: CNS3XXX: add UL suffix to VMALLOC_END to ensure it is properly typed
    ARM: i.MX53: Fix IOMUX type o's
    ARM i.MX dma: Fix burstsize settings
    mach-mx5: fix the I2C clock parents
    ARM: mxs/tx28: according to the TX28's datasheet D4-D7 are not used for MMC0
    ARM i.MX23/28: platform-mxsfb: Add missing include of linux/dma-mapping.h
    ARM: mx53: Fix some interrupts marked as reserved.
    MXC: iomux-v3: correct NO_PAD_CTRL definition
    ...

    Fix up trivial conflict in arch/arm/mach-imx/mach-mx31_3ds.c

    Linus Torvalds
     

16 Jul, 2011

1 commit

07 Jul, 2011

1 commit

  • 6584cb882   ARM i.MX dma: Fix burstsize settings ... Browse Code »
    88

    dmaengine expects the maxburst parameter in words, not bytes.
    The imxdma driver and its users do this wrong. Fix this.

    As a side note the imx-pcm-dma-mx2 driver was 'fixed' to work
    with imx-dma. This broke the driver with imx-sdma support which
    correctly takes the maxburst parameter in words. This patch
    puts the sdma based sound back to work.

    Signed-off-by: Sascha Hauer

    Sascha Hauer
     

24 Jun, 2011

3 commits

08 Jun, 2011

1 commit

19 Apr, 2011

1 commit

08 Apr, 2011

1 commit

31 Mar, 2011

1 commit

27 Mar, 2011

3 commits

07 Mar, 2011

1 commit

02 Mar, 2011

1 commit

26 Feb, 2011

1 commit

25 Feb, 2011

2 commits

25 Nov, 2010

3 commits

22 Nov, 2010

1 commit

06 Nov, 2010

1 commit

  • ce6120cca   ASoC: Decouple DAPM from CODECs ... Browse Code »

    Decoupling Dynamic Audio Power Management (DAPM) from codec devices is
    required when developing ASoC further. Such as for other ASoC components to
    have DAPM widgets or when extending DAPM to handle cross-device paths.

    This patch decouples DAPM related variables from struct snd_soc_codec and
    moves them to new struct snd_soc_dapm_context that is used to encapsulate
    DAPM context of a device. ASoC core and API of DAPM functions are modified
    to use DAPM context instead of codec.

    This patch does not change current functionality and a large part of changes
    come because of structure and internal API changes.

    Core implementation is from Liam Girdwood with some
    minor core changes, codecs and machine driver conversions from
    Jarkko Nikula .

    Signed-off-by: Liam Girdwood
    Signed-off-by: Jarkko Nikula
    Cc: Nicolas Ferre
    Cc: Manuel Lauss
    Cc: Mike Frysinger
    Cc: Cliff Cai
    Cc: Kevin Hilman
    Cc: Ryan Mallon
    Cc: Timur Tabi
    Cc: Sascha Hauer
    Cc: Lars-Peter Clausen
    Cc: Arnaud Patard (Rtp)
    Cc: Wan ZongShun
    Cc: Eric Miao
    Cc: Jassi Brar
    Cc: Daniel Gloeckner
    Cc: Kuninori Morimoto
    Signed-off-by: Mark Brown

    Liam Girdwood
     

05 Nov, 2010

6 commits

01 Oct, 2010

1 commit

  • 205d231bf   ASoC: Remove -dai suffix from i.MX SSI driver ... Browse Code »

    While it is a generic serial port in practice the i.MX SSI is only supported
    in Linux as an audio port (the i.MX has dedicated SPI controllers and so on).
    This means we don't need to disambiguate against other uses of the hardware
    and so can drop the -dai suffix from the driver name which fixes merge
    issues with the i.MX tree in -next.

    Signed-off-by: Mark Brown
    Acked-by: Uwe Kleine-König
    Acked-by: Liam Girdwood

    Mark Brown
     

23 Aug, 2010

2 commits

17 Aug, 2010

1 commit

  • e4862f2f6   Merge branch 'for-2.6.36' into for-2.6.37 ... Browse Code »

    Fairly simple conflicts, the most serious ones are the i.MX ones which I
    suspect now need another rename.

    Conflicts:
    arch/arm/mach-mx2/clock_imx27.c
    arch/arm/mach-mx2/devices.c
    arch/arm/mach-omap2/board-rx51-peripherals.c
    arch/arm/mach-omap2/board-zoom2.c
    sound/soc/fsl/mpc5200_dma.c
    sound/soc/fsl/mpc5200_dma.h
    sound/soc/fsl/mpc8610_hpcd.c
    sound/soc/pxa/spitz.c

    Mark Brown
     

15 Aug, 2010

1 commit

13 Aug, 2010

1 commit

  • 14a4fa20a   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:
    ASoC: add AD1980 obsolete information
    ASoC: register cache should be 1 byte aligned for 1 byte long register
    ALSA: hda - Adding support for new IDT 92HD87XX codecs
    ASoC: Fix inverted mute controls for WM8580
    ALSA: HDA: Use model=auto for LG R510
    ALSA: hda - Update model entries in HD-Audio-Models.txt
    ALSA: hda: document VIA models
    ALSA: hda - patch_nvhdmi.c: Add missing codec IDs, unify names
    ALSA: hda - add support for Conexant CX20584
    ALSA: hda - New snd-hda-intel model/pin config for hp dv7-4000
    ALSA: hda - Fix missing stream for second ADC on Realtek ALC260 HDA codec
    ALSA: hda - Make converter setups sticky
    ALSA: hda - Add support for Acer ZGA ALC271 (1025:047c)
    sound/oss: Adjust confusing if indentation
    sound: oss: au1550_ac97.c removed duplicated #include
    ASoC: Fix for changed Eureka Kconfig symbol names

    Linus Torvalds
     

12 Aug, 2010

1 commit

  • f0fba2ad1   ASoC: multi-component - ASoC Multi-Component Support ... Browse Code »

    This patch extends the ASoC API to allow sound cards to have more than one
    CODEC and more than one platform DMA controller. This is achieved by dividing
    some current ASoC structures that contain both driver data and device data into
    structures that only either contain device data or driver data. i.e.

    struct snd_soc_codec ---> struct snd_soc_codec (device data)
    +-> struct snd_soc_codec_driver (driver data)

    struct snd_soc_platform ---> struct snd_soc_platform (device data)
    +-> struct snd_soc_platform_driver (driver data)

    struct snd_soc_dai ---> struct snd_soc_dai (device data)
    +-> struct snd_soc_dai_driver (driver data)

    struct snd_soc_device ---> deleted

    This now allows ASoC to be more tightly aligned with the Linux driver model and
    also means that every ASoC codec, platform and (platform) DAI is a kernel
    device. ASoC component private data is now stored as device private data.

    The ASoC sound card struct snd_soc_card has also been updated to store lists
    of it's components rather than a pointer to a codec and platform. The PCM
    runtime struct soc_pcm_runtime now has pointers to all its components.

    This patch adds DAPM support for ASoC multi-component and removes struct
    snd_soc_socdev from DAPM core. All DAPM calls are now made on a card, codec
    or runtime PCM level basis rather than using snd_soc_socdev.

    Other notable multi-component changes:-

    * Stream operations now de-reference less structures.
    * close_delayed work() now runs on a DAI basis rather than looping all DAIs
    in a card.
    * PM suspend()/resume() operations can now handle N CODECs and Platforms
    per sound card.
    * Added soc_bind_dai_link() to bind the component devices to the sound card.
    * Added soc_dai_link_probe() and soc_dai_link_remove() to probe and remove
    DAI link components.
    * sysfs entries can now be registered per component per card.
    * snd_soc_new_pcms() functionailty rolled into dai_link_probe().
    * snd_soc_register_codec() now does all the codec list and mutex init.

    This patch changes the probe() and remove() of the CODEC drivers as follows:-

    o Make CODEC driver a platform driver
    o Moved all struct snd_soc_codec list, mutex, etc initialiasation to core.
    o Removed all static codec pointers (drivers now support > 1 codec dev)
    o snd_soc_register_pcms() now done by core.
    o snd_soc_register_dai() folded into snd_soc_register_codec().

    CS4270 portions:
    Acked-by: Timur Tabi

    Some TLV320aic23 and Cirrus platform fixes.
    Signed-off-by: Ryan Mallon

    TI CODEC and OMAP fixes
    Signed-off-by: Peter Ujfalusi
    Signed-off-by: Janusz Krzysztofik
    Signed-off-by: Jarkko Nikula

    Samsung platform and misc fixes :-
    Signed-off-by: Chanwoo Choi
    Signed-off-by: Joonyoung Shim
    Signed-off-by: Kyungmin Park
    Reviewed-by: Jassi Brar
    Signed-off-by: Seungwhan Youn

    MPC8610 and PPC fixes.
    Signed-off-by: Timur Tabi

    i.MX fixes and some core fixes.
    Signed-off-by: Sascha Hauer

    J4740 platform fixes:-
    Signed-off-by: Lars-Peter Clausen

    CC: Tony Lindgren
    CC: Nicolas Ferre
    CC: Kevin Hilman
    CC: Sascha Hauer
    CC: Atsushi Nemoto
    CC: Kuninori Morimoto
    CC: Daniel Gloeckner
    CC: Manuel Lauss
    CC: Mike Frysinger
    CC: Arnaud Patard
    CC: Wan ZongShun

    Acked-by: Mark Brown
    Signed-off-by: Liam Girdwood

    Liam Girdwood
     

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
     

06 Aug, 2010

1 commit

20 Jul, 2010

1 commit