March 2013 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: tegra: fix I2S bit count mask
by Stephen Warren 04 Mar '13

04 Mar '13

From: Stephen Warren <swarren(a)nvidia.com> This register field is 11 bits wide, not 15 bits wide. Given the way this value is currently, used, this patch has no practical effect. However, it's still best if the value is correct. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- sound/soc/tegra/tegra30_i2s.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/tegra/tegra30_i2s.h b/sound/soc/tegra/tegra30_i2s.h index 34dc47b..a294d94 100644 --- a/sound/soc/tegra/tegra30_i2s.h +++ b/sound/soc/tegra/tegra30_i2s.h @@ -110,7 +110,7 @@ #define TEGRA30_I2S_TIMING_NON_SYM_ENABLE (1 << 12) #define TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT 0 -#define TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US 0x7fff +#define TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US 0x7ff #define TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_MASK (TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US << TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT) /* Fields in TEGRA30_I2S_OFFSET */ -- 1.7.10.4

1 0

[alsa-devel] [PATCH] hdajackretask: Some more UI fixes
by David Henningsson 04 Mar '13

04 Mar '13

- don't overwrite a set advanced override unless necessary - fix "not present" never selected - remove some trailing whitespaces Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- hdajackretask/main-gtk.c | 116 ++++++++++++++++++++++--------------- hdajackretask/sysfs-pin-configs.c | 4 +- 2 files changed, 71 insertions(+), 49 deletions(-) diff --git a/hdajackretask/main-gtk.c b/hdajackretask/main-gtk.c index 4227669..9101af4 100644 --- a/hdajackretask/main-gtk.c +++ b/hdajackretask/main-gtk.c @@ -5,19 +5,22 @@ #include <string.h> #include <stdlib.h> #include <gtk/gtk.h> +#include <stdbool.h> #include "sysfs-pin-configs.h" #include "apply-changes.h" +typedef struct ui_data_t ui_data_t; + typedef struct pin_ui_data_t { pin_configs_t* pin_config; typical_pins_t pins_info[32]; GtkWidget *frame, *override, *jacktype; - GtkWidget* free_override_cb[FREE_OVERRIDES_COUNT]; + ui_data_t* owner; } pin_ui_data_t; -typedef struct ui_data_t { +struct ui_data_t { GList* pin_ui_data; GtkWidget *main_window; GtkWidget *content_scroll_widget; @@ -25,22 +28,35 @@ typedef struct ui_data_t { GtkWidget *codec_selection_combo; codec_name_t* current_codec; - int sysfs_pincount; + int sysfs_pincount; codec_name_t sysfs_codec_names[128]; pin_configs_t sysfs_pins[32]; gboolean free_overrides; gboolean trust_codec; gboolean trust_defcfg; gboolean model_auto; -} ui_data_t; +}; -static void override_toggled(GtkWidget* sender, pin_ui_data_t* data) +static void update_user_pin_config(ui_data_t* ui, pin_configs_t* cfg); + +static void update_override_sensitive(GtkWidget* sender, pin_ui_data_t* data) { int i; gboolean checked = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sender)); gtk_widget_set_sensitive(data->jacktype, checked); for (i = 0; i < FREE_OVERRIDES_COUNT; i++) - gtk_widget_set_sensitive(data->free_override_cb[i], checked); + gtk_widget_set_sensitive(data->free_override_cb[i], checked); +} + +static void override_toggled(GtkWidget* sender, pin_ui_data_t* data) +{ + update_override_sensitive(sender, data); + update_user_pin_config(data->owner, data->pin_config); +} + +static void jacktype_changed(GtkWidget* sender, pin_ui_data_t* data) +{ + update_user_pin_config(data->owner, data->pin_config); } static GtkWidget* create_pin_ui(ui_data_t* ui, pin_configs_t* pin_cfg) @@ -56,7 +72,8 @@ static GtkWidget* create_pin_ui(ui_data_t* ui, pin_configs_t* pin_cfg) data = calloc(1, sizeof(pin_ui_data_t)); data->pin_config = pin_cfg; - + data->owner = ui; + { /* Frame */ gchar* d = get_config_description(pin_cfg->init_pin_config); gchar* c = g_strdup_printf("Pin ID: 0x%02x", pin_cfg->nid); @@ -93,6 +110,7 @@ static GtkWidget* create_pin_ui(ui_data_t* ui, pin_configs_t* pin_cfg) gtk_combo_box_set_active(GTK_COMBO_BOX(jacktype), index); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(override), pin_cfg->user_override); g_signal_connect(override, "toggled", G_CALLBACK(override_toggled), data); + g_signal_connect(jacktype, "changed", G_CALLBACK(jacktype_changed), data); gtk_container_add(box, override); gtk_container_add(GTK_CONTAINER(jacktype_box), jacktype); @@ -125,6 +143,7 @@ static GtkWidget* create_pin_ui(ui_data_t* ui, pin_configs_t* pin_cfg) } if (index >= 0) gtk_combo_box_set_active(GTK_COMBO_BOX(data->free_override_cb[i]), index); + g_signal_connect(data->free_override_cb[i], "changed", G_CALLBACK(jacktype_changed), data); } gtk_grid_attach(grid, gtk_label_new("Connectivity"), 0, 0, 1, 1); @@ -148,7 +167,7 @@ static GtkWidget* create_pin_ui(ui_data_t* ui, pin_configs_t* pin_cfg) if (ui->free_overrides) gtk_container_add(box, GTK_WIDGET(grid)); } - override_toggled(data->override, data); + update_override_sensitive(data->override, data); gtk_container_add(GTK_CONTAINER(result), GTK_WIDGET(box)); ui->pin_ui_data = g_list_prepend(ui->pin_ui_data, data); @@ -166,45 +185,48 @@ static void free_pin_ui_data(pin_ui_data_t* data) static gint pin_config_find(pin_ui_data_t* pin_ui, pin_configs_t* cfg) { - return pin_ui->pin_config == cfg ? 0 : 1; + return pin_ui->pin_config == cfg ? 0 : 1; } -static void update_user_pin_config(ui_data_t* ui) +static void update_user_pin_config(ui_data_t* ui, pin_configs_t* cfg) { - int i; - for (i = 0; i < ui->sysfs_pincount; i++) { - pin_ui_data_t* pin_ui; - GList *pos = g_list_find_custom(ui->pin_ui_data, &ui->sysfs_pins[i], (GCompareFunc) pin_config_find); - ui->sysfs_pins[i].user_override = FALSE; - if (!pos) - continue; - pin_ui = pos->data; - if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pin_ui->override))) - continue; + pin_ui_data_t* pin_ui; + GList *pos = g_list_find_custom(ui->pin_ui_data, cfg, (GCompareFunc) pin_config_find); + cfg->user_override = FALSE; + if (!pos) + return; + pin_ui = pos->data; + if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pin_ui->override))) + return; - if (ui->free_overrides) { - int j; - int index; - unsigned long val = 0; - for (j = 0; j < FREE_OVERRIDES_COUNT; j++) { - index = gtk_combo_box_get_active(GTK_COMBO_BOX(pin_ui->free_override_cb[j])); - if (index < 0) - break; - val += get_free_override_list(j)[index].value; - } + if (ui->free_overrides) { + int j; + int index; + unsigned long val = 0; + for (j = 0; j < FREE_OVERRIDES_COUNT; j++) { + index = gtk_combo_box_get_active(GTK_COMBO_BOX(pin_ui->free_override_cb[j])); if (index < 0) - continue; - ui->sysfs_pins[i].user_pin_config = val; - } else { - int index; - index = gtk_combo_box_get_active(GTK_COMBO_BOX(pin_ui->jacktype)); - if (index < 0) - continue; - ui->sysfs_pins[i].user_pin_config = pin_ui->pins_info[index].pin_set; + break; + val += get_free_override_list(j)[index].value; } - ui->sysfs_pins[i].user_override = TRUE; + if (index < 0) + return; + cfg->user_pin_config = val; + } else { + int index; + index = gtk_combo_box_get_active(GTK_COMBO_BOX(pin_ui->jacktype)); + if (index < 0) + return; + cfg->user_pin_config = pin_ui->pins_info[index].pin_set; } + cfg->user_override = TRUE; +} +static void update_all_user_pin_config(ui_data_t* ui) +{ + int i; + for (i = 0; i < ui->sysfs_pincount; i++) + update_user_pin_config(ui, &ui->sysfs_pins[i]); } static gboolean validate_user_pin_config(ui_data_t* ui, GError** err) @@ -215,7 +237,7 @@ static gboolean validate_user_pin_config(ui_data_t* ui, GError** err) g_set_error(err, 0, 0, "You must first select a codec!"); return FALSE; } - update_user_pin_config(ui); + update_all_user_pin_config(ui); if (ui->free_overrides) return TRUE; @@ -325,7 +347,7 @@ static void resize_main_window(ui_data_t* ui) } } -static void update_codec_ui(ui_data_t* ui) +static void update_codec_ui(ui_data_t* ui, bool codec_change) { int codec_index = gtk_combo_box_get_active(GTK_COMBO_BOX(ui->codec_selection_combo)); int i; @@ -337,7 +359,8 @@ static void update_codec_ui(ui_data_t* ui) if (codec_index < 0) return; ui->current_codec = &ui->sysfs_codec_names[codec_index]; - ui->sysfs_pincount = get_pin_configs_list(ui->sysfs_pins, 32, ui->current_codec->card, ui->current_codec->device); + if (codec_change) + ui->sysfs_pincount = get_pin_configs_list(ui->sysfs_pins, 32, ui->current_codec->card, ui->current_codec->device); for (i = 0; i < ui->sysfs_pincount; i++) { GtkWidget *w = create_pin_ui(ui, &ui->sysfs_pins[i]); if (w) @@ -350,14 +373,14 @@ static void update_codec_ui(ui_data_t* ui) static void codec_selected(GtkComboBox* combo, gpointer user_data) { - update_codec_ui(user_data); + update_codec_ui(user_data, true); } static void showallpins_toggled(GtkWidget* sender, ui_data_t* ui_data) { gboolean checked = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sender)); ui_data->trust_defcfg = !checked; - update_codec_ui(ui_data); + update_codec_ui(ui_data, false); } static void automodel_toggled(GtkWidget* sender, ui_data_t* ui_data) @@ -367,9 +390,8 @@ static void automodel_toggled(GtkWidget* sender, ui_data_t* ui_data) static void free_override_toggled(GtkWidget* sender, ui_data_t* ui_data) { - update_user_pin_config(ui_data); ui_data->free_overrides = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sender)); - update_codec_ui(ui_data); + update_codec_ui(ui_data, false); } static const char* readme_text = @@ -517,7 +539,7 @@ int main(int argc, char *argv[]) ui = create_ui(); gtk_widget_show_all(ui->main_window); if (ui->codec_selection_combo) - update_codec_ui(ui); + update_codec_ui(ui, true); gtk_main(); return 0; } diff --git a/hdajackretask/sysfs-pin-configs.c b/hdajackretask/sysfs-pin-configs.c index cd2897e..4044989 100644 --- a/hdajackretask/sysfs-pin-configs.c +++ b/hdajackretask/sysfs-pin-configs.c @@ -460,7 +460,7 @@ static free_override_t channel_arr[] = { static free_override_t* type_order[FREE_OVERRIDES_COUNT] = { - pc_arr, location_arr, device_arr, jack_arr, + pc_arr, location_arr, device_arr, jack_arr, color_arr, no_presence_arr, group_nr_arr, channel_arr }; @@ -472,7 +472,7 @@ unsigned long get_free_override_mask(int type) AC_DEFCFG_DEVICE, AC_DEFCFG_CONN_TYPE, AC_DEFCFG_COLOR, - AC_DEFCFG_MISC & 1, + AC_DEFCFG_MISC & (AC_DEFCFG_MISC_NO_PRESENCE << AC_DEFCFG_MISC_SHIFT), AC_DEFCFG_DEF_ASSOC, AC_DEFCFG_SEQUENCE, }; -- 1.7.9.5

