Eric Lee / smarc-fsl-linux-kernel

23 Feb, 2016

1 commit

  • fe0d128c5   ALSA: jack: Allow building the jack layer without input device ... Browse Code »

    Since the recent integration of kctl jack and input jack layers, we
    can basically build the jack layer even without input devices. That
    is, the jack layer itself can be built with conditional to enable the
    input device support or not, while the users may enable always
    CONFIG_SND_JACK unconditionally.

    For achieving it, this patch changes the following:
    - A new Kconfig, CONFIG_SND_JACK_INPUT_DEV, was introduced to indicate
    whether the jack layer supports the input device,
    - A few items in snd_jack struct and relevant codes are conditionally
    built upon CONFIG_SND_JACK_INPUT_DEV,
    - The users of CONFIG_SND_JACK drop the messy dependency on
    CONFIG_INPUT.

    This change also automagically fixes a potential bug in HD-audio
    driver Arnd reported, where the NULL or uninitialized jack instance is
    dereferenced.

    Reported-by: Arnd Bergmann
    Acked-by: Arnd Bergmann
    Signed-off-by: Takashi Iwai

    Takashi Iwai
     

21 May, 2015

1 commit

30 Apr, 2015

2 commits

28 Apr, 2015

4 commits

  • 2ba2dfa1f   ALSA: hda - Update to use the new jack kctls method ... Browse Code »

    Jack snd_kcontrols can now be created during snd_jack_new()
    or by later calling snd_jack_add_new_kctls().

    This patch creates the jacks during the initialisation stage
    for both phantom and non phantom jacks.

    Signed-off-by: Jie Yang
    Signed-off-by: Takashi Iwai

    Jie Yang
     
  • 4e3f0dc65   ALSA: jack: extend snd_jack_new to support phantom jack ... Browse Code »

    Dont create input devices for phantom jacks.

    Here, we extend snd_jack_new() to support phantom jack creating:
    pass in a bool param for [non-]phantom flag, and a bool param
    initial_jack to indicate whether we need to create a kctl at
    this stage.

    We can also add a kctl to the jack after its created meaning we
    can now integrate the HDA and ASoC jacks.

    Signed-off-by: Jie Yang
    Signed-off-by: Takashi Iwai

    Jie Yang
     
  • b8dd08667   ALSA: Jack: handle jack embedded kcontrol creating within ctljack ... Browse Code »

    This patch adds a static method get_available_index() to
    allocate the index of new jack kcontrols and also adds
    jack_kctl_name_gen() which is used to ensure compatibility
    with jack naming by removing " Jack" from some incorrectly
    passed names.

    Signed-off-by: Jie Yang
    Signed-off-by: Takashi Iwai

    Jie Yang
     
  • 9058cbe1e   ALSA: jack: implement kctl creating for jack devices ... Browse Code »

    Currently the ALSA jack core registers only input devices for each jack
    registered. These jack input devices are not readable by userspace devices
    that run as non root. This patch series will implement kctls inside the
    core jack part, including kctls creating, status changing report, for both
    HD-Audio and ASoC jack. This allows non root userspace to read jack status
    and act on it.

    This patch adds a new API called snd_jack_add_new_kctl(), which will create
    a kcontrol, add it to the card, and also attach it to the jack kctl list.

    This patch also initialises the jack kctl list after jack is newed, and
    reports kctl status when jack insertion/removal events occur.

    snd_jack_new() is updated in the following patches to also support creating
    phantom jacks and jack kcontrols. We then remove these duplicated features
    from HDA jack and have jack kctls handled by core throughout HDA and ASoC.

    Signed-off-by: Liam Girdwood
    Modified-by: Jie Yang
    Signed-off-by: Jie Yang
    Reveiwed-by: Mark Brown
    Signed-off-by: Takashi Iwai

    Jie Yang
     

15 Nov, 2013

1 commit

  • 32b854429   ALSA: jack: Unregister input device at disconnection ... Browse Code »

    The recent change in sysfs triggered a kernel WARNING at unloading a
    sound driver like

    WARNING: CPU: 3 PID: 2247 at fs/sysfs/group.c:214 sysfs_remove_group+0xe8/0xf0()
    sysfs group ffffffff81ab7b20 not found for kobject 'event14'

    for each jack instance. It's because the unregistration of jack input
    device is done in dev_free callback, which is called after
    snd_card_disconnect(). Since device_unregister(card->card_dev) is
    called in snd_card_disconnect(), the whole sysfs entries belonging to
    card->card_dev have been already removed recursively. Thus this
    results in a warning as input_unregister_device() yet tries to
    unregister the already removed sysfs entry.

    For fixing this mess, we need to unregister the jack input device at
    dev_disconnect callback so that it's called before unregistering the
    card->card_dev.

    Reviwed-by: Mark Brown
    Signed-off-by: Takashi Iwai

    Takashi Iwai
     

