Eric Lee / smarc-fsl-linux-kernel

08 Nov, 2011

1 commit

07 Nov, 2011

1 commit

  • 32aaeffbd   Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux ... Browse Code »

    * 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
    Revert "tracing: Include module.h in define_trace.h"
    irq: don't put module.h into irq.h for tracking irqgen modules.
    bluetooth: macroize two small inlines to avoid module.h
    ip_vs.h: fix implicit use of module_get/module_put from module.h
    nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
    include: replace linux/module.h with "struct module" wherever possible
    include: convert various register fcns to macros to avoid include chaining
    crypto.h: remove unused crypto_tfm_alg_modname() inline
    uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
    pm_runtime.h: explicitly requires notifier.h
    linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
    miscdevice.h: fix up implicit use of lists and types
    stop_machine.h: fix implicit use of smp.h for smp_processor_id
    of: fix implicit use of errno.h in include/linux/of.h
    of_platform.h: delete needless include
    acpi: remove module.h include from platform/aclinux.h
    miscdevice.h: delete unnecessary inclusion of module.h
    device_cgroup.h: delete needless include
    net: sch_generic remove redundant use of
    net: inet_timewait_sock doesnt need
    ...

    Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
    - drivers/media/dvb/frontends/dibx000_common.c
    - drivers/media/video/{mt9m111.c,ov6650.c}
    - drivers/mfd/ab3550-core.c
    - include/linux/dmaengine.h

    Linus Torvalds
     

06 Nov, 2011

1 commit

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

    * 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc: (79 commits)
    ARM: SAMSUNG: Move fimc plat. device from board files to plat-samsung
    ARM: SAMSUNG: Cleanup resources by using macro
    ARM: SAMSUNG: Cleanup plat-samsung/devs.c and devs.h
    ARM: S5P: To merge devs.c files to one devs.c
    ARM: S3C64XX: To merge devs.c files to one devs.c
    ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c
    ARM: S5P64X0: Add Power Management support
    ARM: S5P: Make the sleep code common for S5P series SoCs
    ARM: S5P: Make the common S5P PM code conditionally compile
    ARM: SAMSUNG: Move S5P header files to plat-samsung
    ARM: SAMSUNG: Move S3C24XX header files to plat-samsung
    ARM: SAMSUNG: Moving each SoC support header files
    ARM: SAMSUNG: Consolidate plat/pll.h
    ARM: SAMSUNG: Consolidate plat/pwm-clock.h
    ARM: SAMSUNG: Cleanup mach/clkdev.h
    ARM: SAMSUNG: remove sdhci default configuration setup platform helper
    ARM: EXYNOS4: Add FIMC device on SMDKV310 board
    ARM: EXYNOS4: Add header file protection macros
    ARM: EXYNOS4: Add usb ehci device to the SMDKV310
    ARM: S3C2443: Add hsspi-clock from pclk and rename S3C2443 hsspi sclk
    ...

    Fix up conflicts in
    - arch/arm/mach-exynos4/{Kconfig,clock.c}
    ARM_CPU_SUSPEND, various random device tables (gah!)
    - drivers/gpio/Makefile
    sa1100 gpio added, samsung gpio drivers merged

    Linus Torvalds
     

05 Nov, 2011

4 commits

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

    * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (63 commits)
    dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle
    dmaengine/ep93xx_dma: add module.h include
    pch_dma: Reduce wasting memory
    pch_dma: Fix suspend issue
    dma/timberdale: free_irq() on an error path
    dma: shdma: transfer based runtime PM
    dmaengine: shdma: protect against the IRQ handler
    dmaengine i.MX DMA/SDMA: add missing include of linux/module.h
    dmaengine: delete redundant chan_id and chancnt initialization in dma drivers
    dmaengine/amba-pl08x: Check txd->llis_va before freeing dma_pool
    dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers
    serial: sh-sci: don't filter on DMA device, use only channel ID
    ARM: SAMSUNG: Remove Samsung specific enum type for dma direction
    ASoC: Samsung: Update DMA interface
    spi/s3c64xx: Merge dma control code
    spi/s3c64xx: Add support DMA engine API
    ARM: SAMSUNG: Remove S3C-PL330-DMA driver
    ARM: S5P64X0: Use generic DMA PL330 driver
    ARM: S5PC100: Use generic DMA PL330 driver
    ARM: S5PV210: Use generic DMA PL330 driver
    ...

    Fix up fairly trivial conflicts in
    - arch/arm/mach-exynos4/{Kconfig,clock.c}
    - arch/arm/mach-s5p64x0/dma.c

    Linus Torvalds
     
  • 19940b3d5   ASoC: Ensure we get an impedence reported for WM8958 jack detect ... Browse Code »

    Occasionally we may see an accessory reported before we have a stable
    impedance for the accessory. If this happens then reread the status in
    order to ensure that the handler can take the appropriate action for the
    status change.

    Signed-off-by: Mark Brown

    Mark Brown
     
  • 5a3ad6bd6   ASoC: Don't use wm8994->control_data when requesting IRQs ... Browse Code »

    The field is no longer initialised so this will crash if running on
    wm8958.

    Reported-by: Thomas Abraham
    Signed-off-by: Mark Brown

    Mark Brown
     
  • 8eeea521d   ASoC: Don't use wm8994->control_data in wm8994_readable_register() ... Browse Code »
    1

    The field is no longer initialised so this will crash if running on
    wm8958.

    Reported-by: Thomas Abraham
    Signed-off-by: Mark Brown
    Cc: stable@kernel.org

    Mark Brown
     