2 1

[alsa-devel] [patch] [ALSA] seq_oss_event: missing range checks
by Dan Carpenter 04 Mar '13

04 Mar '13

The "dev" variable could be out of bounds. Calling snd_seq_oss_synth_is_valid() checks that it is is a valid device which has been opened. We check this inside set_note_event() so this function can't succeed without a valid "dev". But we need to do the check earlier to prevent invalid dereferences and memory corruption. One call tree where "dev" could be out of bounds is: -> snd_seq_oss_oob_user() -> snd_seq_oss_process_event() -> extended_event() -> note_on_event() Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/core/seq/oss/seq_oss_event.c b/sound/core/seq/oss/seq_oss_event.c index 066f5f3..c390886 100644 --- a/sound/core/seq/oss/seq_oss_event.c +++ b/sound/core/seq/oss/seq_oss_event.c @@ -285,7 +285,12 @@ local_event(struct seq_oss_devinfo *dp, union evrec *q, struct snd_seq_event *ev static int note_on_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, struct snd_seq_event *ev) { - struct seq_oss_synthinfo *info = &dp->synths[dev]; + struct seq_oss_synthinfo *info; + + if (!snd_seq_oss_synth_is_valid(dp, dev)) + return -ENXIO; + + info = &dp->synths[dev]; switch (info->arg.event_passing) { case SNDRV_SEQ_OSS_PROCESS_EVENTS: if (! info->ch || ch < 0 || ch >= info->nr_voices) { @@ -340,7 +345,12 @@ note_on_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, st static int note_off_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, struct snd_seq_event *ev) { - struct seq_oss_synthinfo *info = &dp->synths[dev]; + struct seq_oss_synthinfo *info; + + if (!snd_seq_oss_synth_is_valid(dp, dev)) + return -ENXIO; + + info = &dp->synths[dev]; switch (info->arg.event_passing) { case SNDRV_SEQ_OSS_PROCESS_EVENTS: if (! info->ch || ch < 0 || ch >= info->nr_voices) {