12 Mar, 2013

1 commit

  • eb7c06e8e   ALSA: add/change some comments describing function return values ... Browse Code »

    script/kernel-doc reports the following type of warnings (when run in verbose
    mode):

    Warning(sound/core/init.c:152): No description found for return value of
    'snd_card_create'

    To fix that:
    - add missing descriptions of function return values
    - use "Return:" sections to describe those return values

    Along the way:
    - complete some descriptions
    - fix some typos

    Signed-off-by: Yacine Belkadi
    Signed-off-by: Takashi Iwai

    Yacine Belkadi
     

08 May, 2012

1 commit

28 Feb, 2012

1 commit

01 Nov, 2011

1 commit

05 Oct, 2011

1 commit

21 Feb, 2011

1 commit

20 May, 2010

1 commit

30 Mar, 2010

1 commit

  • 5a0e3ad6a   include cleanup: Update gfp.h and slab.h includes to prepare for breaking implic… ... Browse Code »

    …it slab.h inclusion from percpu.h

    percpu.h is included by sched.h and module.h and thus ends up being
    included when building most .c files. percpu.h includes slab.h which
    in turn includes gfp.h making everything defined by the two files
    universally available and complicating inclusion dependencies.

    percpu.h -> slab.h dependency is about to be removed. Prepare for
    this change by updating users of gfp and slab facilities include those
    headers directly instead of assuming availability. As this conversion
    needs to touch large number of source files, the following script is
    used as the basis of conversion.

    http://userweb.kernel.org/~tj/misc/slabh-sweep.py

    The script does the followings.

    * Scan files for gfp and slab usages and update includes such that
    only the necessary includes are there. ie. if only gfp is used,
    gfp.h, if slab is used, slab.h.

    * When the script inserts a new include, it looks at the include
    blocks and try to put the new include such that its order conforms
    to its surrounding. It's put in the include block which contains
    core kernel includes, in the same order that the rest are ordered -
    alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
    doesn't seem to be any matching order.

    * If the script can't find a place to put a new include (mostly
    because the file doesn't have fitting include block), it prints out
    an error message indicating which .h file needs to be added to the
    file.

    The conversion was done in the following steps.

    1. The initial automatic conversion of all .c files updated slightly
    over 4000 files, deleting around 700 includes and adding ~480 gfp.h
    and ~3000 slab.h inclusions. The script emitted errors for ~400
    files.

    2. Each error was manually checked. Some didn't need the inclusion,
    some needed manual addition while adding it to implementation .h or
    embedding .c file was more appropriate for others. This step added
    inclusions to around 150 files.

    3. The script was run again and the output was compared to the edits
    from #2 to make sure no file was left behind.

    4. Several build tests were done and a couple of problems were fixed.
    e.g. lib/decompress_*.c used malloc/free() wrappers around slab
    APIs requiring slab.h to be added manually.

    5. The script was run on all .h files but without automatically
    editing them as sprinkling gfp.h and slab.h inclusions around .h
    files could easily lead to inclusion dependency hell. Most gfp.h
    inclusion directives were ignored as stuff from gfp.h was usually
    wildly available and often used in preprocessor macros. Each
    slab.h inclusion directive was examined and added manually as
    necessary.

    6. percpu.h was updated not to include slab.h.

    7. Build test were done on the following configurations and failures
    were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
    distributed build env didn't work with gcov compiles) and a few
    more options had to be turned off depending on archs to make things
    build (like ipr on powerpc/64 which failed due to missing writeq).

    * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
    * powerpc and powerpc64 SMP allmodconfig
    * sparc and sparc64 SMP allmodconfig
    * ia64 SMP allmodconfig
    * s390 SMP allmodconfig
    * alpha SMP allmodconfig
    * um on x86_64 SMP allmodconfig

    8. percpu.h modifications were reverted so that it could be applied as
    a separate patch and serve as bisection point.

    Given the fact that I had only a couple of failures from tests on step
    6, I'm fairly confident about the coverage of this conversion patch.
    If there is a breakage, it's likely to be something in one of the arch
    headers which should be easily discoverable easily on most builds of
    the specific arch.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

    Tejun Heo
     

