A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 06:09:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

misc: cs40l2x: Eliminate local storage of digital volume

Browse source 
Replaced references to a local copy of digital volume (mapped to the
dig_scale sysfs control) with an actual query of the device.

Change-Id: If5c1a3d65a4466299f198f751f6364e979243fd1
Signed-off-by: Jeff LaBundy <jeff.labundy@cirrus.com>
Signed-off-by: Ravi Vembu <raviv@motorola.com>
This commit is contained in:
Jeff LaBundy 2018-05-11 16:39:02 -05:00 • committed by a7301c
commit 845da911f3
1 changed files with 45 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

53
drivers/misc/cs40l2x.c
View file

@ -65,9 +65,9 @@ struct cs40l2x_private {
struct cs40l2x_platform_data pdata;
struct list_head coeff_desc_head;
unsigned char diag_state;
unsigned int diag_dig_scale;
unsigned int f0_measured;
unsigned int redc_measured;
unsigned int dig_scale;
struct cs40l2x_pbq_pair pbq_pairs[CS40L2X_PBQ_DEPTH_MAX];
struct hrtimer pbq_timer;
unsigned int pbq_depth;
@ -777,13 +777,34 @@ static ssize_t cs40l2x_comp_enable_store(struct device *dev,
return count;
}
static int cs40l2x_dig_scale_get(struct cs40l2x_private *cs40l2x,
unsigned int *dig_scale)
{
int ret;
unsigned int val;
if (!mutex_is_locked(&cs40l2x->lock))
return -EACCES;
ret = regmap_read(cs40l2x->regmap, CS40L2X_AMP_DIG_VOL_CTRL, &val);
if (ret)
return ret;
*dig_scale = (CS40L2X_DIG_SCALE_ZERO - ((val & CS40L2X_AMP_VOL_PCM_MASK)
>> CS40L2X_AMP_VOL_PCM_SHIFT)) & CS40L2X_DIG_SCALE_MASK;
return 0;
}
static int cs40l2x_dig_scale_set(struct cs40l2x_private *cs40l2x,
unsigned int dig_scale)
{
/* this function expects to be called while mutex is locked */
if (!mutex_is_locked(&cs40l2x->lock))
return -EACCES;
if (dig_scale == CS40L2X_DIG_SCALE_RESET)
return -EINVAL;
return regmap_update_bits(cs40l2x->regmap,
CS40L2X_AMP_DIG_VOL_CTRL,
CS40L2X_AMP_VOL_PCM_MASK,
@ -796,8 +817,19 @@ static ssize_t cs40l2x_dig_scale_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct cs40l2x_private *cs40l2x = cs40l2x_get_private(dev);
int ret;
unsigned int dig_scale;
return snprintf(buf, PAGE_SIZE, "%d\n", cs40l2x->dig_scale);
mutex_lock(&cs40l2x->lock);
ret = cs40l2x_dig_scale_get(cs40l2x, &dig_scale);
mutex_unlock(&cs40l2x->lock);
if (ret) {
pr_err("Failed to read digital scale\n");
return ret;
}
return snprintf(buf, PAGE_SIZE, "%d\n", dig_scale);
}
static ssize_t cs40l2x_dig_scale_store(struct device *dev,
@ -816,16 +848,14 @@ static ssize_t cs40l2x_dig_scale_store(struct device *dev,
return -EINVAL;
mutex_lock(&cs40l2x->lock);
cs40l2x_dig_scale_set(cs40l2x, dig_scale);
ret = cs40l2x_dig_scale_set(cs40l2x, dig_scale);
mutex_unlock(&cs40l2x->lock);
if (ret) {
pr_err("Failed to store digital scale\n");
pr_err("Failed to write digital scale\n");
return ret;
}
cs40l2x->dig_scale = dig_scale;
return count;
}
@ -1437,6 +1467,13 @@ static void cs40l2x_vibe_start_worker(struct work_struct *work)
case CS40L2X_INDEX_DIAG:
cs40l2x->diag_state = CS40L2X_DIAG_STATE_INIT;
cs40l2x->diag_dig_scale = CS40L2X_DIG_SCALE_RESET;
ret = cs40l2x_dig_scale_get(cs40l2x, &cs40l2x->diag_dig_scale);
if (ret) {
dev_err(dev, "Failed to read digital scale\n");
goto err_mutex;
}
ret = cs40l2x_dig_scale_set(cs40l2x, 0);
if (ret) {
@ -1499,7 +1536,7 @@ static void cs40l2x_vibe_stop_worker(struct work_struct *work)
if (ret)
dev_err(dev, "Failed to disable stimulus mode\n");
ret = cs40l2x_dig_scale_set(cs40l2x, cs40l2x->dig_scale);
ret = cs40l2x_dig_scale_set(cs40l2x, cs40l2x->diag_dig_scale);
if (ret)
dev_err(dev, "Failed to restore digital scale\n");
break;