2 1

[alsa-devel] [PATCH v4 1/2] ALSA: ASoC: davinci-mcasp: don't configure AFSX direction in DIT mode
by yegorslists＠googlemail.com 04 Mar '13

04 Mar '13

From: Yegor Yefremov <yegorslists(a)googlemail.com> AFSX won't be used in DIT mode. The related pins are AHCLKX and the data pins. Signed-off-by: Yegor Yefremov <yegorslists(a)googlemail.com> Acked-by: Vaibhav Bedia <vaibhav.bedia(a)ti.com> --- v4: change subjuct to include "ALSA: ASoC: " sound/soc/davinci/davinci-mcasp.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 9321e5c..90a9b99 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -772,9 +772,6 @@ static void davinci_hw_param(struct davinci_audio_dev *dev, int stream) /* S/PDIF */ static void davinci_hw_dit_param(struct davinci_audio_dev *dev) { - /* Set the PDIR for Serialiser as output */ - mcasp_set_bits(dev->base + DAVINCI_MCASP_PDIR_REG, AFSX); - /* TXMASK for 24 bits */ mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, 0x00FFFFFF); -- 1.7.7

3 5

[alsa-devel] [PATCH v3] davinci-mcasp: don't overwrite DIT settings
by yegorslists＠googlemail.com 04 Mar '13