18 Mar, 2010

2 commits

  • ebb812cb8   ALSA: Add support for key reporting via the jack interface ... Browse Code »

    Some devices provide support for detection of a small number of
    buttons on their jacks. One common implementation provides a single
    button, implemented by shorting the microphone to ground and detected
    along with microphone presence detection by detecting varying current
    draws on the microphone bias signal.

    Provide support for up to three buttons via the jack interface. These
    default to reporting BTN_n but an API is provided to allow these to
    be remapped to other keys by the machine driver where it knows what
    the keys are. More keys can be added with ease if required.

    This is only intended to support simple accessory button designs. If
    the interface is limiting then either creating a child device for the
    accessory or accessing the input device in the jack directly is
    recommended.

    Signed-off-by: Mark Brown

    Mark Brown
     
  • 1c6e555c3   ALSA: Rename jack switch table in preparation for button support ... Browse Code »

    Avoids confusion when we have button support.

    Signed-off-by: Mark Brown

    Mark Brown
     

11 Jun, 2009

1 commit

  • 1f3fff7bd   ALSA: use card device as parent for jack input-devices ... Browse Code »

    This moves the jack devices from the PCI device into the ALSA card device, which
    makes it easier for userspace to find all devices belonging to a specific card
    while granting access to logged-in users.

    Jack input devices from sound cards can now simply be matched with udev by doing:
    SUBSYSTEM="input", SUBSYSTEMS="sound", ...

    ls -l /sys/devices/pci0000:00/0000:00:1b.0/sound/card0
    controlC0
    device -> ../../../0000:00:1b.0
    id
    input10
    input11
    input8
    input9
    number
    pcmC0D0c
    pcmC0D0p
    pcmC0D1p
    power
    subsystem -> ../../../../../class/sound
    uevent

    Cc: Lennart Poettering
    Signed-off-by: Kay Sievers
    Signed-off-by: Takashi Iwai

    Kay Sievers
     

14 Apr, 2009

1 commit

24 Mar, 2009

1 commit

18 Feb, 2009

1 commit

  • 2678f60d2   ALSA: jack - Use card->shortname for input name ... Browse Code »

    Currently the jack layer refers to card->longname as a part of
    its input device name string. However, longname is often really long
    and way too ugly as an identifier, such as,
    "HDA Intel at 0xf8400000 irq 21".

    This patch changes the code to use card->shortname instead.
    The shortname string contains usually the h/w vendor and product
    names but without messy I/O port or IRQ numbers.

    Signed-off-by: Takashi Iwai

    Takashi Iwai
     

07 Jan, 2009

1 commit

04 Jan, 2009

1 commit

25 Dec, 2008

1 commit

19 Dec, 2008

1 commit

10 Dec, 2008

1 commit

  • cdc693643   ALSA: Add support for mechanical jack insertion ... Browse Code »

    Some systems support both mechanical and electrical jack detection,
    allowing them to report that a jack is physically present but does
    not have any functioning connections. Add a new jack type for these,
    allowing user space to report faulty connections.

    Thanks to Guillem Jover for the suggestion.

    Signed-off-by: Mark Brown
    Signed-off-by: Takashi Iwai

    Mark Brown
     

27 Oct, 2008

2 commits

16 Oct, 2008

1 commit

30 Jul, 2008

1 commit

  • e76d8ceaa   ALSA: Add jack reporting API ... Browse Code »

    Currently very few systems provide information about jack status to user
    space, even though many have hardware facilities to do detection. Those
    systems that do use an input device with the existing SW_HEADPHONE_INSERT
    switch type to do so, often independently of ALSA.

    This patch introduces a standard method for representing jacks to user
    space into ALSA. It allows drivers to register jacks for a sound card with
    the input subsystem, binding the input device to the card to help user
    space associate the input devices with their sound cards. The created
    input devices are named in the form "card longname jack" where jack is
    provided by the driver when allocating a jack. By default the parent for
    the input device is the sound card but this can be overridden by the
    card driver.

    The existing user space API with SW_HEADPHONE_INSERT is preserved.

    Signed-off-by: Mark Brown
    Signed-off-by: Takashi Iwai
    Signed-off-by: Jaroslav Kysela

    Mark Brown