09 Jan, 2012

2 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
    Kconfig: acpi: Fix typo in comment.
    misc latin1 to utf8 conversions
    devres: Fix a typo in devm_kfree comment
    btrfs: free-space-cache.c: remove extra semicolon.
    fat: Spelling s/obsolate/obsolete/g
    SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
    tools/power turbostat: update fields in manpage
    mac80211: drop spelling fix
    types.h: fix comment spelling for 'architectures'
    typo fixes: aera -> area, exntension -> extension
    devices.txt: Fix typo of 'VMware'.
    sis900: Fix enum typo 'sis900_rx_bufer_status'
    decompress_bunzip2: remove invalid vi modeline
    treewide: Fix comment and string typo 'bufer'
    hyper-v: Update MAINTAINERS
    treewide: Fix typos in various parts of the kernel, and fix some comments.
    clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
    gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
    leds: Kconfig: Fix typo 'D2NET_V2'
    sound: Kconfig: drop unknown symbol ARCH_CLPS7500
    ...

    Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
    kconfig additions, close to removed commented-out old ones)

    Linus Torvalds
     
  • * 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits)
    reiserfs: Properly display mount options in /proc/mounts
    vfs: prevent remount read-only if pending removes
    vfs: count unlinked inodes
    vfs: protect remounting superblock read-only
    vfs: keep list of mounts for each superblock
    vfs: switch ->show_options() to struct dentry *
    vfs: switch ->show_path() to struct dentry *
    vfs: switch ->show_devname() to struct dentry *
    vfs: switch ->show_stats to struct dentry *
    switch security_path_chmod() to struct path *
    vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb
    vfs: trim includes a bit
    switch mnt_namespace ->root to struct mount
    vfs: take /proc/*/mounts and friends to fs/proc_namespace.c
    vfs: opencode mntget() mnt_set_mountpoint()
    vfs: spread struct mount - remaining argument of next_mnt()
    vfs: move fsnotify junk to struct mount
    vfs: move mnt_devname
    vfs: move mnt_list to struct mount
    vfs: switch pnode.h macros to struct mount *
    ...

    Linus Torvalds
     

08 Jan, 2012

1 commit

  • * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)
    arm: fix up some samsung merge sysdev conversion problems
    firmware: Fix an oops on reading fw_priv->fw in sysfs loading file
    Drivers:hv: Fix a bug in vmbus_driver_unregister()
    driver core: remove __must_check from device_create_file
    debugfs: add missing #ifdef HAS_IOMEM
    arm: time.h: remove device.h #include
    driver-core: remove sysdev.h usage.
    clockevents: remove sysdev.h
    arm: convert sysdev_class to a regular subsystem
    arm: leds: convert sysdev_class to a regular subsystem
    kobject: remove kset_find_obj_hinted()
    m86k: gpio - convert sysdev_class to a regular subsystem
    mips: txx9_sram - convert sysdev_class to a regular subsystem
    mips: 7segled - convert sysdev_class to a regular subsystem
    sh: dma - convert sysdev_class to a regular subsystem
    sh: intc - convert sysdev_class to a regular subsystem
    power: suspend - convert sysdev_class to a regular subsystem
    power: qe_ic - convert sysdev_class to a regular subsystem
    power: cmm - convert sysdev_class to a regular subsystem
    s390: time - convert sysdev_class to a regular subsystem
    ...

    Fix up conflicts with 'struct sysdev' removal from various platform
    drivers that got changed:
    - arch/arm/mach-exynos/cpu.c
    - arch/arm/mach-exynos/irq-eint.c
    - arch/arm/mach-s3c64xx/common.c
    - arch/arm/mach-s3c64xx/cpu.c
    - arch/arm/mach-s5p64x0/cpu.c
    - arch/arm/mach-s5pv210/common.c
    - arch/arm/plat-samsung/include/plat/cpu.h
    - arch/powerpc/kernel/sysfs.c
    and fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h

    Linus Torvalds
     

07 Jan, 2012

2 commits

  • …git-cur/linux-2.6-arm

    * 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
    sound: aaci: Enable module alias autogeneration for AMBA drivers
    watchdog: sp805: Enable module alias autogeneration for AMBA drivers
    fbdev: amba: Enable module alias autogeneration for AMBA drivers
    serial: pl011: Enable module alias autogeneration for AMBA drivers
    serial: pl010: Enable module alias autogeneration for AMBA drivers
    spi: pl022: Enable module alias autogeneration for AMBA drivers
    rtc: pl031: Enable module alias autogeneration for AMBA drivers
    rtc: pl030: Enable module alias autogeneration for AMBA drivers
    mmc: mmci: Enable module alias autogeneration for AMBA drivers
    input: ambakmi: Enable module alias autogeneration for AMBA drivers
    gpio: pl061: Enable module alias autogeneration for AMBA drivers
    dmaengine: pl330: Enable module alias autogeneration for AMBA drivers
    dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers
    hwrng: nomadik: Enable module alias autogeneration for AMBA drivers
    ARM: amba: Auto-generate AMBA driver module aliases during modpost
    ARM: amba: Move definition of struct amba_id to mod_devicetable.h

    Linus Torvalds
     
  • This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
    and it fixes the build error in the arch/x86/kernel/microcode_core.c
    file, that the merge did not catch.

    The microcode_core.c patch was provided by Stephen Rothwell
    who was invaluable in the merge issues involved
    with the large sysdev removal process in the driver-core tree.

    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

04 Jan, 2012

1 commit


01 Jan, 2012

1 commit


24 Dec, 2011

1 commit


22 Dec, 2011

1 commit


19 Dec, 2011

1 commit


17 Dec, 2011

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    ALSA: HDA: Use LPIB Position fix for Intel SCH Poulsbo
    ALSA: hda: fix mute led polarity for HP laptops with buggy BIOS
    ALSA: HDA: Set position fix to LPIB for an Atom/Poulsbo based device
    ASoC: Fix hx4700 error handling to free gpios if snd_soc_register_card fails
    ASoC: WM8958: correctly show firmware magic on mismatch
    ASoC: mxs: Add appropriate MODULE_ALIAS()
    ASoC: mxs: Add missing MODULE_LICENSE("GPL")
    ASoC: Fix WM8996 24.576MHz clock operation
    ASoC: Include linux/module.h for smdk2443_wm9710
    ASoC: Fix a typo in jive_wm8750
    ASoC: Fix build dependency for SND_SOC_JZ4740_CODEC
    ASoC: Include linux/io.h for jz4740 codec

    Linus Torvalds
     

15 Dec, 2011

2 commits


13 Dec, 2011

1 commit


12 Dec, 2011

3 commits


11 Dec, 2011

3 commits


10 Dec, 2011

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    ALSA: hda/realtek - Fix lost speaker volume controls
    ALSA: hda/realtek - Create "Bass Speaker" for two speaker pins
    ALSA: hda/realtek - Don't create extra controls with channel suffix
    ALSA: hda - Fix remaining VREF mute-LED NID check in post-3.1 changes
    ALSA: hda - Fix GPIO LED setup for IDT 92HD75 codecs
    ASoC: Provide a more complete DMA driver stub
    ASoC: Remove references to corgi and spitz from machine driver document
    ASoC: Make SND_SOC_MX27VIS_AIC32X4 depend on I2C
    ASoC: Fix dependency for SND_SOC_RAUMFELD and SND_PXA2XX_SOC_HX4700
    ASoC: uda1380: Return proper error in uda1380_modinit failure path
    ASoC: kirkwood: Make SND_KIRKWOOD_SOC_OPENRD and SND_KIRKWOOD_SOC_T5325 depend on I2C
    ASoC: Mark WM8994 ADC muxes as virtual
    ALSA: hda/realtek - Fix Oops in alc_mux_select()
    ALSA: sis7019 - give slow codecs more time to reset

    Linus Torvalds
     

08 Dec, 2011

5 commits

  • When there are the same or more number of HP pins are available, HP pins
    are used as the primary outputs instead of the speaker pins. But, in
    some cases (especially with ALC663 & co), some DACs are available only
    with a later pin and it's assigned to a speaker, and since the driver
    parses the pins from the lower NID, such a DAC was skipped eventually
    without assignments. This resulted in a regression, the missing speaker
    volume control in the new parser.

    As a workaround for this, now the driver retries the pin->DAC mapping
    again after restoring the speaker-pins as primary. This is still an ad
    hoc fix, but it works so far for most of Realtek codecs.

    Signed-off-by: Takashi Iwai

    Takashi Iwai
     
  • On systems with two speaker pins, the secondary speaker pin is mostly
    assigned to a bass speaker instead of a surround. Thus it makes more
    sense to rename the control properly.

    Signed-off-by: Takashi Iwai

    Takashi Iwai
     
  • The multiple headphone or speaker pins are usually provided to
    output the same stream unlike line-out jacks (which are supposed
    to be multi-channel surrounds). Thus giving a mixer name like
    "Headphone Surround" is rather confusing. Instead, when multiple
    headphone volumes are available, use index with the same "Headphone"
    name.

    Signed-off-by: Takashi Iwai

    Takashi Iwai
     
  • Include linux/module.h to fix below build error:
    CC sound/soc/samsung/smdk2443_wm9710.o
    sound/soc/samsung/smdk2443_wm9710.c:64: error: expected declaration specifiers or '...' before string constant
    sound/soc/samsung/smdk2443_wm9710.c:64: warning: data definition has no type or storage class
    sound/soc/samsung/smdk2443_wm9710.c:64: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
    sound/soc/samsung/smdk2443_wm9710.c:64: warning: function declaration isn't a prototype
    sound/soc/samsung/smdk2443_wm9710.c:65: error: expected declaration specifiers or '...' before string constant
    sound/soc/samsung/smdk2443_wm9710.c:65: warning: data definition has no type or storage class
    sound/soc/samsung/smdk2443_wm9710.c:65: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
    sound/soc/samsung/smdk2443_wm9710.c:65: warning: function declaration isn't a prototype
    sound/soc/samsung/smdk2443_wm9710.c:66: error: expected declaration specifiers or '...' before string constant
    sound/soc/samsung/smdk2443_wm9710.c:66: warning: data definition has no type or storage class
    sound/soc/samsung/smdk2443_wm9710.c:66: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
    sound/soc/samsung/smdk2443_wm9710.c:66: warning: function declaration isn't a prototype
    make[3]: *** [sound/soc/samsung/smdk2443_wm9710.o] Error 1
    make[2]: *** [sound/soc/samsung] Error 2
    make[1]: *** [sound/soc] Error 2
    make: *** [sound] Error 2

    Signed-off-by: Axel Lin
    Signed-off-by: Mark Brown

    Axel Lin
     
  • Fix a typo in jive_wm8750 that introduces below build error.
    Also removes an unused err variable.

    CC sound/soc/samsung/jive_wm8750.o
    sound/soc/samsung/jive_wm8750.c: In function 'jive_wm8750_init':
    sound/soc/samsung/jive_wm8750.c:104: warning: unused variable 'err'
    sound/soc/samsung/jive_wm8750.c: At top level:
    sound/soc/samsung/jive_wm8750.c:134: error: unknown field 'dapm_widgtets' specified in initializer
    sound/soc/samsung/jive_wm8750.c:134: warning: initialization from incompatible pointer type
    make[3]: *** [sound/soc/samsung/jive_wm8750.o] Error 1
    make[2]: *** [sound/soc/samsung] Error 2
    make[1]: *** [sound/soc] Error 2
    make: *** [sound] Error 2

    Signed-off-by: Axel Lin
    Signed-off-by: Mark Brown

    Axel Lin
     

06 Dec, 2011

7 commits

  • Takashi Iwai
     
  • Signed-off-by: Takashi Iwai

    Takashi Iwai
     
  • Takashi Iwai
     
  • Some HP laptops with IDT 92HD75 codecs may use a GPIO > 4 for the mute
    LED, but currently the driver doesn't check this properly, and confuses
    the mute LED behavior. This ended up with the silent output on some
    HP laptops due to having another GPIO used as external amp control.

    This patch fixes the problem by checking the max GPIO count and
    comparing with the given value from DMI entry instead of magic fixed
    value 4 and 8, and adding a new field to indicate the VREF mute-LED
    behavior.

    Reported-and-tested-by: Vitaliy Kulikov
    Cc: [v3.1]
    Signed-off-by: Takashi Iwai

    Takashi Iwai
     
  • Currently SND_SOC_JZ4740_CODEC depends on SOC_JZ4740 but SOC_JZ4740 is not
    defined in any Kconfig. Thus the codec driver will not be built when select
    "Build all ASoC CODEC drivers".
    (Unless it is selected by SND_JZ4740_SOC_QI_LB60).
    Remove the dependency with SOC_JZ4740, then this code driver can be built when
    select "Build all ASoC CODEC drivers".

    Signed-off-by: Axel Lin
    Acked-by: Lars-Peter Clausen
    Signed-off-by: Mark Brown

    Axel Lin
     
  • Include linux/io.h to fix below build errors:

    CC sound/soc/codecs/jz4740.o
    sound/soc/codecs/jz4740.c: In function 'jz4740_codec_read':
    sound/soc/codecs/jz4740.c:82: error: implicit declaration of function 'readl'
    sound/soc/codecs/jz4740.c: In function 'jz4740_codec_write':
    sound/soc/codecs/jz4740.c:92: error: implicit declaration of function 'writel'
    sound/soc/codecs/jz4740.c: In function 'jz4740_codec_probe':
    sound/soc/codecs/jz4740.c:373: error: implicit declaration of function 'ioremap'
    sound/soc/codecs/jz4740.c:373: warning: assignment makes pointer from integer without a cast
    sound/soc/codecs/jz4740.c:393: error: implicit declaration of function 'iounmap'
    make[3]: *** [sound/soc/codecs/jz4740.o] Error 1
    make[2]: *** [sound/soc/codecs] Error 2
    make[1]: *** [sound/soc] Error 2
    make: *** [sound] Error 2

    Signed-off-by: Axel Lin
    Acked-by: Lars-Peter Clausen
    Signed-off-by: Mark Brown

    Axel Lin
     
  • Allow userspace applications to do more parameter setting by providing a
    more complete stub DMA driver specifying a wildcard set of formats and
    channels and essentially random values for the DMA parameters. This is
    required for useful runtime operation of the dummy DMA driver until we
    are able to figure out how to power up links and do hw_params() from DAPM.

    Sending to stable as without this the dummy driver is not terribly
    useful.

    Reported-by: Kyung-Kwee Ryu
    Tested-by: Kyung-Kwee Ryu
    Signed-off-by: Mark Brown
    Cc: stable@kernel.org

    Mark Brown
     

05 Dec, 2011

3 commits

  • SND_SOC_MX27VIS_AIC32X4 selects SND_SOC_TLV320AIC32X4,
    but SND_SOC_TLV320AIC32X4 needs CONFIG_I2C.
    So we need to make SND_SOC_MX27VIS_AIC32X4 depend on I2C.
    otherwise I got below build error if CONFIG_I2C is not selected.

    CC sound/soc/codecs/tlv320aic32x4.o
    sound/soc/codecs/tlv320aic32x4.c: In function 'aic32x4_read':
    sound/soc/codecs/tlv320aic32x4.c:323: error: implicit declaration of function 'i2c_smbus_read_byte_data'
    sound/soc/codecs/tlv320aic32x4.c: In function 'aic32x4_probe':
    sound/soc/codecs/tlv320aic32x4.c:641: error: 'i2c_master_send' undeclared (first use in this function)
    sound/soc/codecs/tlv320aic32x4.c:641: error: (Each undeclared identifier is reported only once
    sound/soc/codecs/tlv320aic32x4.c:641: error: for each function it appears in.)
    sound/soc/codecs/tlv320aic32x4.c: In function 'aic32x4_modinit':
    sound/soc/codecs/tlv320aic32x4.c:763: error: implicit declaration of function 'i2c_add_driver'
    sound/soc/codecs/tlv320aic32x4.c: In function 'aic32x4_exit':
    sound/soc/codecs/tlv320aic32x4.c:774: error: implicit declaration of function 'i2c_del_driver'
    make[3]: *** [sound/soc/codecs/tlv320aic32x4.o] Error 1
    make[2]: *** [sound/soc/codecs] Error 2
    make[1]: *** [sound/soc] Error 2
    make: *** [sound] Error 2

    Signed-off-by: Axel Lin
    Signed-off-by: Mark Brown

    Axel Lin
     
  • SND_SOC_RAUMFELD selects SND_SOC_CS4270 which needs CONFIG_I2C,
    and also selects SND_SOC_AK4104 which needs SPI_MASTER.
    Thus make SND_SOC_RAUMFELD depend on I2C && SPI_MASTER.

    Add depend on SPI_MASTER to fix below build error if CONFIG_SPI_MASTER
    is not selected.

    LD .tmp_vmlinux1
    sound/built-in.o: In function `ak4104_spi_write':
    last.c:(.text+0x290cc): undefined reference to `spi_sync'
    sound/built-in.o: In function `ak4104_probe':
    last.c:(.text+0x292a0): undefined reference to `spi_write_then_read'
    sound/built-in.o: In function `ak4104_spi_probe':
    last.c:(.text+0x29398): undefined reference to `spi_setup'
    sound/built-in.o: In function `ak4104_init':
    last.c:(.init.text+0x4ec): undefined reference to `spi_register_driver'
    make: *** [.tmp_vmlinux1] Error 1

    Add depend on I2C to fix below build error if CONFIG_I2C is not selected:
    CC sound/soc/codecs/cs4270.o
    sound/soc/codecs/cs4270.c: In function 'cs4270_i2c_probe':
    sound/soc/codecs/cs4270.c:657: error: implicit declaration of function 'i2c_smbus_read_byte_data'
    sound/soc/codecs/cs4270.c: In function 'cs4270_init':
    sound/soc/codecs/cs4270.c:730: error: implicit declaration of function 'i2c_add_driver'
    sound/soc/codecs/cs4270.c: In function 'cs4270_exit':
    sound/soc/codecs/cs4270.c:736: error: implicit declaration of function 'i2c_del_driver'
    make[3]: *** [sound/soc/codecs/cs4270.o] Error 1
    make[2]: *** [sound/soc/codecs] Error 2
    make[1]: *** [sound/soc] Error 2
    make: *** [sound] Error 2

    SND_PXA2XX_SOC_HX4700 selects SND_SOC_AK4641 which needs CONFIG_I2C.
    Thus make SND_PXA2XX_SOC_HX4700 depend on I2C.

    Add depend on I2C to fix below build error if CONFIG_I2C is not selected:
    CC sound/soc/codecs/ak4641.o
    sound/soc/codecs/ak4641.c: In function 'ak4641_modinit':
    sound/soc/codecs/ak4641.c:646: error: implicit declaration of function 'i2c_add_driver'
    sound/soc/codecs/ak4641.c: In function 'ak4641_exit':
    sound/soc/codecs/ak4641.c:656: error: implicit declaration of function 'i2c_del_driver'
    make[3]: *** [sound/soc/codecs/ak4641.o] Error 1
    make[2]: *** [sound/soc/codecs] Error 2
    make[1]: *** [sound/soc] Error 2
    make: *** [sound] Error 2

    Signed-off-by: Axel Lin
    Signed-off-by: Mark Brown

    Axel Lin
     
  • Return proper error for uda1380_modinit if i2c_add_driver() fails.

    Signed-off-by: Axel Lin
    Signed-off-by: Mark Brown

    Axel Lin
     

03 Dec, 2011

3 commits

  • SND_KIRKWOOD_SOC_T5325 selects SND_SOC_ALC5623, but SND_SOC_ALC5623 needs
    CONFIG_I2C. So we need to make SND_KIRKWOOD_SOC_T5325 depend on I2C,
    otherwise I got below build error if CONFIG_I2C is not selected.

    CC sound/soc/codecs/alc5623.o
    sound/soc/codecs/alc5623.c: In function 'alc5623_i2c_probe':
    sound/soc/codecs/alc5623.c:1002: error: implicit declaration of function 'i2c_smbus_read_word_data'
    sound/soc/codecs/alc5623.c:1009: error: implicit declaration of function 'i2c_smbus_read_byte_data'
    sound/soc/codecs/alc5623.c: In function 'alc5623_modinit':
    sound/soc/codecs/alc5623.c:1096: error: implicit declaration of function 'i2c_add_driver'
    sound/soc/codecs/alc5623.c: In function 'alc5623_modexit':
    sound/soc/codecs/alc5623.c:1108: error: implicit declaration of function 'i2c_del_driver'
    make[3]: *** [sound/soc/codecs/alc5623.o] Error 1
    make[2]: *** [sound/soc/codecs] Error 2
    make[1]: *** [sound/soc] Error 2
    make: *** [sound] Error 2

    Also fix the same issue for SND_KIRKWOOD_SOC_OPENRD.

    Signed-off-by: Axel Lin
    Signed-off-by: Mark Brown

    Axel Lin
     
  • Since they don't actually have power bits but do have events associated
    with them it's important that we bootstrap their state properly which
    making them virtual does.

    Signed-off-by: Mark Brown

    Mark Brown
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    ALSA: hda - Fix S3/S4 problem on machines with VREF-pin mute-LED
    ALSA: hda_intel - revert a quirk that affect VIA chipsets
    ALSA: hda - Avoid touching mute-VREF pin for IDT codecs
    firmware: Sigma: Fix endianess issues
    firmware: Sigma: Skip header during CRC generation
    firmware: Sigma: Prevent out of bounds memory access
    ALSA: usb-audio - Support for Roland GAIA SH-01 Synthesizer
    ASoC: Supply dcs_codes for newer WM1811 revisions
    ASoC: Error out if we can't generate a LRCLK at all for WM8994
    ASoC: Correct name of Speyside Main Speaker widget
    ASoC: skip resume of soc-audio devices without codecs
    ASoC: cs42l51: Fix off-by-one for reg_cache_size
    ASoC: drop support for PlayPaq with WM8510
    ASoC: mpc8610: tell the CS4270 codec that it's the master
    ASoC: cs4720: use snd_soc_cache_sync()
    ASoC: SAMSUNG: Fix build error
    ASoC: max9877: Update register if either val or val2 is changed
    ASoC: Fix wrong define for AD1836_ADC_WORD_OFFSET

    Linus Torvalds
     

02 Dec, 2011

1 commit