04 Mar '13

From: Yegor Yefremov <yegorslists(a)googlemail.com> Channel size settings will be made at the end of davinci_mcasp_hw_params() routine and thus overwrite frame format settings made for DIT mode. This patch fixes this issue by taking op_mode into account. Tested with official PSP 3.2 kernel and sii9022a HDMI transmitter. Signed-off-by: Yegor Yefremov <yegorslists(a)googlemail.com> --- v3: don't set mask in davinci_hw_dit_param() v2: fix checkpatch.pl warnings sound/soc/davinci/davinci-mcasp.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 90a9b99..dcd56f2 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -643,16 +643,20 @@ static int davinci_config_channel_size(struct davinci_audio_dev *dev, /* mapping of the XSSZ bit-field as described in the datasheet */ fmt = (word_length >> 1) - 1; - mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, - RXSSZ(fmt), RXSSZ(0x0F)); - mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, - TXSSZ(fmt), TXSSZ(0x0F)); - mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, TXROT(rotate), - TXROT(7)); - mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, RXROT(rotate), - RXROT(7)); + if (dev->op_mode != DAVINCI_MCASP_DIT_MODE) { + mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, + RXSSZ(fmt), RXSSZ(0x0F)); + mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, + TXSSZ(fmt), TXSSZ(0x0F)); + mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, + TXROT(rotate), TXROT(7)); + mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, + RXROT(rotate), RXROT(7)); + mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG, + mask); + } + mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, mask); - mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG, mask); return 0; } @@ -772,9 +776,6 @@ static void davinci_hw_param(struct davinci_audio_dev *dev, int stream) /* S/PDIF */ static void davinci_hw_dit_param(struct davinci_audio_dev *dev) { - /* TXMASK for 24 bits */ - mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, 0x00FFFFFF); - /* Set the TX format : 24 bit right rotation, 32 bit slot, Pad 0 and LSB first */ mcasp_set_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, -- 1.7.7

