February 2014 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 1/3] sound: Include appropriate header file in pcsp/pcsp_input.c
by Rashika Kheria 07 Feb '14

07 Feb '14

Include appropriate header file in drivers/pcsp/pcsp_input.c because it defines function whose prototype definitions are present in drivers/pcsp/pcsp_input.h. This eliminates the following warning in drivers/pcsp/pcsp_input.c: sound/drivers/pcsp/pcsp_input.c:42:6: warning: no previous prototype for ‘pcspkr_stop_sound’ [-Wmissing-prototypes] sound/drivers/pcsp/pcsp_input.c:80:5: warning: no previous prototype for ‘pcspkr_input_init’ [-Wmissing-prototypes] sound/drivers/pcsp/pcsp_input.c:110:5: warning: no previous prototype for ‘pcspkr_input_remove’ [-Wmissing-prototypes] Signed-off-by: Rashika Kheria <rashika.kheria(a)gmail.com> --- sound/drivers/pcsp/pcsp_input.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/drivers/pcsp/pcsp_input.c b/sound/drivers/pcsp/pcsp_input.c index b874b0a..0ecf8a4 100644 --- a/sound/drivers/pcsp/pcsp_input.c +++ b/sound/drivers/pcsp/pcsp_input.c @@ -16,6 +16,7 @@ #include <linux/input.h> #include <asm/io.h> #include "pcsp.h" +#include "pcsp_input.h" static void pcspkr_do_sound(unsigned int count) { -- 1.7.9.5

3 6

[alsa-devel] [PATCH 1/2] ASoC: codecs: Put the CODEC drivers in a menu
by Mark Brown 07 Feb '14

07 Feb '14

From: Mark Brown <broonie(a)linaro.org> Now they're visible they get a bit noisy. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 28faa2d0eaef..6b67e86f3f2c 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -8,6 +8,8 @@ config SND_SOC_I2C_AND_SPI default y if I2C=y default y if SPI_MASTER=y +menu "CODEC drivers" + config SND_SOC_ALL_CODECS tristate "Build all ASoC CODEC drivers" depends on COMPILE_TEST @@ -588,3 +590,5 @@ config SND_SOC_ML26124 config SND_SOC_TPA6130A2 tristate "Texas Instruments TPA6130A2 headphone amplifier" depends on I2C + +endmenu -- 1.9.rc1

1 1

[alsa-devel] [PATCH] ASoC: rt5640: Add ACPI ID for Intel Baytrail
by Jarkko Nikula 07 Feb '14

07 Feb '14

Realtek RT5640 uses ACPI ID "10EC5640" for Intel Baytrail platforms. Signed-off-by: Jarkko Nikula <jarkko.nikula(a)linux.intel.com> Cc: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt5640.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index a3fb41179636..886924934aa5 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -2093,6 +2093,7 @@ MODULE_DEVICE_TABLE(i2c, rt5640_i2c_id); #ifdef CONFIG_ACPI static struct acpi_device_id rt5640_acpi_match[] = { { "INT33CA", 0 }, + { "10EC5640", 0 }, { }, }; MODULE_DEVICE_TABLE(acpi, rt5640_acpi_match); -- 1.8.5.3

2 1

Re: [alsa-devel] [PATCH RFC 26/46] drivers/base: provide an infrastructure for componentised subsystems
by Daniel Vetter 07 Feb '14

07 Feb '14