04 Nov, 2011

3 commits

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

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (24 commits)
    ALSA: hda/realtek - Skip invalid digital out pins
    ALSA: hda/sigmatel - Automatically retrieve digital I/O widgets
    ALSA: hda - Remove unused variables
    ALSA: hda/realtek - Don't create alt-stream for capture when unnecessary
    ALSA: hda - Add support for 92HD65 / 92HD66 family of codecs
    ALSA: hda - Disable power-widget control for IDT 92HD83/93 as default
    ALSA: hda - Check NO_PRESENCE pincfg default bit
    ASoC: Ensure we always delay for WM8962 FLL when starting from SYSCLK
    ASoC: Ensure the WM8962 oscillator and PLLs start up disabled
    ASoC: Ensure WM8962 PLL registers are reset
    ALSA: intel8x0 - Fix inclusion of kvm_para.h
    ALSA: hda_hwdep: Fix possible buffer overflow
    ASoC: Fix return value of wm5100_gpio_direction_out()
    ASoC: WM8904: Set `invert' bit for Capture Switch
    ASoC: Leave input audio data bit length settings untouched in wm8711_set_dai_fmt
    ASoC: wm8711: Fix wrong mask for setting input audio data bit length select
    ALSA: intel8x0: Improve performance in virtual environment
    ALSA: hdspm - Enable all firmware ranges for PCI MADI/AES cards
    ALSA: hdsp - Correct HDSP_VERSION_BIT constant, thus partly fixing RPM detection
    ALSA: hdspm - Fix MADI channel format in the status ioctl
    ...

    Linus Torvalds
     
  • d6748066a   Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus ... Browse Code »

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (37 commits)
    MIPS: O32: Provide definition of registers ta0 .. ta3.
    MIPS: perf: Add Octeon support for hardware perf.
    MIPS: perf: Add support for 64-bit perf counters.
    MIPS: perf: Reorganize contents of perf support files.
    MIPS: perf: Cleanup formatting in arch/mips/kernel/perf_event.c
    MIPS: Add accessor macros for 64-bit performance counter registers.
    MIPS: Add probes for more Octeon II CPUs.
    MIPS: Add more CPU identifiers for Octeon II CPUs.
    MIPS: XLR, XLS: Add comment for smp setup
    MIPS: JZ4740: GPIO: Check correct IRQ in demux handler
    MIPS: JZ4740: GPIO: Simplify IRQ demuxer
    MIPS: JZ4740: Use generic irq chip
    MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines
    MIPS: Alchemy: kill au1xxx.h header
    MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines
    MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep
    MIPS: Alchemy: Redo PCI as platform driver
    MIPS: Alchemy: more base address cleanup
    MIPS: Alchemy: rewrite USB platform setup.
    MIPS: Alchemy: abstract USB block control register access
    ...

    Fix up trivial conflicts in:
    arch/mips/alchemy/devboards/db1x00/platform.c
    drivers/ide/Kconfig
    drivers/mmc/host/au1xmmc.c
    drivers/video/Kconfig
    sound/mips/Kconfig

    Linus Torvalds
     
  • 6bcbf64ac   Merge branch 'fix/asoc' into for-linus Browse Code »
    Takashi Iwai
     

02 Nov, 2011

3 commits

01 Nov, 2011

4 commits

31 Oct, 2011

3 commits

29 Oct, 2011

1 commit

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

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (549 commits)
    ALSA: hda - Fix ADC input-amp handling for Cx20549 codec
    ALSA: hda - Keep EAPD turned on for old Conexant chips
    ALSA: hda/realtek - Fix missing volume controls with ALC260
    ASoC: wm8940: Properly set codec->dapm.bias_level
    ALSA: hda - Fix pin-config for ASUS W90V
    ALSA: hda - Fix surround/CLFE headphone and speaker pins order
    ALSA: hda - Fix typo
    ALSA: Update the sound git tree URL
    ALSA: HDA: Add new revision for ALC662
    ASoC: max98095: Convert codec->hw_write to snd_soc_write
    ASoC: keep pointer to resource so it can be freed
    ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls
    ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2
    ASoC: da7210: Add support for line out and DAC
    ASoC: da7210: Add support for DAPM
    ALSA: hda/realtek - Fix DAC assignments of multiple speakers
    ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value
    ASoC: Set sgtl5000->ldo in ldo_regulator_register
    ASoC: wm8996: Use SND_SOC_DAPM_AIF_OUT for AIF2 Capture
    ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 Capture
    ...

    Linus Torvalds
     

27 Oct, 2011

6 commits

25 Oct, 2011

2 commits

  • 59e525341   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)
    MAINTAINERS: linux-m32r is moderated for non-subscribers
    linux@lists.openrisc.net is moderated for non-subscribers
    Drop default from "DM365 codec select" choice
    parisc: Kconfig: cleanup Kernel page size default
    Kconfig: remove redundant CONFIG_ prefix on two symbols
    cris: remove arch/cris/arch-v32/lib/nand_init.S
    microblaze: add missing CONFIG_ prefixes
    h8300: drop puzzling Kconfig dependencies
    MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
    tty: drop superfluous dependency in Kconfig
    ARM: mxc: fix Kconfig typo 'i.MX51'
    Fix file references in Kconfig files
    aic7xxx: fix Kconfig references to READMEs
    Fix file references in drivers/ide/
    thinkpad_acpi: Fix printk typo 'bluestooth'
    bcmring: drop commented out line in Kconfig
    btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
    doc: raw1394: Trivial typo fix
    CIFS: Don't free volume_info->UNC until we are entirely done with it.
    treewide: Correct spelling of successfully in comments
    ...

    Linus Torvalds
     
  • 376638603   MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines ... Browse Code »

    Now that no driver any longer depends on the CONFIG_SOC_AU1??? symbols,
    it's time to get rid of them: Move some of the platform devices to the
    boards which can use them, Rename a few (unused) constants in the header,
    Replace them with MIPS_ALCHEMY in the various Kconfig files. Finally
    delete them altogether from the Alchemy Kconfig file.

    Signed-off-by: Manuel Lauss
    To: Linux-MIPS
    Patchwork: https://patchwork.linux-mips.org/patch/2707/
    Signed-off-by: Ralf Baechle

    Manuel Lauss
     

22 Oct, 2011

6 commits

  • 0d8d29389   ASoC: max98095: Convert codec->hw_write to snd_soc_write ... Browse Code »

    codec->hw_write is broken now, convert codec->hw_write to snd_soc_write.

    The hardware has 2 banks of registers sharing a section in I2C register space.
    The 1st bank is the primary one and is cached.
    The 2nd bank is for loading coefficients only and they do not need cache.
    These coefficients registers are therefore direct writes.
    Thus we set cache_bypass flag to deal with this before calling snd_soc_write.

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

    Axel Lin
     
  • 226d0f22d   ASoC: keep pointer to resource so it can be freed ... Browse Code »

    Add a new variable for storing resources accessed subsequent to the one
    accessed using request_mem_region, so the one accessed using
    request_mem_region can be released if needed.

    The resource variable names are also changed to be more descriptive.

    This code is also missing some calls to iounmap.

    The semantic match that finds this problem is as follows:
    (http://coccinelle.lip6.fr/)

    //
    @r@
    expression E, E1;
    identifier f;
    statement S1,S2,S3;
    @@

    if (E == NULL)
    {
    ... when != if (E == NULL || ...) S1 else S2
    when != E = E1
    *E->f
    ... when any
    return ...;
    }
    else S3
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: Mark Brown

    Julia Lawall
     
  • 33cb92cff   ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls ... Browse Code »

    Ensure all mask bits are clear before setting new value.

    Signed-off-by: Axel Lin
    Acked-by: Dong Aisheng
    Acked-by: Liam Girdwood
    Signed-off-by: Mark Brown

    Axel Lin
     
  • 3205e6629   ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2 ... Browse Code »

    Signed-off-by: Axel Lin
    Acked-by: Liam Girdwood
    Signed-off-by: Mark Brown
    Cc: stable@kernel.org

    Axel Lin
     
  • 52082d8f5   ASoC: da7210: Add support for line out and DAC ... Browse Code »

    DA7210 has three line outputs. OUT1 Left, OUT1 Right and OUT2 (mono).
    This patch adds support for gain controls for these three line outs.
    It also adds support for overall DAC gain control.

    Signed-off-by: Ashish Chavan
    Signed-off-by: David Dajun Chen
    Acked-by: Liam Girdwood
    Signed-off-by: Mark Brown

    Ashish Chavan
     
  • 6950c60dc   ASoC: da7210: Add support for DAPM ... Browse Code »

    This patch adds support for DAPM covering all inputs and outputs
    as well as ADC and DAC.

    Signed-off-by: Ashish Chavan
    Signed-off-by: David Dajun Chen
    Acked-by: Liam Girdwood
    Signed-off-by: Mark Brown

    Ashish Chavan
     

21 Oct, 2011

2 commits

20 Oct, 2011

3 commits