3 3

[alsa-devel] Issue with Dmix
by mateen 04 Mar '13

04 Mar '13

HI We have enabled DMIX plugin for sample rate conversion and mixing of 2 pcm streams in our alsa package (Alsa lib 1.0.22 and alsa driver 1.0.22.1) to 48K output Sample rate.However we are seeing a noise issue with 44100 Sample rate input streams or Unsigned Stereo 48K stream. This is how our current design is: We call snd_pcm_lib_malloc_page() in which alsa driver internally allocates a dma buffer and map it when Dmix is invoked. We currently reads from that mmaped buffer to our hardware buffer inside a transfer_ack_begin() function which is called from snd_pcm_period_elapsed(). However we are getting a problem in understanding how do we know how much data has been written by dmix lib in mapped buffer? As we see no ioctl or corresponding hardware function call where dmix may pass information on Size of data being written to our driver. We do see appl_ptr and hw_ptr in runtime->mmap->control and status struct. Out architecture doesn’t support defining and mapping of these status and control structure at hardware level.Thus Dmix lib allocates them and copy them to runtime substream via ioctl. As far as I could understand both appl_ptr and hw_ptr are initialised to 0 and then appl_ptr is the one adjusted by lib after every write. Should we tap this value to update hw_ptr value in status information? Will difference of hw_ptr and appl_ptr will let us know amount of frames been written? Can anyone please help us to understand criteria and concept of data copy from intermediate to hardware buffer? Any information on this would be of immense help. Regards, Shaikh Mateen

1 1

[alsa-devel] [PATCH] davinci-mcasp: don't overwrite DIT settings
by yegorslists＠googlemail.com 04 Mar '13

04 Mar '13

From: Yegor Yefremov <yegorslists(a)googlemail.com> Channel size settings will be made at the end of davinci_mcasp_hw_params() routine and thus overwrite frame format settings made for DIT mode. This patch fixes this issue by taking op_mode into account. Tested with official PSP 3.2 kernel and sii9022a HDMI transmitter. Signed-off-by: Yegor Yefremov <yegorslists(a)googlemail.com> --- sound/soc/davinci/davinci-mcasp.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 90a9b99..de59075 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -643,16 +643,23 @@ static int davinci_config_channel_size(struct davinci_audio_dev *dev, /* mapping of the XSSZ bit-field as described in the datasheet */ fmt = (word_length >> 1) - 1; - mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, - RXSSZ(fmt), RXSSZ(0x0F)); - mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, - TXSSZ(fmt), TXSSZ(0x0F)); - mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, TXROT(rotate), - TXROT(7)); - mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, RXROT(rotate), - RXROT(7)); - mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, mask); - mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG, mask); + if (dev->op_mode == DAVINCI_MCASP_DIT_MODE) + { + mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, mask); + } + else + { + mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, + RXSSZ(fmt), RXSSZ(0x0F)); + mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, + TXSSZ(fmt), TXSSZ(0x0F)); + mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, TXROT(rotate), + TXROT(7)); + mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, RXROT(rotate), + RXROT(7)); + mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, mask); + mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG, mask); + } return 0; } -- 1.7.7

3 2

[alsa-devel] [PATCH v2] davinci-mcasp: don't overwrite DIT settings
by yegorslists＠googlemail.com 04 Mar '13

04 Mar '13

From: Yegor Yefremov <yegorslists(a)googlemail.com> Channel size settings will be made at the end of davinci_mcasp_hw_params() routine and thus overwrite frame format settings made for DIT mode. This patch fixes this issue by taking op_mode into account. Tested with official PSP 3.2 kernel and sii9022a HDMI transmitter. Signed-off-by: Yegor Yefremov <yegorslists(a)googlemail.com> --- v2: fix checkpatch.pl warnings sound/soc/davinci/davinci-mcasp.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 90a9b99..ce32b75 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -643,16 +643,20 @@ static int davinci_config_channel_size(struct davinci_audio_dev *dev, /* mapping of the XSSZ bit-field as described in the datasheet */ fmt = (word_length >> 1) - 1; - mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, - RXSSZ(fmt), RXSSZ(0x0F)); - mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, - TXSSZ(fmt), TXSSZ(0x0F)); - mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, TXROT(rotate), - TXROT(7)); - mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, RXROT(rotate), - RXROT(7)); + if (dev->op_mode != DAVINCI_MCASP_DIT_MODE) { + mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, + RXSSZ(fmt), RXSSZ(0x0F)); + mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, + TXSSZ(fmt), TXSSZ(0x0F)); + mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, + TXROT(rotate), TXROT(7)); + mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, + RXROT(rotate), RXROT(7)); + mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG, + mask); + } + mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, mask); - mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG, mask); return 0; } -- 1.7.7