I've chatted a bit with Hans Verkuil about this topic at fosdem and apparently both v4l and alsa have something like this already in their helper libraries. Adding more people as fyi in case they want to switch to the new driver core stuff from Russell. -Daniel On Thu, Jan 2, 2014 at 10:27 PM, Russell King <rmk+kernel(a)arm.linux.org.uk> wrote: > Subsystems such as ALSA, DRM and others require a single card-level > device structure to represent a subsystem. However, firmware tends to > describe the individual devices and the connections between them. > > Therefore, we need a way to gather up the individual component devices > together, and indicate when we have all the component devices. > > We do this in DT by providing a "superdevice" node which specifies > the components, eg: > > imx-drm { > compatible = "fsl,drm"; > crtcs = <&ipu1>; > connectors = <&hdmi>; > }; > > The superdevice is declared into the component support, along with the > subcomponents. The superdevice receives callbacks to locate the > subcomponents, and identify when all components are present. At this > point, we bind the superdevice, which causes the appropriate subsystem > to be initialised in the conventional way. > > When any of the components or superdevice are removed from the system, > we unbind the superdevice, thereby taking the subsystem down. > > Signed-off-by: Russell King <rmk+kernel(a)arm.linux.org.uk> > --- > drivers/base/Makefile | 2 +- > drivers/base/component.c | 379 +++++++++++++++++++++++++++++++++++++++++++++ > include/linux/component.h | 31 ++++ > 3 files changed, 411 insertions(+), 1 deletions(-) > create mode 100644 drivers/base/component.c > create mode 100644 include/linux/component.h > > diff --git a/drivers/base/Makefile b/drivers/base/Makefile > index 94e8a80e87f8..870ecfd503af 100644 > --- a/drivers/base/Makefile > +++ b/drivers/base/Makefile > @@ -1,6 +1,6 @@ > # Makefile for the Linux device tree > > -obj-y := core.o bus.o dd.o syscore.o \ > +obj-y := component.o core.o bus.o dd.o syscore.o \ > driver.o class.o platform.o \ > cpu.o firmware.o init.o map.o devres.o \ > attribute_container.o transport_class.o \ > diff --git a/drivers/base/component.c b/drivers/base/component.c > new file mode 100644 > index 000000000000..5492cd8d2247 > --- /dev/null > +++ b/drivers/base/component.c > @@ -0,0 +1,379 @@ > +/* > + * Componentized device handling. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + * > + * This is work in progress. We gather up the component devices into a list, > + * and bind them when instructed. At the moment, we're specific to the DRM > + * subsystem, and only handles one master device, but this doesn't have to be > + * the case. > + */ > +#include <linux/component.h> > +#include <linux/device.h> > +#include <linux/kref.h> > +#include <linux/list.h> > +#include <linux/module.h> > +#include <linux/mutex.h> > +#include <linux/slab.h> > + > +struct master { > + struct list_head node; > + struct list_head components; > + bool bound; > + > + const struct component_master_ops *ops; > + struct device *dev; > +}; > + > +struct component { > + struct list_head node; > + struct list_head master_node; > + struct master *master; > + bool bound; > + > + const struct component_ops *ops; > + struct device *dev; > +}; > + > +static DEFINE_MUTEX(component_mutex); > +static LIST_HEAD(component_list); > +static LIST_HEAD(masters); > + > +static struct master *__master_find(struct device *dev, const struct component_master_ops *ops) > +{ > + struct master *m; > + > + list_for_each_entry(m, &masters, node) > + if (m->dev == dev && (!ops || m->ops == ops)) > + return m; > + > + return NULL; > +} > + > +/* Attach an unattached component to a master. */ > +static void component_attach_master(struct master *master, struct component *c) > +{ > + c->master = master; > + > + list_add_tail(&c->master_node, &master->components); > +} > + > +/* Detach a component from a master. */ > +static void component_detach_master(struct master *master, struct component *c) > +{ > + list_del(&c->master_node); > + > + c->master = NULL; > +} > + > +int component_master_add_child(struct master *master, > + int (*compare)(struct device *, void *), void *compare_data) > +{ > + struct component *c; > + int ret = -ENXIO; > + > + list_for_each_entry(c, &component_list, node) { > + if (c->master) > + continue; > + > + if (compare(c->dev, compare_data)) { > + component_attach_master(master, c); > + ret = 0; > + break; > + } > + } > + > + return ret; > +} > +EXPORT_SYMBOL_GPL(component_master_add_child); > + > +/* Detach all attached components from this master */ > +static void master_remove_components(struct master *master) > +{ > + while (!list_empty(&master->components)) { > + struct component *c = list_first_entry(&master->components, > + struct component, master_node); > + > + WARN_ON(c->master != master); > + > + component_detach_master(master, c); > + } > +} > + > +/* > + * Try to bring up a master. If component is NULL, we're interested in > + * this master, otherwise it's a component which must be present to try > + * and bring up the master. > + * > + * Returns 1 for successful bringup, 0 if not ready, or -ve errno. > + */ > +static int try_to_bring_up_master(struct master *master, > + struct component *component) > +{ > + int ret = 0; > + > + if (!master->bound) { > + /* > + * Search the list of components, looking for components that > + * belong to this master, and attach them to the master. > + */ > + if (master->ops->add_components(master->dev, master)) { > + /* Failed to find all components */ > + master_remove_components(master); > + ret = 0; > + goto out; > + } > + > + if (component && component->master != master) { > + master_remove_components(master); > + ret = 0; > + goto out; > + } > + > + /* Found all components */ > + ret = master->ops->bind(master->dev); > + if (ret < 0) { > + master_remove_components(master); > + goto out; > + } > + > + master->bound = true; > + ret = 1; > + } > +out: > + > + return ret; > +} > + > +static int try_to_bring_up_masters(struct component *component) > +{ > + struct master *m; > + int ret = 0; > + > + list_for_each_entry(m, &masters, node) { > + ret = try_to_bring_up_master(m, component); > + if (ret != 0) > + break; > + } > + > + return ret; > +} > + > +static void take_down_master(struct master *master) > +{ > + if (master->bound) { > + master->ops->unbind(master->dev); > + master->bound = false; > + } > + > + master_remove_components(master); > +} > + > +int component_master_add(struct device *dev, const struct component_master_ops *ops) > +{ > + struct master *master; > + int ret; > + > + master = kzalloc(sizeof(*master), GFP_KERNEL); > + if (!master) > + return -ENOMEM; > + > + master->dev = dev; > + master->ops = ops; > + INIT_LIST_HEAD(&master->components); > + > + /* Add to the list of available masters. */ > + mutex_lock(&component_mutex); > + list_add(&master->node, &masters); > + > + ret = try_to_bring_up_master(master, NULL); > + > + if (ret < 0) { > + /* Delete off the list if we weren't successful */ > + list_del(&master->node); > + kfree(master); > + } > + mutex_unlock(&component_mutex); > + > + return ret < 0 ? ret : 0; > +} > +EXPORT_SYMBOL_GPL(component_master_add); > + > +void component_master_del(struct device *dev, const struct component_master_ops *ops) > +{ > + struct master *master; > + > + mutex_lock(&component_mutex); > + master = __master_find(dev, ops); > + if (master) { > + take_down_master(master); > + > + list_del(&master->node); > + kfree(master); > + } > + mutex_unlock(&component_mutex); > +} > +EXPORT_SYMBOL_GPL(component_master_del); > + > +static void component_unbind(struct component *component, > + struct master *master, void *data) > +{ > + WARN_ON(!component->bound); > + > + component->ops->unbind(component->dev, master->dev, data); > + component->bound = false; > + > + /* Release all resources claimed in the binding of this component */ > + devres_release_group(component->dev, component); > +} > + > +void component_unbind_all(struct device *master_dev, void *data) > +{ > + struct master *master; > + struct component *c; > + > + WARN_ON(!mutex_is_locked(&component_mutex)); > + > + master = __master_find(master_dev, NULL); > + if (!master) > + return; > + > + list_for_each_entry_reverse(c, &master->components, master_node) > + component_unbind(c, master, data); > +} > +EXPORT_SYMBOL_GPL(component_unbind_all); > + > +static int component_bind(struct component *component, struct master *master, > + void *data) > +{ > + int ret; > + > + /* > + * Each component initialises inside its own devres group. > + * This allows us to roll-back a failed component without > + * affecting anything else. > + */ > + if (!devres_open_group(master->dev, NULL, GFP_KERNEL)) > + return -ENOMEM; > + > + /* > + * Also open a group for the device itself: this allows us > + * to release the resources claimed against the sub-device > + * at the appropriate moment. > + */ > + if (!devres_open_group(component->dev, component, GFP_KERNEL)) { > + devres_release_group(master->dev, NULL); > + return -ENOMEM; > + } > + > + dev_dbg(master->dev, "binding %s (ops %ps)\n", > + dev_name(component->dev), component->ops); > + > + ret = component->ops->bind(component->dev, master->dev, data); > + if (!ret) { > + component->bound = true; > + > + /* > + * Close the component device's group so that resources > + * allocated in the binding are encapsulated for removal > + * at unbind. Remove the group on the DRM device as we > + * can clean those resources up independently. > + */ > + devres_close_group(component->dev, NULL); > + devres_remove_group(master->dev, NULL); > + > + dev_info(master->dev, "bound %s (ops %ps)\n", > + dev_name(component->dev), component->ops); > + } else { > + devres_release_group(component->dev, NULL); > + devres_release_group(master->dev, NULL); > + > + dev_err(master->dev, "failed to bind %s (ops %ps): %d\n", > + dev_name(component->dev), component->ops, ret); > + } > + > + return ret; > +} > + > +int component_bind_all(struct device *master_dev, void *data) > +{ > + struct master *master; > + struct component *c; > + int ret = 0; > + > + WARN_ON(!mutex_is_locked(&component_mutex)); > + > + master = __master_find(master_dev, NULL); > + if (!master) > + return -EINVAL; > + > + list_for_each_entry(c, &master->components, master_node) { > + ret = component_bind(c, master, data); > + if (ret) > + break; > + } > + > + if (ret != 0) { > + list_for_each_entry_continue_reverse(c, &master->components, > + master_node) > + component_unbind(c, master, data); > + } > + > + return ret; > +} > +EXPORT_SYMBOL_GPL(component_bind_all); > + > +int component_add(struct device *dev, const struct component_ops *ops) > +{ > + struct component *component; > + int ret; > + > + component = kzalloc(sizeof(*component), GFP_KERNEL); > + if (!component) > + return -ENOMEM; > + > + component->ops = ops; > + component->dev = dev; > + > + dev_dbg(dev, "adding component (ops %ps)\n", ops); > + > + mutex_lock(&component_mutex); > + list_add_tail(&component->node, &component_list); > + > + ret = try_to_bring_up_masters(component); > + if (ret < 0) { > + list_del(&component->node); > + > + kfree(component); > + } > + mutex_unlock(&component_mutex); > + > + return ret < 0 ? ret : 0; > +} > +EXPORT_SYMBOL_GPL(component_add); > + > +void component_del(struct device *dev, const struct component_ops *ops) > +{ > + struct component *c, *component = NULL; > + > + mutex_lock(&component_mutex); > + list_for_each_entry(c, &component_list, node) > + if (c->dev == dev && c->ops == ops) { > + list_del(&c->node); > + component = c; > + break; > + } > + > + if (component && component->master) > + take_down_master(component->master); > + > + mutex_unlock(&component_mutex); > + > + WARN_ON(!component); > + kfree(component); > +} > +EXPORT_SYMBOL_GPL(component_del); > + > +MODULE_LICENSE("GPL v2"); > diff --git a/include/linux/component.h b/include/linux/component.h > new file mode 100644 > index 000000000000..73657636db0b > --- /dev/null > +++ b/include/linux/component.h > @@ -0,0 +1,31 @@ > +#ifndef COMPONENT_H > +#define COMPONENT_H > + > +struct device; > + > +struct component_ops { > + int (*bind)(struct device *, struct device *, void *); > + void (*unbind)(struct device *, struct device *, void *); > +}; > + > +int component_add(struct device *, const struct component_ops *); > +void component_del(struct device *, const struct component_ops *); > + > +int component_bind_all(struct device *, void *); > +void component_unbind_all(struct device *, void *); > + > +struct master; > + > +struct component_master_ops { > + int (*add_components)(struct device *, struct master *); > + int (*bind)(struct device *); > + void (*unbind)(struct device *); > +}; > + > +int component_master_add(struct device *, const struct component_master_ops *); > +void component_master_del(struct device *, const struct component_master_ops *); > + > +int component_master_add_child(struct master *master, > + int (*compare)(struct device *, void *), void *compare_data); > + > +#endif > -- > 1.7.4.4 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch

