From: Mark Brown Date: Mon, 8 Dec 2014 13:11:45 +0000 (+0000) Subject: Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ad193x', 'asoc/topic... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0a7e4ca1aad65458edebb718e1b915d1899056e7;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ad193x', 'asoc/topic/adau1373' and 'asoc/topic/adau17x1' into asoc-next --- 0a7e4ca1aad65458edebb718e1b915d1899056e7 diff --cc include/sound/soc.h index 38769cc900c9,b53234835936,7ba7130037a0,7ba7130037a0,7ba7130037a0..a765c684bd7b --- a/include/sound/soc.h +++ b/include/sound/soc.h @@@@@@ -778,12 -797,10 -785,13 -785,13 -785,13 +790,9 @@@@@@ struct snd_soc_codec struct list_head card_list; /* runtime */ - --- struct snd_ac97 *ac97; /* for ad-hoc ac97 devices */ unsigned int cache_bypass:1; /* Suppress access to the cache */ unsigned int suspended:1; /* Codec is in suspend PM state */ - --- unsigned int ac97_registered:1; /* Codec has been AC97 registered */ - --- unsigned int ac97_created:1; /* Codec has been created by SoC */ unsigned int cache_init:1; /* codec cache has been initialized */ ---- u32 cache_sync; /* Cache needs to be synced to hardware */ /* codec IO */ void *control_data; /* codec control (i2c/3wire) data */ diff --cc sound/soc/soc-core.c index d8d5449cc48e,1edc519d6286,4c8f8a23a0e9,4c8f8a23a0e9,4c8f8a23a0e9..e0d3b6f109c4 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@@@@@ -593,8 -550,12 -597,12 -597,12 -597,12 +546,8 @@@@@@ int snd_soc_suspend(struct device *dev if (card->rtd[i].dai_link->ignore_suspend) continue; - --- if (cpu_dai->driver->suspend && !cpu_dai->driver->ac97_control) + +++ if (cpu_dai->driver->suspend && !cpu_dai->driver->bus_control) cpu_dai->driver->suspend(cpu_dai); ---- if (platform->driver->suspend && !platform->suspended) { ---- platform->driver->suspend(cpu_dai); ---- platform->suspended = 1; ---- } } /* close any waiting streams and save state */ @@@@@@ -770,8 -733,12 -780,12 -780,12 -780,12 +723,8 @@@@@@ static void soc_resume_deferred(struct if (card->rtd[i].dai_link->ignore_suspend) continue; - --- if (cpu_dai->driver->resume && !cpu_dai->driver->ac97_control) + +++ if (cpu_dai->driver->resume && !cpu_dai->driver->bus_control) cpu_dai->driver->resume(cpu_dai); ---- if (platform->driver->resume && platform->suspended) { ---- platform->driver->resume(cpu_dai); ---- platform->suspended = 0; ---- } } if (card->resume_post) @@@@@@ -1387,84 -1377,9 -1422,84 -1422,84 -1422,84 +1342,9 @@@@@@ static int soc_probe_link_dais(struct s } } - --- /* add platform data for AC97 devices */ - --- for (i = 0; i < rtd->num_codecs; i++) { - --- if (rtd->codec_dais[i]->driver->ac97_control) - --- snd_ac97_dev_add_pdata(rtd->codec_dais[i]->codec->ac97, - --- rtd->cpu_dai->ac97_pdata); --- } --- --- return 0; ---} --- ---#ifdef CONFIG_SND_SOC_AC97_BUS ---static int soc_register_ac97_codec(struct snd_soc_codec *codec, --- struct snd_soc_dai *codec_dai) ---{ --- int ret; --- --- /* Only instantiate AC97 if not already done by the adaptor --- * for the generic AC97 subsystem. --- */ --- if (codec_dai->driver->ac97_control && !codec->ac97_registered) { --- /* --- * It is possible that the AC97 device is already registered to --- * the device subsystem. This happens when the device is created --- * via snd_ac97_mixer(). Currently only SoC codec that does so --- * is the generic AC97 glue but others migh emerge. --- * --- * In those cases we don't try to register the device again. --- */ --- if (!codec->ac97_created) --- return 0; --- --- ret = soc_ac97_dev_register(codec); --- if (ret < 0) { --- dev_err(codec->dev, --- "ASoC: AC97 device register failed: %d\n", ret); --- return ret; --- } --- --- codec->ac97_registered = 1; --- } --- return 0; ---} --- ---static void soc_unregister_ac97_codec(struct snd_soc_codec *codec) ---{ --- if (codec->ac97_registered) { --- soc_ac97_dev_unregister(codec); --- codec->ac97_registered = 0; --- } ---} --- ---static int soc_register_ac97_dai_link(struct snd_soc_pcm_runtime *rtd) ---{ --- int i, ret; --- --- for (i = 0; i < rtd->num_codecs; i++) { --- struct snd_soc_dai *codec_dai = rtd->codec_dais[i]; --- --- ret = soc_register_ac97_codec(codec_dai->codec, codec_dai); --- if (ret) { --- while (--i >= 0) --- soc_unregister_ac97_codec(codec_dai->codec); --- return ret; --- } - --- } - --- return 0; } - #ifdef CONFIG_SND_SOC_AC97_BUS - static int soc_register_ac97_codec(struct snd_soc_codec *codec, - struct snd_soc_dai *codec_dai) - { - int ret; - - /* Only instantiate AC97 if not already done by the adaptor - * for the generic AC97 subsystem. - */ - if (codec_dai->driver->ac97_control && !codec->ac97_registered) { - /* - * It is possible that the AC97 device is already registered to - * the device subsystem. This happens when the device is created - * via snd_ac97_mixer(). Currently only SoC codec that does so - * is the generic AC97 glue but others migh emerge. - * - * In those cases we don't try to register the device again. - */ - if (!codec->ac97_created) - return 0; - - ret = soc_ac97_dev_register(codec); - if (ret < 0) { - dev_err(codec->dev, - "ASoC: AC97 device register failed: %d\n", ret); - return ret; - } - - codec->ac97_registered = 1; - } - return 0; - } - - static void soc_unregister_ac97_codec(struct snd_soc_codec *codec) - { - if (codec->ac97_registered) { - soc_ac97_dev_unregister(codec); - codec->ac97_registered = 0; - } - } - - static int soc_register_ac97_dai_link(struct snd_soc_pcm_runtime *rtd) - { - int i, ret; - - for (i = 0; i < rtd->num_codecs; i++) { - struct snd_soc_dai *codec_dai = rtd->codec_dais[i]; - - ret = soc_register_ac97_codec(codec_dai->codec, codec_dai); - if (ret) { - while (--i >= 0) - soc_unregister_ac97_codec(codec_dai->codec); - return ret; - } - } - - return 0; - } - - ---static void soc_unregister_ac97_dai_link(struct snd_soc_pcm_runtime *rtd) - ---{ - --- int i; - --- - --- for (i = 0; i < rtd->num_codecs; i++) - --- soc_unregister_ac97_codec(rtd->codec_dais[i]->codec); - ---} - ---#endif - --- static int soc_bind_aux_dev(struct snd_soc_card *card, int num) { struct snd_soc_pcm_runtime *rtd = &card->rtd_aux[num]; @@@@@@ -2298,92 -1989,1106 -2333,1106 -2333,1106 -2333,1106 +1954,92 @@@@@@ int snd_soc_add_dai_controls(struct snd } EXPORT_SYMBOL_GPL(snd_soc_add_dai_controls); - /** - * snd_soc_info_enum_double - enumerated double mixer info callback - * @kcontrol: mixer control - * @uinfo: control element information - * - * Callback to provide information about a double enumerated - * mixer control. - * - * Returns 0 for success. - */ - int snd_soc_info_enum_double(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_info *uinfo) - { - struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; - - uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; - uinfo->count = e->shift_l == e->shift_r ? 1 : 2; - uinfo->value.enumerated.items = e->items; - - if (uinfo->value.enumerated.item >= e->items) - uinfo->value.enumerated.item = e->items - 1; - strlcpy(uinfo->value.enumerated.name, - e->texts[uinfo->value.enumerated.item], - sizeof(uinfo->value.enumerated.name)); - return 0; - } - EXPORT_SYMBOL_GPL(snd_soc_info_enum_double); - - /** - * snd_soc_get_enum_double - enumerated double mixer get callback - * @kcontrol: mixer control - * @ucontrol: control element information - * - * Callback to get the value of a double enumerated mixer. - * - * Returns 0 for success. - */ - int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { - struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); - struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; - unsigned int val, item; - unsigned int reg_val; - int ret; - - ret = snd_soc_component_read(component, e->reg, ®_val); - if (ret) - return ret; - val = (reg_val >> e->shift_l) & e->mask; - item = snd_soc_enum_val_to_item(e, val); - ucontrol->value.enumerated.item[0] = item; - if (e->shift_l != e->shift_r) { - val = (reg_val >> e->shift_l) & e->mask; - item = snd_soc_enum_val_to_item(e, val); - ucontrol->value.enumerated.item[1] = item; - } - - return 0; - } - EXPORT_SYMBOL_GPL(snd_soc_get_enum_double); - - /** - * snd_soc_put_enum_double - enumerated double mixer put callback - * @kcontrol: mixer control - * @ucontrol: control element information - * - * Callback to set the value of a double enumerated mixer. - * - * Returns 0 for success. - */ - int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { - struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); - struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; - unsigned int *item = ucontrol->value.enumerated.item; - unsigned int val; - unsigned int mask; - - if (item[0] >= e->items) - return -EINVAL; - val = snd_soc_enum_item_to_val(e, item[0]) << e->shift_l; - mask = e->mask << e->shift_l; - if (e->shift_l != e->shift_r) { - if (item[1] >= e->items) - return -EINVAL; - val |= snd_soc_enum_item_to_val(e, item[1]) << e->shift_r; - mask |= e->mask << e->shift_r; - } - - return snd_soc_component_update_bits(component, e->reg, mask, val); - } - EXPORT_SYMBOL_GPL(snd_soc_put_enum_double); - - /** - * snd_soc_read_signed - Read a codec register and interprete as signed value - * @component: component - * @reg: Register to read - * @mask: Mask to use after shifting the register value - * @shift: Right shift of register value - * @sign_bit: Bit that describes if a number is negative or not. - * @signed_val: Pointer to where the read value should be stored - * - * This functions reads a codec register. The register value is shifted right - * by 'shift' bits and masked with the given 'mask'. Afterwards it translates - * the given registervalue into a signed integer if sign_bit is non-zero. - * - * Returns 0 on sucess, otherwise an error value - */ - static int snd_soc_read_signed(struct snd_soc_component *component, - unsigned int reg, unsigned int mask, unsigned int shift, - unsigned int sign_bit, int *signed_val) - { - int ret; - unsigned int val; - - ret = snd_soc_component_read(component, reg, &val); - if (ret < 0) - return ret; - - val = (val >> shift) & mask; - - if (!sign_bit) { - *signed_val = val; - return 0; - } - - /* non-negative number */ - if (!(val & BIT(sign_bit))) { - *signed_val = val; - return 0; - } - - ret = val; - - /* - * The register most probably does not contain a full-sized int. - * Instead we have an arbitrary number of bits in a signed - * representation which has to be translated into a full-sized int. - * This is done by filling up all bits above the sign-bit. - */ - ret |= ~((int)(BIT(sign_bit) - 1)); - - *signed_val = ret; - - return 0; - } - - /** - * snd_soc_info_volsw - single mixer info callback - * @kcontrol: mixer control - * @uinfo: control element information - * - * Callback to provide information about a single mixer control, or a double - * mixer control that spans 2 registers. - * - * Returns 0 for success. - */ - int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_info *uinfo) - { - struct soc_mixer_control *mc = - (struct soc_mixer_control *)kcontrol->private_value; - int platform_max; - - if (!mc->platform_max) - mc->platform_max = mc->max; - platform_max = mc->platform_max; - - if (platform_max == 1 && !strstr(kcontrol->id.name, " Volume")) - uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; - else - uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; - - uinfo->count = snd_soc_volsw_is_stereo(mc) ? 2 : 1; - uinfo->value.integer.min = 0; - uinfo->value.integer.max = platform_max - mc->min; - return 0; - } - EXPORT_SYMBOL_GPL(snd_soc_info_volsw); - - /** - * snd_soc_get_volsw - single mixer get callback - * @kcontrol: mixer control - * @ucontrol: control element information - * - * Callback to get the value of a single mixer control, or a double mixer - * control that spans 2 registers. - * - * Returns 0 for success. - */ - int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { - struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); - struct soc_mixer_control *mc = - (struct soc_mixer_control *)kcontrol->private_value; - unsigned int reg = mc->reg; - unsigned int reg2 = mc->rreg; - unsigned int shift = mc->shift; - unsigned int rshift = mc->rshift; - int max = mc->max; - int min = mc->min; - int sign_bit = mc->sign_bit; - unsigned int mask = (1 << fls(max)) - 1; - unsigned int invert = mc->invert; - int val; - int ret; - - if (sign_bit) - mask = BIT(sign_bit + 1) - 1; - - ret = snd_soc_read_signed(component, reg, mask, shift, sign_bit, &val); - if (ret) - return ret; - - ucontrol->value.integer.value[0] = val - min; - if (invert) - ucontrol->value.integer.value[0] = - max - ucontrol->value.integer.value[0]; - - if (snd_soc_volsw_is_stereo(mc)) { - if (reg == reg2) - ret = snd_soc_read_signed(component, reg, mask, rshift, - sign_bit, &val); - else - ret = snd_soc_read_signed(component, reg2, mask, shift, - sign_bit, &val); - if (ret) - return ret; - - ucontrol->value.integer.value[1] = val - min; - if (invert) - ucontrol->value.integer.value[1] = - max - ucontrol->value.integer.value[1]; - } - - return 0; - } - EXPORT_SYMBOL_GPL(snd_soc_get_volsw); - - /** - * snd_soc_put_volsw - single mixer put callback - * @kcontrol: mixer control - * @ucontrol: control element information - * - * Callback to set the value of a single mixer control, or a double mixer - * control that spans 2 registers. - * - * Returns 0 for success. - */ - int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { - struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); - struct soc_mixer_control *mc = - (struct soc_mixer_control *)kcontrol->private_value; - unsigned int reg = mc->reg; - unsigned int reg2 = mc->rreg; - unsigned int shift = mc->shift; - unsigned int rshift = mc->rshift; - int max = mc->max; - int min = mc->min; - unsigned int sign_bit = mc->sign_bit; - unsigned int mask = (1 << fls(max)) - 1; - unsigned int invert = mc->invert; - int err; - bool type_2r = false; - unsigned int val2 = 0; - unsigned int val, val_mask; - - if (sign_bit) - mask = BIT(sign_bit + 1) - 1; - - val = ((ucontrol->value.integer.value[0] + min) & mask); - if (invert) - val = max - val; - val_mask = mask << shift; - val = val << shift; - if (snd_soc_volsw_is_stereo(mc)) { - val2 = ((ucontrol->value.integer.value[1] + min) & mask); - if (invert) - val2 = max - val2; - if (reg == reg2) { - val_mask |= mask << rshift; - val |= val2 << rshift; - } else { - val2 = val2 << shift; - type_2r = true; - } - } - err = snd_soc_component_update_bits(component, reg, val_mask, val); - if (err < 0) - return err; - - if (type_2r) - err = snd_soc_component_update_bits(component, reg2, val_mask, - val2); - - return err; - } - EXPORT_SYMBOL_GPL(snd_soc_put_volsw); - - /** - * snd_soc_get_volsw_sx - single mixer get callback - * @kcontrol: mixer control - * @ucontrol: control element information - * - * Callback to get the value of a single mixer control, or a double mixer - * control that spans 2 registers. - * - * Returns 0 for success. - */ - int snd_soc_get_volsw_sx(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { - struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); - struct soc_mixer_control *mc = - (struct soc_mixer_control *)kcontrol->private_value; - unsigned int reg = mc->reg; - unsigned int reg2 = mc->rreg; - unsigned int shift = mc->shift; - unsigned int rshift = mc->rshift; - int max = mc->max; - int min = mc->min; - int mask = (1 << (fls(min + max) - 1)) - 1; - unsigned int val; - int ret; - - ret = snd_soc_component_read(component, reg, &val); - if (ret < 0) - return ret; - - ucontrol->value.integer.value[0] = ((val >> shift) - min) & mask; - - if (snd_soc_volsw_is_stereo(mc)) { - ret = snd_soc_component_read(component, reg2, &val); - if (ret < 0) - return ret; - - val = ((val >> rshift) - min) & mask; - ucontrol->value.integer.value[1] = val; - } - - return 0; - } - EXPORT_SYMBOL_GPL(snd_soc_get_volsw_sx); - - /** - * snd_soc_put_volsw_sx - double mixer set callback - * @kcontrol: mixer control - * @uinfo: control element information - * - * Callback to set the value of a double mixer control that spans 2 registers. - * - * Returns 0 for success. - */ - int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { - struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); - struct soc_mixer_control *mc = - (struct soc_mixer_control *)kcontrol->private_value; - - unsigned int reg = mc->reg; - unsigned int reg2 = mc->rreg; - unsigned int shift = mc->shift; - unsigned int rshift = mc->rshift; - int max = mc->max; - int min = mc->min; - int mask = (1 << (fls(min + max) - 1)) - 1; - int err = 0; - unsigned int val, val_mask, val2 = 0; - - val_mask = mask << shift; - val = (ucontrol->value.integer.value[0] + min) & mask; - val = val << shift; - - err = snd_soc_component_update_bits(component, reg, val_mask, val); - if (err < 0) - return err; - - if (snd_soc_volsw_is_stereo(mc)) { - val_mask = mask << rshift; - val2 = (ucontrol->value.integer.value[1] + min) & mask; - val2 = val2 << rshift; - - err = snd_soc_component_update_bits(component, reg2, val_mask, - val2); - } - return err; - } - EXPORT_SYMBOL_GPL(snd_soc_put_volsw_sx); - - /** - * snd_soc_info_volsw_s8 - signed mixer info callback - * @kcontrol: mixer control - * @uinfo: control element information - * - * Callback to provide information about a signed mixer control. - * - * Returns 0 for success. - */ - int snd_soc_info_volsw_s8(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_info *uinfo) - { - struct soc_mixer_control *mc = - (struct soc_mixer_control *)kcontrol->private_value; - int platform_max; - int min = mc->min; - - if (!mc->platform_max) - mc->platform_max = mc->max; - platform_max = mc->platform_max; - - uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; - uinfo->count = 2; - uinfo->value.integer.min = 0; - uinfo->value.integer.max = platform_max - min; - return 0; - } - EXPORT_SYMBOL_GPL(snd_soc_info_volsw_s8); - - /** - * snd_soc_get_volsw_s8 - signed mixer get callback - * @kcontrol: mixer control - * @ucontrol: control element information - * - * Callback to get the value of a signed mixer control. - * - * Returns 0 for success. - */ - int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { - struct soc_mixer_control *mc = - (struct soc_mixer_control *)kcontrol->private_value; - struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); - unsigned int reg = mc->reg; - unsigned int val; - int min = mc->min; - int ret; - - ret = snd_soc_component_read(component, reg, &val); - if (ret) - return ret; - - ucontrol->value.integer.value[0] = - ((signed char)(val & 0xff))-min; - ucontrol->value.integer.value[1] = - ((signed char)((val >> 8) & 0xff))-min; - return 0; - } - EXPORT_SYMBOL_GPL(snd_soc_get_volsw_s8); - - /** - * snd_soc_put_volsw_sgn - signed mixer put callback - * @kcontrol: mixer control - * @ucontrol: control element information - * - * Callback to set the value of a signed mixer control. - * - * Returns 0 for success. - */ - int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { - struct soc_mixer_control *mc = - (struct soc_mixer_control *)kcontrol->private_value; - struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); - unsigned int reg = mc->reg; - int min = mc->min; - unsigned int val; - - val = (ucontrol->value.integer.value[0]+min) & 0xff; - val |= ((ucontrol->value.integer.value[1]+min) & 0xff) << 8; - - return snd_soc_component_update_bits(component, reg, 0xffff, val); - } - EXPORT_SYMBOL_GPL(snd_soc_put_volsw_s8); - - /** - * snd_soc_info_volsw_range - single mixer info callback with range. - * @kcontrol: mixer control - * @uinfo: control element information - * - * Callback to provide information, within a range, about a single - * mixer control. - * - * returns 0 for success. - */ - int snd_soc_info_volsw_range(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_info *uinfo) - { - struct soc_mixer_control *mc = - (struct soc_mixer_control *)kcontrol->private_value; - int platform_max; - int min = mc->min; - - if (!mc->platform_max) - mc->platform_max = mc->max; - platform_max = mc->platform_max; - - uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; - uinfo->count = snd_soc_volsw_is_stereo(mc) ? 2 : 1; - uinfo->value.integer.min = 0; - uinfo->value.integer.max = platform_max - min; - - return 0; - } - EXPORT_SYMBOL_GPL(snd_soc_info_volsw_range); - - /** - * snd_soc_put_volsw_range - single mixer put value callback with range. - * @kcontrol: mixer control - * @ucontrol: control element information - * - * Callback to set the value, within a range, for a single mixer control. - * - * Returns 0 for success. - */ - int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { - struct soc_mixer_control *mc = - (struct soc_mixer_control *)kcontrol->private_value; - struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); - unsigned int reg = mc->reg; - unsigned int rreg = mc->rreg; - unsigned int shift = mc->shift; - int min = mc->min; - int max = mc->max; - unsigned int mask = (1 << fls(max)) - 1; - unsigned int invert = mc->invert; - unsigned int val, val_mask; - int ret; - - if (invert) - val = (max - ucontrol->value.integer.value[0]) & mask; - else - val = ((ucontrol->value.integer.value[0] + min) & mask); - val_mask = mask << shift; - val = val << shift; - - ret = snd_soc_component_update_bits(component, reg, val_mask, val); - if (ret < 0) - return ret; - - if (snd_soc_volsw_is_stereo(mc)) { - if (invert) - val = (max - ucontrol->value.integer.value[1]) & mask; - else - val = ((ucontrol->value.integer.value[1] + min) & mask); - val_mask = mask << shift; - val = val << shift; - - ret = snd_soc_component_update_bits(component, rreg, val_mask, - val); - } - - return ret; - } - EXPORT_SYMBOL_GPL(snd_soc_put_volsw_range); - - /** - * snd_soc_get_volsw_range - single mixer get callback with range - * @kcontrol: mixer control - * @ucontrol: control element information - * - * Callback to get the value, within a range, of a single mixer control. - * - * Returns 0 for success. - */ - int snd_soc_get_volsw_range(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { - struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); - struct soc_mixer_control *mc = - (struct soc_mixer_control *)kcontrol->private_value; - unsigned int reg = mc->reg; - unsigned int rreg = mc->rreg; - unsigned int shift = mc->shift; - int min = mc->min; - int max = mc->max; - unsigned int mask = (1 << fls(max)) - 1; - unsigned int invert = mc->invert; - unsigned int val; - int ret; - - ret = snd_soc_component_read(component, reg, &val); - if (ret) - return ret; - - ucontrol->value.integer.value[0] = (val >> shift) & mask; - if (invert) - ucontrol->value.integer.value[0] = - max - ucontrol->value.integer.value[0]; - else - ucontrol->value.integer.value[0] = - ucontrol->value.integer.value[0] - min; - - if (snd_soc_volsw_is_stereo(mc)) { - ret = snd_soc_component_read(component, rreg, &val); - if (ret) - return ret; - - ucontrol->value.integer.value[1] = (val >> shift) & mask; - if (invert) - ucontrol->value.integer.value[1] = - max - ucontrol->value.integer.value[1]; - else - ucontrol->value.integer.value[1] = - ucontrol->value.integer.value[1] - min; - } - - return 0; - } - EXPORT_SYMBOL_GPL(snd_soc_get_volsw_range); - - /** - * snd_soc_limit_volume - Set new limit to an existing volume control. - * - * @codec: where to look for the control - * @name: Name of the control - * @max: new maximum limit - * - * Return 0 for success, else error. - */ - int snd_soc_limit_volume(struct snd_soc_codec *codec, - const char *name, int max) - { - struct snd_card *card = codec->component.card->snd_card; - struct snd_kcontrol *kctl; - struct soc_mixer_control *mc; - int found = 0; - int ret = -EINVAL; - - /* Sanity check for name and max */ - if (unlikely(!name || max <= 0)) - return -EINVAL; - - list_for_each_entry(kctl, &card->controls, list) { - if (!strncmp(kctl->id.name, name, sizeof(kctl->id.name))) { - found = 1; - break; - } - } - if (found) { - mc = (struct soc_mixer_control *)kctl->private_value; - if (max <= mc->max) { - mc->platform_max = max; - ret = 0; - } - } - return ret; - } - EXPORT_SYMBOL_GPL(snd_soc_limit_volume); - - int snd_soc_bytes_info(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_info *uinfo) - { - struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); - struct soc_bytes *params = (void *)kcontrol->private_value; - - uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES; - uinfo->count = params->num_regs * component->val_bytes; - - return 0; - } - EXPORT_SYMBOL_GPL(snd_soc_bytes_info); - - int snd_soc_bytes_get(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { - struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); - struct soc_bytes *params = (void *)kcontrol->private_value; - int ret; - - if (component->regmap) - ret = regmap_raw_read(component->regmap, params->base, - ucontrol->value.bytes.data, - params->num_regs * component->val_bytes); - else - ret = -EINVAL; - - /* Hide any masked bytes to ensure consistent data reporting */ - if (ret == 0 && params->mask) { - switch (component->val_bytes) { - case 1: - ucontrol->value.bytes.data[0] &= ~params->mask; - break; - case 2: - ((u16 *)(&ucontrol->value.bytes.data))[0] - &= cpu_to_be16(~params->mask); - break; - case 4: - ((u32 *)(&ucontrol->value.bytes.data))[0] - &= cpu_to_be32(~params->mask); - break; - default: - return -EINVAL; - } - } - - return ret; - } - EXPORT_SYMBOL_GPL(snd_soc_bytes_get); - - int snd_soc_bytes_put(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { - struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); - struct soc_bytes *params = (void *)kcontrol->private_value; - int ret, len; - unsigned int val, mask; - void *data; - - if (!component->regmap || !params->num_regs) - return -EINVAL; - - len = params->num_regs * component->val_bytes; - - data = kmemdup(ucontrol->value.bytes.data, len, GFP_KERNEL | GFP_DMA); - if (!data) - return -ENOMEM; - - /* - * If we've got a mask then we need to preserve the register - * bits. We shouldn't modify the incoming data so take a - * copy. - */ - if (params->mask) { - ret = regmap_read(component->regmap, params->base, &val); - if (ret != 0) - goto out; - - val &= params->mask; - - switch (component->val_bytes) { - case 1: - ((u8 *)data)[0] &= ~params->mask; - ((u8 *)data)[0] |= val; - break; - case 2: - mask = ~params->mask; - ret = regmap_parse_val(component->regmap, - &mask, &mask); - if (ret != 0) - goto out; - - ((u16 *)data)[0] &= mask; - - ret = regmap_parse_val(component->regmap, - &val, &val); - if (ret != 0) - goto out; - - ((u16 *)data)[0] |= val; - break; - case 4: - mask = ~params->mask; - ret = regmap_parse_val(component->regmap, - &mask, &mask); - if (ret != 0) - goto out; - - ((u32 *)data)[0] &= mask; - - ret = regmap_parse_val(component->regmap, - &val, &val); - if (ret != 0) - goto out; - - ((u32 *)data)[0] |= val; - break; - default: - ret = -EINVAL; - goto out; - } - } - - ret = regmap_raw_write(component->regmap, params->base, - data, len); - - out: - kfree(data); - - return ret; - } - EXPORT_SYMBOL_GPL(snd_soc_bytes_put); - - int snd_soc_bytes_info_ext(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_info *ucontrol) - { - struct soc_bytes_ext *params = (void *)kcontrol->private_value; - - ucontrol->type = SNDRV_CTL_ELEM_TYPE_BYTES; - ucontrol->count = params->max; - - return 0; - } - EXPORT_SYMBOL_GPL(snd_soc_bytes_info_ext); - - int snd_soc_bytes_tlv_callback(struct snd_kcontrol *kcontrol, int op_flag, - unsigned int size, unsigned int __user *tlv) - { - struct soc_bytes_ext *params = (void *)kcontrol->private_value; - unsigned int count = size < params->max ? size : params->max; - int ret = -ENXIO; - - switch (op_flag) { - case SNDRV_CTL_TLV_OP_READ: - if (params->get) - ret = params->get(tlv, count); - break; - case SNDRV_CTL_TLV_OP_WRITE: - if (params->put) - ret = params->put(tlv, count); - break; - } - return ret; - } - EXPORT_SYMBOL_GPL(snd_soc_bytes_tlv_callback); - - /** - * snd_soc_info_xr_sx - signed multi register info callback - * @kcontrol: mreg control - * @uinfo: control element information - * - * Callback to provide information of a control that can - * span multiple codec registers which together - * forms a single signed value in a MSB/LSB manner. - * - * Returns 0 for success. - */ - int snd_soc_info_xr_sx(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_info *uinfo) - { - struct soc_mreg_control *mc = - (struct soc_mreg_control *)kcontrol->private_value; - uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; - uinfo->count = 1; - uinfo->value.integer.min = mc->min; - uinfo->value.integer.max = mc->max; - - return 0; - } - EXPORT_SYMBOL_GPL(snd_soc_info_xr_sx); - - /** - * snd_soc_get_xr_sx - signed multi register get callback - * @kcontrol: mreg control - * @ucontrol: control element information - * - * Callback to get the value of a control that can span - * multiple codec registers which together forms a single - * signed value in a MSB/LSB manner. The control supports - * specifying total no of bits used to allow for bitfields - * across the multiple codec registers. - * - * Returns 0 for success. - */ - int snd_soc_get_xr_sx(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { - struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); - struct soc_mreg_control *mc = - (struct soc_mreg_control *)kcontrol->private_value; - unsigned int regbase = mc->regbase; - unsigned int regcount = mc->regcount; - unsigned int regwshift = component->val_bytes * BITS_PER_BYTE; - unsigned int regwmask = (1<invert; - unsigned long mask = (1UL<nbits)-1; - long min = mc->min; - long max = mc->max; - long val = 0; - unsigned int regval; - unsigned int i; - int ret; - - for (i = 0; i < regcount; i++) { - ret = snd_soc_component_read(component, regbase+i, ®val); - if (ret) - return ret; - val |= (regval & regwmask) << (regwshift*(regcount-i-1)); - } - val &= mask; - if (min < 0 && val > max) - val |= ~mask; - if (invert) - val = max - val; - ucontrol->value.integer.value[0] = val; - - return 0; - } - EXPORT_SYMBOL_GPL(snd_soc_get_xr_sx); - - /** - * snd_soc_put_xr_sx - signed multi register get callback - * @kcontrol: mreg control - * @ucontrol: control element information - * - * Callback to set the value of a control that can span - * multiple codec registers which together forms a single - * signed value in a MSB/LSB manner. The control supports - * specifying total no of bits used to allow for bitfields - * across the multiple codec registers. - * - * Returns 0 for success. - */ - int snd_soc_put_xr_sx(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { - struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); - struct soc_mreg_control *mc = - (struct soc_mreg_control *)kcontrol->private_value; - unsigned int regbase = mc->regbase; - unsigned int regcount = mc->regcount; - unsigned int regwshift = component->val_bytes * BITS_PER_BYTE; - unsigned int regwmask = (1<invert; - unsigned long mask = (1UL<nbits)-1; - long max = mc->max; - long val = ucontrol->value.integer.value[0]; - unsigned int i, regval, regmask; - int err; - - if (invert) - val = max - val; - val &= mask; - for (i = 0; i < regcount; i++) { - regval = (val >> (regwshift*(regcount-i-1))) & regwmask; - regmask = (mask >> (regwshift*(regcount-i-1))) & regwmask; - err = snd_soc_component_update_bits(component, regbase+i, - regmask, regval); - if (err < 0) - return err; - } - - return 0; - } - EXPORT_SYMBOL_GPL(snd_soc_put_xr_sx); - - /** - * snd_soc_get_strobe - strobe get callback - * @kcontrol: mixer control - * @ucontrol: control element information - * - * Callback get the value of a strobe mixer control. - * - * Returns 0 for success. - */ - int snd_soc_get_strobe(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { - struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); - struct soc_mixer_control *mc = - (struct soc_mixer_control *)kcontrol->private_value; - unsigned int reg = mc->reg; - unsigned int shift = mc->shift; - unsigned int mask = 1 << shift; - unsigned int invert = mc->invert != 0; - unsigned int val; - int ret; - - ret = snd_soc_component_read(component, reg, &val); - if (ret) - return ret; - - val &= mask; - - if (shift != 0 && val != 0) - val = val >> shift; - ucontrol->value.enumerated.item[0] = val ^ invert; - - return 0; - } - EXPORT_SYMBOL_GPL(snd_soc_get_strobe); - - /** - * snd_soc_put_strobe - strobe put callback - * @kcontrol: mixer control - * @ucontrol: control element information - * - * Callback strobe a register bit to high then low (or the inverse) - * in one pass of a single mixer enum control. - * - * Returns 1 for success. - */ - int snd_soc_put_strobe(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) - { - struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); - struct soc_mixer_control *mc = - (struct soc_mixer_control *)kcontrol->private_value; - unsigned int reg = mc->reg; - unsigned int shift = mc->shift; - unsigned int mask = 1 << shift; - unsigned int invert = mc->invert != 0; - unsigned int strobe = ucontrol->value.enumerated.item[0] != 0; - unsigned int val1 = (strobe ^ invert) ? mask : 0; - unsigned int val2 = (strobe ^ invert) ? 0 : mask; - int err; - - err = snd_soc_component_update_bits(component, reg, mask, val1); - if (err < 0) - return err; - - return snd_soc_component_update_bits(component, reg, mask, val2); - } - EXPORT_SYMBOL_GPL(snd_soc_put_strobe); - /** --- * snd_soc_info_enum_double - enumerated double mixer info callback --- * @kcontrol: mixer control --- * @uinfo: control element information --- * --- * Callback to provide information about a double enumerated --- * mixer control. +++ * snd_soc_dai_set_sysclk - configure DAI system or master clock. +++ * @dai: DAI +++ * @clk_id: DAI specific clock ID +++ * @freq: new clock frequency in Hz +++ * @dir: new clock direction - input/output. * --- * Returns 0 for success. +++ * Configures the DAI master (MCLK) or system (SYSCLK) clocking. */ ---int snd_soc_info_enum_double(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_info *uinfo) +++int snd_soc_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id, +++ unsigned int freq, int dir) { --- struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; --- --- uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; --- uinfo->count = e->shift_l == e->shift_r ? 1 : 2; --- uinfo->value.enumerated.items = e->items; --- --- if (uinfo->value.enumerated.item >= e->items) --- uinfo->value.enumerated.item = e->items - 1; --- strlcpy(uinfo->value.enumerated.name, --- e->texts[uinfo->value.enumerated.item], --- sizeof(uinfo->value.enumerated.name)); --- return 0; +++ if (dai->driver && dai->driver->ops->set_sysclk) +++ return dai->driver->ops->set_sysclk(dai, clk_id, freq, dir); +++ else if (dai->codec && dai->codec->driver->set_sysclk) +++ return dai->codec->driver->set_sysclk(dai->codec, clk_id, 0, +++ freq, dir); +++ else +++ return -ENOTSUPP; } ---EXPORT_SYMBOL_GPL(snd_soc_info_enum_double); +++EXPORT_SYMBOL_GPL(snd_soc_dai_set_sysclk); /** --- * snd_soc_get_enum_double - enumerated double mixer get callback --- * @kcontrol: mixer control --- * @ucontrol: control element information --- * --- * Callback to get the value of a double enumerated mixer. +++ * snd_soc_codec_set_sysclk - configure CODEC system or master clock. +++ * @codec: CODEC +++ * @clk_id: DAI specific clock ID +++ * @source: Source for the clock +++ * @freq: new clock frequency in Hz +++ * @dir: new clock direction - input/output. * --- * Returns 0 for success. +++ * Configures the CODEC master (MCLK) or system (SYSCLK) clocking. */ ---int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_value *ucontrol) +++int snd_soc_codec_set_sysclk(struct snd_soc_codec *codec, int clk_id, +++ int source, unsigned int freq, int dir) { --- struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); --- struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; --- unsigned int val, item; --- unsigned int reg_val; --- int ret; --- --- ret = snd_soc_component_read(component, e->reg, ®_val); --- if (ret) --- return ret; --- val = (reg_val >> e->shift_l) & e->mask; --- item = snd_soc_enum_val_to_item(e, val); --- ucontrol->value.enumerated.item[0] = item; --- if (e->shift_l != e->shift_r) { --- val = (reg_val >> e->shift_l) & e->mask; --- item = snd_soc_enum_val_to_item(e, val); --- ucontrol->value.enumerated.item[1] = item; --- } --- --- return 0; +++ if (codec->driver->set_sysclk) +++ return codec->driver->set_sysclk(codec, clk_id, source, +++ freq, dir); +++ else +++ return -ENOTSUPP; } ---EXPORT_SYMBOL_GPL(snd_soc_get_enum_double); +++EXPORT_SYMBOL_GPL(snd_soc_codec_set_sysclk); /** --- * snd_soc_put_enum_double - enumerated double mixer put callback --- * @kcontrol: mixer control --- * @ucontrol: control element information --- * --- * Callback to set the value of a double enumerated mixer. +++ * snd_soc_dai_set_clkdiv - configure DAI clock dividers. +++ * @dai: DAI +++ * @div_id: DAI specific clock divider ID +++ * @div: new clock divisor. * --- * Returns 0 for success. +++ * Configures the clock dividers. This is used to derive the best DAI bit and +++ * frame clocks from the system or master clock. It's best to set the DAI bit +++ * and frame clocks as low as possible to save system power. */ ---int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_value *ucontrol) +++int snd_soc_dai_set_clkdiv(struct snd_soc_dai *dai, +++ int div_id, int div) { --- struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); --- struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; --- unsigned int *item = ucontrol->value.enumerated.item; --- unsigned int val; --- unsigned int mask; --- --- if (item[0] >= e->items) +++ if (dai->driver && dai->driver->ops->set_clkdiv) +++ return dai->driver->ops->set_clkdiv(dai, div_id, div); +++ else return -EINVAL; --- val = snd_soc_enum_item_to_val(e, item[0]) << e->shift_l; --- mask = e->mask << e->shift_l; --- if (e->shift_l != e->shift_r) { --- if (item[1] >= e->items) --- return -EINVAL; --- val |= snd_soc_enum_item_to_val(e, item[1]) << e->shift_r; --- mask |= e->mask << e->shift_r; --- } --- --- return snd_soc_component_update_bits(component, e->reg, mask, val); } ---EXPORT_SYMBOL_GPL(snd_soc_put_enum_double); +++EXPORT_SYMBOL_GPL(snd_soc_dai_set_clkdiv); /** --- * snd_soc_read_signed - Read a codec register and interprete as signed value --- * @component: component --- * @reg: Register to read --- * @mask: Mask to use after shifting the register value --- * @shift: Right shift of register value --- * @sign_bit: Bit that describes if a number is negative or not. --- * @signed_val: Pointer to where the read value should be stored --- * --- * This functions reads a codec register. The register value is shifted right --- * by 'shift' bits and masked with the given 'mask'. Afterwards it translates --- * the given registervalue into a signed integer if sign_bit is non-zero. +++ * snd_soc_dai_set_pll - configure DAI PLL. +++ * @dai: DAI +++ * @pll_id: DAI specific PLL ID +++ * @source: DAI specific source for the PLL +++ * @freq_in: PLL input clock frequency in Hz +++ * @freq_out: requested PLL output clock frequency in Hz * --- * Returns 0 on sucess, otherwise an error value +++ * Configures and enables PLL to generate output clock based on input clock. */ ---static int snd_soc_read_signed(struct snd_soc_component *component, --- unsigned int reg, unsigned int mask, unsigned int shift, --- unsigned int sign_bit, int *signed_val) +++int snd_soc_dai_set_pll(struct snd_soc_dai *dai, int pll_id, int source, +++ unsigned int freq_in, unsigned int freq_out) { --- int ret; --- unsigned int val; --- --- ret = snd_soc_component_read(component, reg, &val); --- if (ret < 0) --- return ret; --- --- val = (val >> shift) & mask; --- --- if (!sign_bit) { --- *signed_val = val; --- return 0; --- } --- --- /* non-negative number */ --- if (!(val & BIT(sign_bit))) { --- *signed_val = val; --- return 0; --- } --- --- ret = val; --- --- /* --- * The register most probably does not contain a full-sized int. --- * Instead we have an arbitrary number of bits in a signed --- * representation which has to be translated into a full-sized int. --- * This is done by filling up all bits above the sign-bit. --- */ --- ret |= ~((int)(BIT(sign_bit) - 1)); --- --- *signed_val = ret; --- --- return 0; ---} --- ---/** --- * snd_soc_info_volsw - single mixer info callback --- * @kcontrol: mixer control --- * @uinfo: control element information --- * --- * Callback to provide information about a single mixer control, or a double --- * mixer control that spans 2 registers. --- * --- * Returns 0 for success. --- */ ---int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_info *uinfo) ---{ --- struct soc_mixer_control *mc = --- (struct soc_mixer_control *)kcontrol->private_value; --- int platform_max; --- --- if (!mc->platform_max) --- mc->platform_max = mc->max; --- platform_max = mc->platform_max; --- --- if (platform_max == 1 && !strstr(kcontrol->id.name, " Volume")) --- uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; --- else --- uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; --- --- uinfo->count = snd_soc_volsw_is_stereo(mc) ? 2 : 1; --- uinfo->value.integer.min = 0; --- uinfo->value.integer.max = platform_max - mc->min; --- return 0; ---} ---EXPORT_SYMBOL_GPL(snd_soc_info_volsw); --- ---/** --- * snd_soc_get_volsw - single mixer get callback --- * @kcontrol: mixer control --- * @ucontrol: control element information --- * --- * Callback to get the value of a single mixer control, or a double mixer --- * control that spans 2 registers. --- * --- * Returns 0 for success. --- */ ---int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_value *ucontrol) ---{ --- struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); --- struct soc_mixer_control *mc = --- (struct soc_mixer_control *)kcontrol->private_value; --- unsigned int reg = mc->reg; --- unsigned int reg2 = mc->rreg; --- unsigned int shift = mc->shift; --- unsigned int rshift = mc->rshift; --- int max = mc->max; --- int min = mc->min; --- int sign_bit = mc->sign_bit; --- unsigned int mask = (1 << fls(max)) - 1; --- unsigned int invert = mc->invert; --- int val; --- int ret; --- --- if (sign_bit) --- mask = BIT(sign_bit + 1) - 1; --- --- ret = snd_soc_read_signed(component, reg, mask, shift, sign_bit, &val); --- if (ret) --- return ret; --- --- ucontrol->value.integer.value[0] = val - min; --- if (invert) --- ucontrol->value.integer.value[0] = --- max - ucontrol->value.integer.value[0]; --- --- if (snd_soc_volsw_is_stereo(mc)) { --- if (reg == reg2) --- ret = snd_soc_read_signed(component, reg, mask, rshift, --- sign_bit, &val); --- else --- ret = snd_soc_read_signed(component, reg2, mask, shift, --- sign_bit, &val); --- if (ret) --- return ret; --- --- ucontrol->value.integer.value[1] = val - min; --- if (invert) --- ucontrol->value.integer.value[1] = --- max - ucontrol->value.integer.value[1]; --- } --- --- return 0; ---} ---EXPORT_SYMBOL_GPL(snd_soc_get_volsw); --- ---/** --- * snd_soc_put_volsw - single mixer put callback --- * @kcontrol: mixer control --- * @ucontrol: control element information --- * --- * Callback to set the value of a single mixer control, or a double mixer --- * control that spans 2 registers. --- * --- * Returns 0 for success. --- */ ---int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_value *ucontrol) ---{ --- struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); --- struct soc_mixer_control *mc = --- (struct soc_mixer_control *)kcontrol->private_value; --- unsigned int reg = mc->reg; --- unsigned int reg2 = mc->rreg; --- unsigned int shift = mc->shift; --- unsigned int rshift = mc->rshift; --- int max = mc->max; --- int min = mc->min; --- unsigned int sign_bit = mc->sign_bit; --- unsigned int mask = (1 << fls(max)) - 1; --- unsigned int invert = mc->invert; --- int err; --- bool type_2r = false; --- unsigned int val2 = 0; --- unsigned int val, val_mask; --- --- if (sign_bit) --- mask = BIT(sign_bit + 1) - 1; --- --- val = ((ucontrol->value.integer.value[0] + min) & mask); --- if (invert) --- val = max - val; --- val_mask = mask << shift; --- val = val << shift; --- if (snd_soc_volsw_is_stereo(mc)) { --- val2 = ((ucontrol->value.integer.value[1] + min) & mask); --- if (invert) --- val2 = max - val2; --- if (reg == reg2) { --- val_mask |= mask << rshift; --- val |= val2 << rshift; --- } else { --- val2 = val2 << shift; --- type_2r = true; --- } --- } --- err = snd_soc_component_update_bits(component, reg, val_mask, val); --- if (err < 0) --- return err; --- --- if (type_2r) --- err = snd_soc_component_update_bits(component, reg2, val_mask, --- val2); --- --- return err; ---} ---EXPORT_SYMBOL_GPL(snd_soc_put_volsw); --- ---/** --- * snd_soc_get_volsw_sx - single mixer get callback --- * @kcontrol: mixer control --- * @ucontrol: control element information --- * --- * Callback to get the value of a single mixer control, or a double mixer --- * control that spans 2 registers. --- * --- * Returns 0 for success. --- */ ---int snd_soc_get_volsw_sx(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_value *ucontrol) ---{ --- struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); --- struct soc_mixer_control *mc = --- (struct soc_mixer_control *)kcontrol->private_value; --- unsigned int reg = mc->reg; --- unsigned int reg2 = mc->rreg; --- unsigned int shift = mc->shift; --- unsigned int rshift = mc->rshift; --- int max = mc->max; --- int min = mc->min; --- int mask = (1 << (fls(min + max) - 1)) - 1; --- unsigned int val; --- int ret; --- --- ret = snd_soc_component_read(component, reg, &val); --- if (ret < 0) --- return ret; --- --- ucontrol->value.integer.value[0] = ((val >> shift) - min) & mask; --- --- if (snd_soc_volsw_is_stereo(mc)) { --- ret = snd_soc_component_read(component, reg2, &val); --- if (ret < 0) --- return ret; --- --- val = ((val >> rshift) - min) & mask; --- ucontrol->value.integer.value[1] = val; --- } --- --- return 0; ---} ---EXPORT_SYMBOL_GPL(snd_soc_get_volsw_sx); --- ---/** --- * snd_soc_put_volsw_sx - double mixer set callback --- * @kcontrol: mixer control --- * @uinfo: control element information --- * --- * Callback to set the value of a double mixer control that spans 2 registers. --- * --- * Returns 0 for success. --- */ ---int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_value *ucontrol) ---{ --- struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); --- struct soc_mixer_control *mc = --- (struct soc_mixer_control *)kcontrol->private_value; --- --- unsigned int reg = mc->reg; --- unsigned int reg2 = mc->rreg; --- unsigned int shift = mc->shift; --- unsigned int rshift = mc->rshift; --- int max = mc->max; --- int min = mc->min; --- int mask = (1 << (fls(min + max) - 1)) - 1; --- int err = 0; --- unsigned int val, val_mask, val2 = 0; --- --- val_mask = mask << shift; --- val = (ucontrol->value.integer.value[0] + min) & mask; --- val = val << shift; --- --- err = snd_soc_component_update_bits(component, reg, val_mask, val); --- if (err < 0) --- return err; --- --- if (snd_soc_volsw_is_stereo(mc)) { --- val_mask = mask << rshift; --- val2 = (ucontrol->value.integer.value[1] + min) & mask; --- val2 = val2 << rshift; --- --- err = snd_soc_component_update_bits(component, reg2, val_mask, --- val2); --- } --- return err; ---} ---EXPORT_SYMBOL_GPL(snd_soc_put_volsw_sx); --- ---/** --- * snd_soc_info_volsw_s8 - signed mixer info callback --- * @kcontrol: mixer control --- * @uinfo: control element information --- * --- * Callback to provide information about a signed mixer control. --- * --- * Returns 0 for success. --- */ ---int snd_soc_info_volsw_s8(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_info *uinfo) ---{ --- struct soc_mixer_control *mc = --- (struct soc_mixer_control *)kcontrol->private_value; --- int platform_max; --- int min = mc->min; --- --- if (!mc->platform_max) --- mc->platform_max = mc->max; --- platform_max = mc->platform_max; --- --- uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; --- uinfo->count = 2; --- uinfo->value.integer.min = 0; --- uinfo->value.integer.max = platform_max - min; --- return 0; ---} ---EXPORT_SYMBOL_GPL(snd_soc_info_volsw_s8); --- ---/** --- * snd_soc_get_volsw_s8 - signed mixer get callback --- * @kcontrol: mixer control --- * @ucontrol: control element information --- * --- * Callback to get the value of a signed mixer control. --- * --- * Returns 0 for success. --- */ ---int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_value *ucontrol) ---{ --- struct soc_mixer_control *mc = --- (struct soc_mixer_control *)kcontrol->private_value; --- struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); --- unsigned int reg = mc->reg; --- unsigned int val; --- int min = mc->min; --- int ret; --- --- ret = snd_soc_component_read(component, reg, &val); --- if (ret) --- return ret; --- --- ucontrol->value.integer.value[0] = --- ((signed char)(val & 0xff))-min; --- ucontrol->value.integer.value[1] = --- ((signed char)((val >> 8) & 0xff))-min; --- return 0; ---} ---EXPORT_SYMBOL_GPL(snd_soc_get_volsw_s8); --- ---/** --- * snd_soc_put_volsw_sgn - signed mixer put callback --- * @kcontrol: mixer control --- * @ucontrol: control element information --- * --- * Callback to set the value of a signed mixer control. --- * --- * Returns 0 for success. --- */ ---int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_value *ucontrol) ---{ --- struct soc_mixer_control *mc = --- (struct soc_mixer_control *)kcontrol->private_value; --- struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); --- unsigned int reg = mc->reg; --- int min = mc->min; --- unsigned int val; --- --- val = (ucontrol->value.integer.value[0]+min) & 0xff; --- val |= ((ucontrol->value.integer.value[1]+min) & 0xff) << 8; --- --- return snd_soc_component_update_bits(component, reg, 0xffff, val); ---} ---EXPORT_SYMBOL_GPL(snd_soc_put_volsw_s8); --- ---/** --- * snd_soc_info_volsw_range - single mixer info callback with range. --- * @kcontrol: mixer control --- * @uinfo: control element information --- * --- * Callback to provide information, within a range, about a single --- * mixer control. --- * --- * returns 0 for success. --- */ ---int snd_soc_info_volsw_range(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_info *uinfo) ---{ --- struct soc_mixer_control *mc = --- (struct soc_mixer_control *)kcontrol->private_value; --- int platform_max; --- int min = mc->min; --- --- if (!mc->platform_max) --- mc->platform_max = mc->max; --- platform_max = mc->platform_max; --- --- uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; --- uinfo->count = snd_soc_volsw_is_stereo(mc) ? 2 : 1; --- uinfo->value.integer.min = 0; --- uinfo->value.integer.max = platform_max - min; --- --- return 0; ---} ---EXPORT_SYMBOL_GPL(snd_soc_info_volsw_range); --- ---/** --- * snd_soc_put_volsw_range - single mixer put value callback with range. --- * @kcontrol: mixer control --- * @ucontrol: control element information --- * --- * Callback to set the value, within a range, for a single mixer control. --- * --- * Returns 0 for success. --- */ ---int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_value *ucontrol) ---{ --- struct soc_mixer_control *mc = --- (struct soc_mixer_control *)kcontrol->private_value; --- struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); --- unsigned int reg = mc->reg; --- unsigned int rreg = mc->rreg; --- unsigned int shift = mc->shift; --- int min = mc->min; --- int max = mc->max; --- unsigned int mask = (1 << fls(max)) - 1; --- unsigned int invert = mc->invert; --- unsigned int val, val_mask; --- int ret; --- --- if (invert) --- val = (max - ucontrol->value.integer.value[0]) & mask; --- else --- val = ((ucontrol->value.integer.value[0] + min) & mask); --- val_mask = mask << shift; --- val = val << shift; --- --- ret = snd_soc_component_update_bits(component, reg, val_mask, val); --- if (ret < 0) --- return ret; --- --- if (snd_soc_volsw_is_stereo(mc)) { --- if (invert) --- val = (max - ucontrol->value.integer.value[1]) & mask; --- else --- val = ((ucontrol->value.integer.value[1] + min) & mask); --- val_mask = mask << shift; --- val = val << shift; --- --- ret = snd_soc_component_update_bits(component, rreg, val_mask, --- val); --- } --- --- return ret; ---} ---EXPORT_SYMBOL_GPL(snd_soc_put_volsw_range); --- ---/** --- * snd_soc_get_volsw_range - single mixer get callback with range --- * @kcontrol: mixer control --- * @ucontrol: control element information --- * --- * Callback to get the value, within a range, of a single mixer control. --- * --- * Returns 0 for success. --- */ ---int snd_soc_get_volsw_range(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_value *ucontrol) ---{ --- struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); --- struct soc_mixer_control *mc = --- (struct soc_mixer_control *)kcontrol->private_value; --- unsigned int reg = mc->reg; --- unsigned int rreg = mc->rreg; --- unsigned int shift = mc->shift; --- int min = mc->min; --- int max = mc->max; --- unsigned int mask = (1 << fls(max)) - 1; --- unsigned int invert = mc->invert; --- unsigned int val; --- int ret; --- --- ret = snd_soc_component_read(component, reg, &val); --- if (ret) --- return ret; --- --- ucontrol->value.integer.value[0] = (val >> shift) & mask; --- if (invert) --- ucontrol->value.integer.value[0] = --- max - ucontrol->value.integer.value[0]; --- else --- ucontrol->value.integer.value[0] = --- ucontrol->value.integer.value[0] - min; --- --- if (snd_soc_volsw_is_stereo(mc)) { --- ret = snd_soc_component_read(component, rreg, &val); --- if (ret) --- return ret; --- --- ucontrol->value.integer.value[1] = (val >> shift) & mask; --- if (invert) --- ucontrol->value.integer.value[1] = --- max - ucontrol->value.integer.value[1]; --- else --- ucontrol->value.integer.value[1] = --- ucontrol->value.integer.value[1] - min; --- } --- --- return 0; ---} ---EXPORT_SYMBOL_GPL(snd_soc_get_volsw_range); --- ---/** --- * snd_soc_limit_volume - Set new limit to an existing volume control. --- * --- * @codec: where to look for the control --- * @name: Name of the control --- * @max: new maximum limit --- * --- * Return 0 for success, else error. --- */ ---int snd_soc_limit_volume(struct snd_soc_codec *codec, --- const char *name, int max) ---{ --- struct snd_card *card = codec->component.card->snd_card; --- struct snd_kcontrol *kctl; --- struct soc_mixer_control *mc; --- int found = 0; --- int ret = -EINVAL; --- --- /* Sanity check for name and max */ --- if (unlikely(!name || max <= 0)) --- return -EINVAL; --- --- list_for_each_entry(kctl, &card->controls, list) { --- if (!strncmp(kctl->id.name, name, sizeof(kctl->id.name))) { --- found = 1; --- break; --- } --- } --- if (found) { --- mc = (struct soc_mixer_control *)kctl->private_value; --- if (max <= mc->max) { --- mc->platform_max = max; --- ret = 0; --- } --- } --- return ret; ---} ---EXPORT_SYMBOL_GPL(snd_soc_limit_volume); --- ---int snd_soc_bytes_info(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_info *uinfo) ---{ --- struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); --- struct soc_bytes *params = (void *)kcontrol->private_value; --- --- uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES; --- uinfo->count = params->num_regs * component->val_bytes; --- --- return 0; ---} ---EXPORT_SYMBOL_GPL(snd_soc_bytes_info); --- ---int snd_soc_bytes_get(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_value *ucontrol) ---{ --- struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); --- struct soc_bytes *params = (void *)kcontrol->private_value; --- int ret; --- --- if (component->regmap) --- ret = regmap_raw_read(component->regmap, params->base, --- ucontrol->value.bytes.data, --- params->num_regs * component->val_bytes); --- else --- ret = -EINVAL; --- --- /* Hide any masked bytes to ensure consistent data reporting */ --- if (ret == 0 && params->mask) { --- switch (component->val_bytes) { --- case 1: --- ucontrol->value.bytes.data[0] &= ~params->mask; --- break; --- case 2: --- ((u16 *)(&ucontrol->value.bytes.data))[0] --- &= cpu_to_be16(~params->mask); --- break; --- case 4: --- ((u32 *)(&ucontrol->value.bytes.data))[0] --- &= cpu_to_be32(~params->mask); --- break; --- default: --- return -EINVAL; --- } --- } --- --- return ret; ---} ---EXPORT_SYMBOL_GPL(snd_soc_bytes_get); --- ---int snd_soc_bytes_put(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_value *ucontrol) ---{ --- struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); --- struct soc_bytes *params = (void *)kcontrol->private_value; --- int ret, len; --- unsigned int val, mask; --- void *data; --- --- if (!component->regmap || !params->num_regs) --- return -EINVAL; --- --- len = params->num_regs * component->val_bytes; --- --- data = kmemdup(ucontrol->value.bytes.data, len, GFP_KERNEL | GFP_DMA); --- if (!data) --- return -ENOMEM; --- --- /* --- * If we've got a mask then we need to preserve the register --- * bits. We shouldn't modify the incoming data so take a --- * copy. --- */ --- if (params->mask) { --- ret = regmap_read(component->regmap, params->base, &val); --- if (ret != 0) --- goto out; --- --- val &= params->mask; --- --- switch (component->val_bytes) { --- case 1: --- ((u8 *)data)[0] &= ~params->mask; --- ((u8 *)data)[0] |= val; --- break; --- case 2: --- mask = ~params->mask; --- ret = regmap_parse_val(component->regmap, --- &mask, &mask); --- if (ret != 0) --- goto out; --- --- ((u16 *)data)[0] &= mask; --- --- ret = regmap_parse_val(component->regmap, --- &val, &val); --- if (ret != 0) --- goto out; --- --- ((u16 *)data)[0] |= val; --- break; --- case 4: --- mask = ~params->mask; --- ret = regmap_parse_val(component->regmap, --- &mask, &mask); --- if (ret != 0) --- goto out; --- --- ((u32 *)data)[0] &= mask; --- --- ret = regmap_parse_val(component->regmap, --- &val, &val); --- if (ret != 0) --- goto out; --- --- ((u32 *)data)[0] |= val; --- break; --- default: --- ret = -EINVAL; --- goto out; --- } --- } --- --- ret = regmap_raw_write(component->regmap, params->base, --- data, len); --- ---out: --- kfree(data); --- --- return ret; ---} ---EXPORT_SYMBOL_GPL(snd_soc_bytes_put); --- ---int snd_soc_bytes_info_ext(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_info *ucontrol) ---{ --- struct soc_bytes_ext *params = (void *)kcontrol->private_value; --- --- ucontrol->type = SNDRV_CTL_ELEM_TYPE_BYTES; --- ucontrol->count = params->max; --- --- return 0; ---} ---EXPORT_SYMBOL_GPL(snd_soc_bytes_info_ext); --- ---int snd_soc_bytes_tlv_callback(struct snd_kcontrol *kcontrol, int op_flag, --- unsigned int size, unsigned int __user *tlv) ---{ --- struct soc_bytes_ext *params = (void *)kcontrol->private_value; --- unsigned int count = size < params->max ? size : params->max; --- int ret = -ENXIO; --- --- switch (op_flag) { --- case SNDRV_CTL_TLV_OP_READ: --- if (params->get) --- ret = params->get(tlv, count); --- break; --- case SNDRV_CTL_TLV_OP_WRITE: --- if (params->put) --- ret = params->put(tlv, count); --- break; --- } --- return ret; ---} ---EXPORT_SYMBOL_GPL(snd_soc_bytes_tlv_callback); --- ---/** --- * snd_soc_info_xr_sx - signed multi register info callback --- * @kcontrol: mreg control --- * @uinfo: control element information --- * --- * Callback to provide information of a control that can --- * span multiple codec registers which together --- * forms a single signed value in a MSB/LSB manner. --- * --- * Returns 0 for success. --- */ ---int snd_soc_info_xr_sx(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_info *uinfo) ---{ --- struct soc_mreg_control *mc = --- (struct soc_mreg_control *)kcontrol->private_value; --- uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; --- uinfo->count = 1; --- uinfo->value.integer.min = mc->min; --- uinfo->value.integer.max = mc->max; --- --- return 0; ---} ---EXPORT_SYMBOL_GPL(snd_soc_info_xr_sx); --- ---/** --- * snd_soc_get_xr_sx - signed multi register get callback --- * @kcontrol: mreg control --- * @ucontrol: control element information --- * --- * Callback to get the value of a control that can span --- * multiple codec registers which together forms a single --- * signed value in a MSB/LSB manner. The control supports --- * specifying total no of bits used to allow for bitfields --- * across the multiple codec registers. --- * --- * Returns 0 for success. --- */ ---int snd_soc_get_xr_sx(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_value *ucontrol) ---{ --- struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); --- struct soc_mreg_control *mc = --- (struct soc_mreg_control *)kcontrol->private_value; --- unsigned int regbase = mc->regbase; --- unsigned int regcount = mc->regcount; --- unsigned int regwshift = component->val_bytes * BITS_PER_BYTE; --- unsigned int regwmask = (1<invert; --- unsigned long mask = (1UL<nbits)-1; --- long min = mc->min; --- long max = mc->max; --- long val = 0; --- unsigned int regval; --- unsigned int i; --- int ret; --- --- for (i = 0; i < regcount; i++) { --- ret = snd_soc_component_read(component, regbase+i, ®val); --- if (ret) --- return ret; --- val |= (regval & regwmask) << (regwshift*(regcount-i-1)); --- } --- val &= mask; --- if (min < 0 && val > max) --- val |= ~mask; --- if (invert) --- val = max - val; --- ucontrol->value.integer.value[0] = val; --- --- return 0; ---} ---EXPORT_SYMBOL_GPL(snd_soc_get_xr_sx); --- ---/** --- * snd_soc_put_xr_sx - signed multi register get callback --- * @kcontrol: mreg control --- * @ucontrol: control element information --- * --- * Callback to set the value of a control that can span --- * multiple codec registers which together forms a single --- * signed value in a MSB/LSB manner. The control supports --- * specifying total no of bits used to allow for bitfields --- * across the multiple codec registers. --- * --- * Returns 0 for success. --- */ ---int snd_soc_put_xr_sx(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_value *ucontrol) ---{ --- struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); --- struct soc_mreg_control *mc = --- (struct soc_mreg_control *)kcontrol->private_value; --- unsigned int regbase = mc->regbase; --- unsigned int regcount = mc->regcount; --- unsigned int regwshift = component->val_bytes * BITS_PER_BYTE; --- unsigned int regwmask = (1<invert; --- unsigned long mask = (1UL<nbits)-1; --- long max = mc->max; --- long val = ucontrol->value.integer.value[0]; --- unsigned int i, regval, regmask; --- int err; --- --- if (invert) --- val = max - val; --- val &= mask; --- for (i = 0; i < regcount; i++) { --- regval = (val >> (regwshift*(regcount-i-1))) & regwmask; --- regmask = (mask >> (regwshift*(regcount-i-1))) & regwmask; --- err = snd_soc_component_update_bits(component, regbase+i, --- regmask, regval); --- if (err < 0) --- return err; --- } --- --- return 0; ---} ---EXPORT_SYMBOL_GPL(snd_soc_put_xr_sx); --- ---/** --- * snd_soc_get_strobe - strobe get callback --- * @kcontrol: mixer control --- * @ucontrol: control element information --- * --- * Callback get the value of a strobe mixer control. --- * --- * Returns 0 for success. --- */ ---int snd_soc_get_strobe(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_value *ucontrol) ---{ --- struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); --- struct soc_mixer_control *mc = --- (struct soc_mixer_control *)kcontrol->private_value; --- unsigned int reg = mc->reg; --- unsigned int shift = mc->shift; --- unsigned int mask = 1 << shift; --- unsigned int invert = mc->invert != 0; --- unsigned int val; --- int ret; --- --- ret = snd_soc_component_read(component, reg, &val); --- if (ret) --- return ret; --- --- val &= mask; --- --- if (shift != 0 && val != 0) --- val = val >> shift; --- ucontrol->value.enumerated.item[0] = val ^ invert; --- --- return 0; ---} ---EXPORT_SYMBOL_GPL(snd_soc_get_strobe); --- ---/** --- * snd_soc_put_strobe - strobe put callback --- * @kcontrol: mixer control --- * @ucontrol: control element information --- * --- * Callback strobe a register bit to high then low (or the inverse) --- * in one pass of a single mixer enum control. --- * --- * Returns 1 for success. --- */ ---int snd_soc_put_strobe(struct snd_kcontrol *kcontrol, --- struct snd_ctl_elem_value *ucontrol) ---{ --- struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); --- struct soc_mixer_control *mc = --- (struct soc_mixer_control *)kcontrol->private_value; --- unsigned int reg = mc->reg; --- unsigned int shift = mc->shift; --- unsigned int mask = 1 << shift; --- unsigned int invert = mc->invert != 0; --- unsigned int strobe = ucontrol->value.enumerated.item[0] != 0; --- unsigned int val1 = (strobe ^ invert) ? mask : 0; --- unsigned int val2 = (strobe ^ invert) ? 0 : mask; --- int err; --- --- err = snd_soc_component_update_bits(component, reg, mask, val1); --- if (err < 0) --- return err; --- --- return snd_soc_component_update_bits(component, reg, mask, val2); ---} ---EXPORT_SYMBOL_GPL(snd_soc_put_strobe); --- ---/** --- * snd_soc_dai_set_sysclk - configure DAI system or master clock. --- * @dai: DAI --- * @clk_id: DAI specific clock ID --- * @freq: new clock frequency in Hz --- * @dir: new clock direction - input/output. --- * --- * Configures the DAI master (MCLK) or system (SYSCLK) clocking. --- */ ---int snd_soc_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id, --- unsigned int freq, int dir) ---{ --- if (dai->driver && dai->driver->ops->set_sysclk) --- return dai->driver->ops->set_sysclk(dai, clk_id, freq, dir); --- else if (dai->codec && dai->codec->driver->set_sysclk) --- return dai->codec->driver->set_sysclk(dai->codec, clk_id, 0, --- freq, dir); --- else --- return -ENOTSUPP; ---} ---EXPORT_SYMBOL_GPL(snd_soc_dai_set_sysclk); --- ---/** --- * snd_soc_codec_set_sysclk - configure CODEC system or master clock. --- * @codec: CODEC --- * @clk_id: DAI specific clock ID --- * @source: Source for the clock --- * @freq: new clock frequency in Hz --- * @dir: new clock direction - input/output. --- * --- * Configures the CODEC master (MCLK) or system (SYSCLK) clocking. --- */ ---int snd_soc_codec_set_sysclk(struct snd_soc_codec *codec, int clk_id, --- int source, unsigned int freq, int dir) ---{ --- if (codec->driver->set_sysclk) --- return codec->driver->set_sysclk(codec, clk_id, source, --- freq, dir); --- else --- return -ENOTSUPP; ---} ---EXPORT_SYMBOL_GPL(snd_soc_codec_set_sysclk); --- ---/** --- * snd_soc_dai_set_clkdiv - configure DAI clock dividers. --- * @dai: DAI --- * @div_id: DAI specific clock divider ID --- * @div: new clock divisor. --- * --- * Configures the clock dividers. This is used to derive the best DAI bit and --- * frame clocks from the system or master clock. It's best to set the DAI bit --- * and frame clocks as low as possible to save system power. --- */ ---int snd_soc_dai_set_clkdiv(struct snd_soc_dai *dai, --- int div_id, int div) ---{ --- if (dai->driver && dai->driver->ops->set_clkdiv) --- return dai->driver->ops->set_clkdiv(dai, div_id, div); --- else --- return -EINVAL; ---} ---EXPORT_SYMBOL_GPL(snd_soc_dai_set_clkdiv); --- ---/** --- * snd_soc_dai_set_pll - configure DAI PLL. --- * @dai: DAI --- * @pll_id: DAI specific PLL ID --- * @source: DAI specific source for the PLL --- * @freq_in: PLL input clock frequency in Hz --- * @freq_out: requested PLL output clock frequency in Hz --- * --- * Configures and enables PLL to generate output clock based on input clock. --- */ ---int snd_soc_dai_set_pll(struct snd_soc_dai *dai, int pll_id, int source, --- unsigned int freq_in, unsigned int freq_out) ---{ --- if (dai->driver && dai->driver->ops->set_pll) --- return dai->driver->ops->set_pll(dai, pll_id, source, --- freq_in, freq_out); --- else if (dai->codec && dai->codec->driver->set_pll) --- return dai->codec->driver->set_pll(dai->codec, pll_id, source, --- freq_in, freq_out); --- else --- return -EINVAL; ---} ---EXPORT_SYMBOL_GPL(snd_soc_dai_set_pll); +++ if (dai->driver && dai->driver->ops->set_pll) +++ return dai->driver->ops->set_pll(dai, pll_id, source, +++ freq_in, freq_out); +++ else if (dai->codec && dai->codec->driver->set_pll) +++ return dai->codec->driver->set_pll(dai->codec, pll_id, source, +++ freq_in, freq_out); +++ else +++ return -EINVAL; +++} +++EXPORT_SYMBOL_GPL(snd_soc_dai_set_pll); /* * snd_soc_codec_set_pll - configure codec PLL.