1 0

[alsa-devel] [PATCH 09/12] ASoC: dmaengine_pcm: support use of generic DMA helper
by Shawn Guo 04 Mar '13

04 Mar '13

With generic DMA device tree binding and helper function dma_request_slave_channel() in place, dmaengine_pcm should support that in requesting DMA channel for users that support generic DMA device tree binding. Instead of inventing a new API, it defines the parameters needed by dma_request_slave_channel() into struct snd_dma_channel_params, interprets filter_data into snd_dma_channel_params, and calls the helper in case that dmaengine_pcm users pass in a NULL filter_fn. Then, dmaengine_pcm users can call snd_dmaengine_pcm_open() with NULL filter_fn and snd_dma_channel_params being filter_data to direct the API to request DMA channel using generic DMA helper. Signed-off-by: Shawn Guo <shawn.guo(a)linaro.org> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: alsa-devel(a)alsa-project.org --- include/sound/dmaengine_pcm.h | 5 +++++ sound/soc/soc-dmaengine-pcm.c | 19 +++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h index b877334..6c0f795 100644 --- a/include/sound/dmaengine_pcm.h +++ b/include/sound/dmaengine_pcm.h @@ -18,6 +18,11 @@ #include <sound/pcm.h> #include <linux/dmaengine.h> +struct snd_dma_channel_params { + struct device *dev; + char *name; +}; + /** * snd_pcm_substream_to_dma_direction - Get dma_transfer_direction for a PCM * substream diff --git a/sound/soc/soc-dmaengine-pcm.c b/sound/soc/soc-dmaengine-pcm.c index 111b7d92..7ef8034 100644 --- a/sound/soc/soc-dmaengine-pcm.c +++ b/sound/soc/soc-dmaengine-pcm.c @@ -247,12 +247,19 @@ EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_pointer); static int dmaengine_pcm_request_channel(struct dmaengine_pcm_runtime_data *prtd, dma_filter_fn filter_fn, void *filter_data) { - dma_cap_mask_t mask; - - dma_cap_zero(mask); - dma_cap_set(DMA_SLAVE, mask); - dma_cap_set(DMA_CYCLIC, mask); - prtd->dma_chan = dma_request_channel(mask, filter_fn, filter_data); + if (filter_fn) { + dma_cap_mask_t mask; + + dma_cap_zero(mask); + dma_cap_set(DMA_SLAVE, mask); + dma_cap_set(DMA_CYCLIC, mask); + prtd->dma_chan = dma_request_channel(mask, filter_fn, + filter_data); + } else { + struct snd_dma_channel_params *params = filter_data; + prtd->dma_chan = dma_request_slave_channel(params->dev, + params->name); + } if (!prtd->dma_chan) return -ENXIO; -- 1.7.9.5

3 4

[alsa-devel] [PATCH] davinci-mcasp: don't configure AFSX direction in DIT mode
by yegorslists＠googlemail.com 04 Mar '13

04 Mar '13

From: Yegor Yefremov <yegorslists(a)googlemail.com> AFSX won't be used in DIT mode. The related pins are AHCLKX and the data pins. Signed-off-by: Yegor Yefremov <yegorslists(a)googlemail.com> --- sound/soc/davinci/davinci-mcasp.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 9321e5c..90a9b99 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -772,9 +772,6 @@ static void davinci_hw_param(struct davinci_audio_dev *dev, int stream) /* S/PDIF */ static void davinci_hw_dit_param(struct davinci_audio_dev *dev) { - /* Set the PDIR for Serialiser as output */ - mcasp_set_bits(dev->base + DAVINCI_MCASP_PDIR_REG, AFSX); - /* TXMASK for 24 bits */ mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, 0x00FFFFFF); -- 1.7.7

2 1