3 3

[alsa-devel] [PATCH] ALSA: hda - Fix leftover ifdef checks after modularization
by Takashi Iwai 07 Feb '14

07 Feb '14

Since the commit [595fe1b702c3: ALSA: hda - Make CONFIG_SND_HDA_CODEC_* tristate], the kconfig variables for the generic parser and codec drivers can be "m" instead of boolean, but some codes are left unchanged to check only #ifdef CONFIG_SND_HDA_CODEC_XXX, which is no longer true for modules. This patch fixes them by replacing with IS_ENABLED() macros. Fixes: 595fe1b702c3 ('ALSA: hda - Make CONFIG_SND_HDA_CODEC_* tristate') Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=70161 Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_codec.c | 6 +++--- sound/pci/hda/hda_intel.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index ec4536c8d8d4..69acbf758bbb 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -932,7 +932,7 @@ int snd_hda_bus_new(struct snd_card *card, } EXPORT_SYMBOL_GPL(snd_hda_bus_new); -#ifdef CONFIG_SND_HDA_GENERIC +#if IS_ENABLED(CONFIG_SND_HDA_GENERIC) #define is_generic_config(codec) \ (codec->modelname && !strcmp(codec->modelname, "generic")) #else @@ -1570,7 +1570,7 @@ int snd_hda_codec_update_widgets(struct hda_codec *codec) EXPORT_SYMBOL_GPL(snd_hda_codec_update_widgets); -#ifdef CONFIG_SND_HDA_CODEC_HDMI +#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI) /* if all audio out widgets are digital, let's assume the codec as a HDMI/DP */ static bool is_likely_hdmi_codec(struct hda_codec *codec) { @@ -1622,7 +1622,7 @@ int snd_hda_codec_configure(struct hda_codec *codec) unload_parser(codec); /* to be sure */ if (is_likely_hdmi_codec(codec)) patch = load_parser(codec, snd_hda_parse_hdmi_codec); -#ifdef CONFIG_SND_HDA_GENERIC +#if IS_ENABLED(CONFIG_SND_HDA_GENERIC) if (!patch) patch = load_parser(codec, snd_hda_parse_generic_codec); #endif diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index fa2879a21a50..e354ab1ec20f 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -198,7 +198,7 @@ MODULE_DESCRIPTION("Intel HDA driver"); #endif #if defined(CONFIG_PM) && defined(CONFIG_VGA_SWITCHEROO) -#ifdef CONFIG_SND_HDA_CODEC_HDMI +#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI) #define SUPPORT_VGA_SWITCHEROO #endif #endif -- 1.8.5.2

1 0

[alsa-devel] [PATCH] ALSA: hda - Add a headset quirk for Dell XPS 13
by David Henningsson 07 Feb '14

07 Feb '14

This quirk is needed for the headset microphone to work. Alsa-info at http://www.alsa-project.org/db/?f=8c7dfe857ceff462ca2de133e67023c0f68de9cb Cc: stable(a)vger.kernel.org (3.10+) Reported-by: Po-Hsu Lin <po-hsu.lin(a)canonical.com> Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index bee4b8c..2cb6a39 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5146,6 +5146,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { SND_PCI_QUIRK(0x1025, 0x038b, "Acer Aspire 8943G", ALC662_FIXUP_ASPIRE), SND_PCI_QUIRK(0x1028, 0x05d8, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x060a, "Dell XPS 13", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x0623, "Dell", ALC668_FIXUP_AUTO_MUTE), SND_PCI_QUIRK(0x1028, 0x0624, "Dell", ALC668_FIXUP_AUTO_MUTE), SND_PCI_QUIRK(0x1028, 0x0625, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), -- 1.7.9.5

2 1

[alsa-devel] [PATCH 1/2] ALSA: hda - Rename ASUS subwoofer quirks
by David Henningsson 07 Feb '14

07 Feb '14

Just a small refactoring to make the next patch slightly simpler. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index bee4b8c..0295efe 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -4925,9 +4925,9 @@ enum { ALC662_FIXUP_INV_DMIC, ALC668_FIXUP_DELL_MIC_NO_PRESENCE, ALC668_FIXUP_HEADSET_MODE, - ALC662_FIXUP_BASS_CHMAP, + ALC662_FIXUP_BASS_MODE4_CHMAP, ALC662_FIXUP_BASS_1A, - ALC662_FIXUP_BASS_1A_CHMAP, + ALC662_FIXUP_BASS_CHMAP, ALC668_FIXUP_AUTO_MUTE, }; @@ -5115,7 +5115,7 @@ static const struct hda_fixup alc662_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = alc_fixup_headset_mode_alc668, }, - [ALC662_FIXUP_BASS_CHMAP] = { + [ALC662_FIXUP_BASS_MODE4_CHMAP] = { .type = HDA_FIXUP_FUNC, .v.func = alc_fixup_bass_chmap, .chained = true, @@ -5127,12 +5127,12 @@ static const struct hda_fixup alc662_fixups[] = { {0x1a, 0x80106111}, /* bass speaker */ {} }, + .chained = true, + .chain_id = ALC662_FIXUP_BASS_CHMAP, }, - [ALC662_FIXUP_BASS_1A_CHMAP] = { + [ALC662_FIXUP_BASS_CHMAP] = { .type = HDA_FIXUP_FUNC, .v.func = alc_fixup_bass_chmap, - .chained = true, - .chain_id = ALC662_FIXUP_BASS_1A, }, }; @@ -5153,9 +5153,9 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x0628, "Dell", ALC668_FIXUP_AUTO_MUTE), SND_PCI_QUIRK(0x1028, 0x064e, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800), - SND_PCI_QUIRK(0x1043, 0x11cd, "Asus N550", ALC662_FIXUP_BASS_1A_CHMAP), - SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_BASS_CHMAP), - SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_BASS_CHMAP), + SND_PCI_QUIRK(0x1043, 0x11cd, "Asus N550", ALC662_FIXUP_BASS_1A), + SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_BASS_MODE4_CHMAP), + SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_BASS_MODE4_CHMAP), SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT), SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2), SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD), -- 1.7.9.5

2 2

[alsa-devel] [PATCH v2] MIDI driver for Behringer BCD2000 USB device
by Mario Kicherer 06 Feb '14

06 Feb '14

This patch adds initial support for the Behringer BCD2000 USB DJ controller. At the moment, only the MIDI part of the device is working, i.e. knobs, buttons and LEDs. I also plan to add support for the audio part, but I assume that this will require more effort than the rather simple MIDI interface. Progress can be tracked at https://github.com/anyc/snd-usb-bcd2000. Changes since v1: - fixed the various code style issues, thanks to Daniel Mack and checkpatch.pl. Signed-off-by: Mario Kicherer <dev(a)kicherer.org> --- sound/usb/Kconfig | 14 ++ sound/usb/Makefile | 2 +- sound/usb/bcd2000/Makefile | 3 + sound/usb/bcd2000/bcd2000.c | 553 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 571 insertions(+), 1 deletion(-) create mode 100644 sound/usb/bcd2000/Makefile create mode 100644 sound/usb/bcd2000/bcd2000.c diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig index de9408b..2abafea 100644 --- a/sound/usb/Kconfig +++ b/sound/usb/Kconfig @@ -146,5 +146,19 @@ config SND_USB_HIFACE To compile this driver as a module, choose M here: the module will be called snd-usb-hiface. +config SND_USB_BCD2000 + tristate "Behringer BCD2000 MIDI driver" + select SND_HWDEP + select SND_RAWMIDI + help + Say Y here to include MIDI support for the Behringer BCD2000 DJ + controller. + + Audio support is still work-in-progress at + https://github.com/anyc/snd-usb-bcd2000 + + To compile this driver as a module, choose M here: the module + will be called snd-usb-bcd2000. + endif # SND_USB diff --git a/sound/usb/Makefile b/sound/usb/Makefile index abe668f..2b92f0d 100644 --- a/sound/usb/Makefile +++ b/sound/usb/Makefile @@ -23,4 +23,4 @@ obj-$(CONFIG_SND_USB_UA101) += snd-usbmidi-lib.o obj-$(CONFIG_SND_USB_USX2Y) += snd-usbmidi-lib.o obj-$(CONFIG_SND_USB_US122L) += snd-usbmidi-lib.o -obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/ 6fire/ hiface/ +obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/ 6fire/ hiface/ bcd2000/ diff --git a/sound/usb/bcd2000/Makefile b/sound/usb/bcd2000/Makefile new file mode 100644 index 0000000..6540136 --- /dev/null +++ b/sound/usb/bcd2000/Makefile @@ -0,0 +1,3 @@ +snd-usb-bcd2000-y := bcd2000.o + +obj-$(CONFIG_SND_USB_BCD2000) += snd-usb-bcd2000.o \ No newline at end of file diff --git a/sound/usb/bcd2000/bcd2000.c b/sound/usb/bcd2000/bcd2000.c new file mode 100644 index 0000000..d8c5525 --- /dev/null +++ b/sound/usb/bcd2000/bcd2000.c @@ -0,0 +1,553 @@ +/* + * Behringer BCD2000 driver + * + * Copyright (C) 2014 Mario Kicherer (dev(a)kicherer.org) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/kernel.h> +#include <linux/errno.h> +#include <linux/init.h> +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/usb.h> +#include <linux/usb/audio.h> +#include <sound/core.h> +#include <sound/initval.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/rawmidi.h> +#include "../usbaudio.h" +#include "../midi.h" + +#define DEVICE_NAME "Behringer BCD2000" +#define DEVICE_SHORTNAME "bcd2000" + +#define PREFIX DEVICE_SHORTNAME ": " +#define BUFSIZE 64 + +static struct usb_device_id id_table[] = { + { USB_DEVICE(0x1397, 0x00bd) }, + { }, +}; + +static int debug; +module_param(debug, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "enable debug output (default: 0)"); + +static unsigned char device_cmd_prefix[] = {0x03, 0x00}; + +static unsigned char bcd2000_init_sequence[] = { + 0x07, 0x00, 0x00, 0x00, 0x78, 0x48, 0x1c, 0x81, + 0xc4, 0x00, 0x00, 0x00, 0x5e, 0x53, 0x4a, 0xf7, + 0x18, 0xfa, 0x11, 0xff, 0x6c, 0xf3, 0x90, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x18, 0xfa, 0x11, 0xff, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xf2, 0x34, 0x4a, 0xf7, + 0x18, 0xfa, 0x11, 0xff}; + +struct bcd2000 { + struct usb_device *dev; + struct snd_card *card; + struct usb_interface *intf; + int card_index; + struct snd_pcm *pcm; + struct list_head midi_list; + spinlock_t lock; + struct mutex mutex; + + int midi_out_active; + struct snd_rawmidi *rmidi; + struct snd_rawmidi_substream *midi_receive_substream; + struct snd_rawmidi_substream *midi_out_substream; + + unsigned char midi_in_buf[BUFSIZE]; + unsigned char midi_out_buf[BUFSIZE]; + + unsigned char midi_cmd_buf[3]; + unsigned char midi_cmd_offset; + + struct urb *midi_out_urb; + struct urb *midi_in_urb; +}; + +static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; +static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; +static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; + +static DEFINE_MUTEX(devices_mutex); +static unsigned int devices_used; +static struct usb_driver bcd2000_driver; + + + + + + +static int bcd2000_midi_input_open(struct snd_rawmidi_substream *substream) +{ + return 0; +} + +static int bcd2000_midi_input_close(struct snd_rawmidi_substream *substream) +{ + return 0; +} + +static void bcd2000_midi_input_trigger(struct snd_rawmidi_substream *substream, + int up) +{ + struct bcd2000 *bcd2k = substream->rmidi->private_data; + + if (!bcd2k) + return; + + bcd2k->midi_receive_substream = up ? substream : NULL; +} + +static void bcd2000_midi_handle_input(struct bcd2000 *bcd2k, + const unsigned char *buf, int len) +{ + unsigned char length, cmd, buf_offset, tocopy; + + if (!bcd2k->midi_receive_substream) + return; + + if (debug) { + print_hex_dump(KERN_DEBUG, "received from device: ", + DUMP_PREFIX_NONE, 16, 1, buf, len, false); + } + + if (len < 2) + return; + + /* + * The BCD2000 sends MIDI commands with 2 or 3 bytes length. In case of + * 2 bytes, the command is the same as before. + * + * Packet structure: mm nn oo (pp) + * mm: payload length + * nn: MIDI command or note + * oo: note or velocity + * pp: velocity + */ + + length = buf[0]; + + /* ignore packets without payload */ + if (length == 0) + return; + + /* + * The MIDI packets the BCD2000 sends can be arbitrarily truncated or + * concatenated. Therefore, this loop accumulates the bytes from the + * input buffer until a full valid MIDI packet is in the MIDI command + * buffer "midi_cmd_buf". + */ + + buf_offset = 1; + while (buf_offset <= length) { + cmd = buf[buf_offset]; + + if (bcd2k->midi_cmd_offset == 0 && cmd != 0x90 && cmd != 0xb0) { + /* + * this is a 2-byte midi packet -> reuse command byte + * from last midi packet + */ + bcd2k->midi_cmd_offset = 1; + } + + /* determine the number of bytes we want to copy this time */ + tocopy = min(3 - bcd2k->midi_cmd_offset, + length - (buf_offset - 1)); + + /* safety check */ + if (bcd2k->midi_cmd_offset + tocopy < BUFSIZE && + buf_offset + tocopy < len) { + memcpy(&bcd2k->midi_cmd_buf[bcd2k->midi_cmd_offset], + &buf[buf_offset], tocopy); + } else { + snd_printk(KERN_ERR PREFIX "access violation in %s\n", + __func__); + } + + bcd2k->midi_cmd_offset += tocopy; + buf_offset += tocopy; + + /* is our MIDI packet complete? */ + if (bcd2k->midi_cmd_offset == 3) { + if (debug) { + print_hex_dump(KERN_DEBUG, + "sending to userspace: ", + DUMP_PREFIX_NONE, 16, 1, + bcd2k->midi_cmd_buf, + bcd2k->midi_cmd_offset, false); + } + + /* send MIDI packet */ + snd_rawmidi_receive(bcd2k->midi_receive_substream, + bcd2k->midi_cmd_buf, 3); + + bcd2k->midi_cmd_offset = 0; + } + } +} + +static int bcd2000_midi_output_open(struct snd_rawmidi_substream *substream) +{ + return 0; +} + +static int bcd2000_midi_output_close(struct snd_rawmidi_substream *substream) +{ + struct bcd2000 *bcd2k = substream->rmidi->private_data; + if (bcd2k->midi_out_active) { + usb_free_urb(bcd2k->midi_out_urb); + bcd2k->midi_out_active = 0; + } + return 0; +} + +static void bcd2000_midi_send(struct bcd2000 *bcd2k, + struct snd_rawmidi_substream *substream) +{ + int len, ret; + + BUILD_BUG_ON(sizeof(device_cmd_prefix) >= BUFSIZE); + /* copy the "set LED" command bytes */ + memcpy(bcd2k->midi_out_buf, device_cmd_prefix, + sizeof(device_cmd_prefix)); + + /* + * get MIDI packet and leave space for command prefix + * and payload length + */ + len = snd_rawmidi_transmit(substream, + bcd2k->midi_out_buf + 3, BUFSIZE - 3); + + if (len <= 0) + return; + + /* set payload length */ + bcd2k->midi_out_buf[2] = len; + bcd2k->midi_out_urb->transfer_buffer_length = BUFSIZE; + + if (debug) { + print_hex_dump(KERN_DEBUG, "sending to device: ", + DUMP_PREFIX_NONE, 16, 1, + bcd2k->midi_out_buf, len+3, false); + } + + /* send packet to the BCD2000 */ + ret = usb_submit_urb(bcd2k->midi_out_urb, GFP_ATOMIC); + if (ret < 0) { + dev_err(&bcd2k->dev->dev, PREFIX + "%s (%p): usb_submit_urb() failed" + "ret=%d, len=%d\n", __func__, substream, ret, len); + } else { + bcd2k->midi_out_active = 1; + } +} + +static void bcd2000_midi_output_done(struct urb *urb) +{ + struct bcd2000 *bcd2k = urb->context; + + bcd2k->midi_out_active = 0; + if (urb->status != 0) { + dev_err(&urb->dev->dev, PREFIX "urb status: %d\n", urb->status); + return; + } + + if (!bcd2k->midi_out_substream) + return; + + bcd2000_midi_send(bcd2k, bcd2k->midi_out_substream); +} + +static void bcd2000_command_reply_dispatch(struct urb *urb) +{ + int ret; + struct device *dev = &urb->dev->dev; + struct bcd2000 *bcd2k = urb->context; + + if (urb->status || !bcd2k) { + dev_warn(dev, "received urb->status = %i\n", urb->status); + return; + } + + if (urb->actual_length > 0) + bcd2000_midi_handle_input(bcd2k, urb->transfer_buffer, + urb->actual_length); + + bcd2k->midi_in_urb->actual_length = 0; + ret = usb_submit_urb(bcd2k->midi_in_urb, GFP_ATOMIC); + if (ret < 0) + dev_err(dev, "unable to submit urb. OOM!?\n"); +} + +static void bcd2000_midi_output_trigger(struct snd_rawmidi_substream *substream, + int up) +{ + struct bcd2000 *bcd2k = substream->rmidi->private_data; + + if (up) { + bcd2k->midi_out_substream = substream; + if (!bcd2k->midi_out_active) + bcd2000_midi_send(bcd2k, substream); + } else { + bcd2k->midi_out_substream = NULL; + } +} + +static struct snd_rawmidi_ops bcd2000_midi_output = { + .open = bcd2000_midi_output_open, + .close = bcd2000_midi_output_close, + .trigger = bcd2000_midi_output_trigger, +}; + +static struct snd_rawmidi_ops bcd2000_midi_input = { + .open = bcd2000_midi_input_open, + .close = bcd2000_midi_input_close, + .trigger = bcd2000_midi_input_trigger, +}; + +static void bcd2000_init_device(struct bcd2000 *bcd2k) +{ + int ret; + + /* copy init sequence into buffer */ + memcpy(bcd2k->midi_out_buf, bcd2000_init_sequence, 52); + bcd2k->midi_out_urb->transfer_buffer_length = 52; + + /* submit sequence */ + ret = usb_submit_urb(bcd2k->midi_out_urb, GFP_ATOMIC); + if (ret < 0) { + dev_err(&bcd2k->dev->dev, PREFIX + "%s: usb_submit_urb() failed," + "ret=%d: ", __func__, ret); + } else { + bcd2k->midi_out_active = 1; + } + + /* send empty packet to enable button and controller events */ + bcd2k->midi_in_urb->actual_length = 0; + ret = usb_submit_urb(bcd2k->midi_in_urb, GFP_ATOMIC); +} + +static void bcd2000_init_midi(struct bcd2000 *bcd2k) +{ + int ret; + struct snd_rawmidi *rmidi; + + ret = snd_rawmidi_new(bcd2k->card, bcd2k->card->shortname, 0, + 1, /* output */ + 1, /* input */ + &rmidi); + + if (ret < 0) + return; + + strlcpy(rmidi->name, bcd2k->card->shortname, sizeof(rmidi->name)); + + rmidi->info_flags = SNDRV_RAWMIDI_INFO_DUPLEX; + rmidi->private_data = bcd2k; + + rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT; + snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, + &bcd2000_midi_output); + + rmidi->info_flags |= SNDRV_RAWMIDI_INFO_INPUT; + snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, + &bcd2000_midi_input); + + bcd2k->rmidi = rmidi; + + bcd2k->midi_in_urb = usb_alloc_urb(0, GFP_KERNEL); + bcd2k->midi_out_urb = usb_alloc_urb(0, GFP_KERNEL); + + usb_fill_int_urb(bcd2k->midi_in_urb, bcd2k->dev, + usb_rcvbulkpipe(bcd2k->dev, 0x81), + bcd2k->midi_in_buf, BUFSIZE, + bcd2000_command_reply_dispatch, bcd2k, 1); + + usb_fill_int_urb(bcd2k->midi_out_urb, bcd2k->dev, + usb_sndbulkpipe(bcd2k->dev, 0x1), + bcd2k->midi_out_buf, BUFSIZE, + bcd2000_midi_output_done, bcd2k, 1); + + bcd2000_init_device(bcd2k); +} + +static void bcd2000_close_midi(struct bcd2000 *bcd2k) +{ + usb_free_urb(bcd2k->midi_out_urb); + usb_free_urb(bcd2k->midi_in_urb); +} + + + + + +/* + * general part + */ + +static void bcd2000_free_usb_related_resources(struct bcd2000 *bcd2k, + struct usb_interface *interface) +{ + struct usb_interface *intf; + + mutex_lock(&bcd2k->mutex); + intf = bcd2k->intf; + bcd2k->intf = NULL; + mutex_unlock(&bcd2k->mutex); + if (intf) { + usb_set_intfdata(intf, NULL); + if (intf != interface) + usb_driver_release_interface(&bcd2000_driver, + intf); + } +} + +static void bcd2000_card_free(struct snd_card *card) +{ + /* empty for now */ +} + +static int bcd2000_probe(struct usb_interface *interface, + const struct usb_device_id *usb_id) +{ + struct snd_card *card; + struct bcd2000 *bcd2k; + unsigned int card_index; + char usb_path[32]; + int err; + + + mutex_lock(&devices_mutex); + + for (card_index = 0; card_index < SNDRV_CARDS; ++card_index) + if (enable[card_index] && !(devices_used & (1 << card_index))) + break; + if (card_index >= SNDRV_CARDS) { + mutex_unlock(&devices_mutex); + return -ENOENT; + } + err = snd_card_create(index[card_index], id[card_index], THIS_MODULE, + sizeof(*bcd2k), &card); + if (err < 0) { + mutex_unlock(&devices_mutex); + return err; + } + card->private_free = bcd2000_card_free; + bcd2k = card->private_data; + bcd2k->dev = interface_to_usbdev(interface); + bcd2k->card = card; + bcd2k->card_index = card_index; + INIT_LIST_HEAD(&bcd2k->midi_list); + spin_lock_init(&bcd2k->lock); + mutex_init(&bcd2k->mutex); + + bcd2k->intf = interface; + + snd_card_set_dev(card, &interface->dev); + + strcpy(card->driver, DEVICE_NAME); + strcpy(card->shortname, DEVICE_SHORTNAME); + usb_make_path(bcd2k->dev, usb_path, sizeof(usb_path)); + snprintf(bcd2k->card->longname, sizeof(bcd2k->card->longname), + DEVICE_NAME ", at %s, %s speed", + usb_path, + bcd2k->dev->speed == USB_SPEED_HIGH ? "high" : "full"); + + dev_info(&bcd2k->dev->dev, PREFIX "%s", bcd2k->card->longname); + + + + bcd2000_init_midi(bcd2k); + + + err = snd_card_register(card); + if (err < 0) + goto probe_error; + + usb_set_intfdata(interface, bcd2k); + devices_used |= 1 << card_index; + + mutex_unlock(&devices_mutex); + return 0; + +probe_error: + bcd2000_free_usb_related_resources(bcd2k, interface); + snd_card_free(card); + mutex_unlock(&devices_mutex); + return err; +} + +static void bcd2000_disconnect(struct usb_interface *interface) +{ + struct bcd2000 *bcd2k = usb_get_intfdata(interface); + struct list_head *midi; + + if (!bcd2k) + return; + + bcd2000_close_midi(bcd2k); + + mutex_lock(&devices_mutex); + + /* make sure that userspace cannot create new requests */ + snd_card_disconnect(bcd2k->card); + + /* make sure that there are no pending USB requests */ + list_for_each(midi, &bcd2k->midi_list) + snd_usbmidi_disconnect(midi); + + bcd2000_free_usb_related_resources(bcd2k, interface); + + devices_used &= ~(1 << bcd2k->card_index); + + snd_card_free_when_closed(bcd2k->card); + + mutex_unlock(&devices_mutex); +} + +static struct usb_driver bcd2000_driver = { + .name = DEVICE_SHORTNAME, + .probe = bcd2000_probe, + .disconnect = bcd2000_disconnect, + .id_table = id_table, +}; + +static int __init bcd2000_init(void) +{ + int retval = 0; + + retval = usb_register(&bcd2000_driver); + if (retval) + snd_printk(KERN_INFO "usb_register failed. Error: %d", retval); + return retval; +} + +static void __exit bcd2000_exit(void) +{ + usb_deregister(&bcd2000_driver); +} + +module_init(bcd2000_init); +module_exit(bcd2000_exit); + +MODULE_DEVICE_TABLE(usb, id_table); +MODULE_AUTHOR("Mario Kicherer, dev(a)kicherer.org"); +MODULE_DESCRIPTION("Behringer BCD2000 driver"); +MODULE_LICENSE("GPL"); -- 1.8.3.2

4 7

[alsa-devel] [PATCH] ASoC: pcm512x: More constification
by Mark Brown 06 Feb '14

06 Feb '14

From: Mark Brown <broonie(a)linaro.org> Since the core now takes const strings for enums we should be constifying them (and the regulator supplies while we're at it). Reported-by: Lars-Peter Clausen <lars(a)metafoo.de> Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/pcm512x.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index 5ad3e9aa3cb4..1150381fc373 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -30,7 +30,7 @@ #include "pcm512x.h" #define PCM512x_NUM_SUPPLIES 3 -static const char *pcm512x_supply_names[PCM512x_NUM_SUPPLIES] = { +static const char * const pcm512x_supply_names[PCM512x_NUM_SUPPLIES] = { "AVDD", "DVDD", "CPVDD", @@ -167,7 +167,7 @@ static bool pcm512x_volatile(struct device *dev, unsigned int reg) static const DECLARE_TLV_DB_SCALE(digital_tlv, -10350, 50, 1); -static const char *pcm512x_dsp_program_texts[] = { +static const char * const pcm512x_dsp_program_texts[] = { "FIR interpolation with de-emphasis", "Low latency IIR with de-emphasis", "Fixed process flow", @@ -188,14 +188,14 @@ static const SOC_VALUE_ENUM_SINGLE_DECL(pcm512x_dsp_program, pcm512x_dsp_program_texts, pcm512x_dsp_program_values); -static const char *pcm512x_clk_missing_text[] = { +static const char * const pcm512x_clk_missing_text[] = { "1s", "2s", "3s", "4s", "5s", "6s", "7s", "8s" }; static const struct soc_enum pcm512x_clk_missing = SOC_ENUM_SINGLE(PCM512x_CLKDET, 0, 8, pcm512x_clk_missing_text); -static const char *pcm512x_autom_text[] = { +static const char * const pcm512x_autom_text[] = { "21ms", "106ms", "213ms", "533ms", "1.07s", "2.13s", "5.33s", "10.66s" }; @@ -207,7 +207,7 @@ static const struct soc_enum pcm512x_autom_r = SOC_ENUM_SINGLE(PCM512x_AUTO_MUTE, PCM512x_ATMR_SHIFT, 8, pcm512x_autom_text); -static const char *pcm512x_ramp_rate_text[] = { +static const char * const pcm512x_ramp_rate_text[] = { "1 sample/update", "2 samples/update", "4 samples/update", "Immediate" }; @@ -224,7 +224,7 @@ static const struct soc_enum pcm512x_vedf = SOC_ENUM_SINGLE(PCM512x_DIGITAL_MUTE_2, PCM512x_VEDF_SHIFT, 4, pcm512x_ramp_rate_text); -static const char *pcm512x_ramp_step_text[] = { +static const char * const pcm512x_ramp_step_text[] = { "4dB/step", "2dB/step", "1dB/step", "0.5dB/step" }; -- 1.9.rc1

1 0

[alsa-devel] [PATCH 0/8] da9055: Driver initialisation fixes, add DT support
by Adam Thomson 06 Feb '14

06 Feb '14

This patch series provides the following updates for DA9055 drivers: - Fixes an issue with da9055 driver initialisation (conflicting device ids) of PMIC (MFD) and CODEC drivers. - Add initial DT support for DA9055 related drivers, including binding documentation. - Remove conflicting use of platform_get_irq_byname() in driver probes. - Remove unnecessary resource structures for MFD cells as a result of removing use of platform_get_irq_byname(). Adam Thomson (8): ASoC: da9055: Fix device registration of PMIC and CODEC devices ASoC: da9055: Add DT support for CODEC mfd: da9055: Add DT support for PMIC regulator: da9055: Add DT support onkey: da9055: Remove use of platform_get_irq_byname() hwmon: da9055: Remove use of platform_get_irq_byname() rtc: da9055: Remove use of platform_get_irq_byname() mfd: da9055: Remove unused resource structures for mfd cells. Documentation/devicetree/bindings/mfd/da9055.txt | 73 ++++++++++++++++++++ Documentation/devicetree/bindings/sound/da9055.txt | 22 ++++++ drivers/hwmon/da9055-hwmon.c | 7 +-- drivers/input/misc/da9055_onkey.c | 9 +-- drivers/mfd/da9055-core.c | 46 ------------ drivers/mfd/da9055-i2c.c | 20 +++++- drivers/regulator/da9055-regulator.c | 59 ++++++++++++++-- drivers/rtc/rtc-da9055.c | 3 +- sound/soc/codecs/da9055.c | 19 +++++- 9 files changed, 188 insertions(+), 70 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/da9055.txt create mode 100644 Documentation/devicetree/bindings/sound/da9055.txt

4 18