From f0304a3ebe5551cceb8eb364b8a263ac73fa67b6 Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Thu, 15 Oct 2020 15:14:40 +0800 Subject: [PATCH] asoc: swr-haptics: add control to set VMAX Add control to set VMAX to adjust different vibrator setting from userspace. Change-Id: I7300e4f0ae57e403c8fc79db38598946289effb6 Signed-off-by: Meng Wang --- asoc/codecs/swr-haptics.c | 49 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/asoc/codecs/swr-haptics.c b/asoc/codecs/swr-haptics.c index 29681cef4f82..c4a433fcfed3 100644 --- a/asoc/codecs/swr-haptics.c +++ b/asoc/codecs/swr-haptics.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. */ #include @@ -81,6 +81,7 @@ struct swr_haptics_dev { struct regulator *hpwr_vreg; u32 hpwr_voltage_mv; bool hpwr_vreg_enabled; + u8 vmax; }; static bool swr_hap_volatile_register(struct device *dev, unsigned int reg) @@ -218,6 +219,15 @@ static int hap_enable_swr_dac_port(struct snd_soc_dapm_widget *w, switch (event) { case SND_SOC_DAPM_PRE_PMU: + rc = regmap_write(swr_hap->regmap, SWR_VMAX_REG, swr_hap->vmax); + if (rc) { + dev_err(swr_hap->dev, "%s: SWR_VMAX update failed, rc=%d\n", + __func__, rc); + return rc; + } + regmap_read(swr_hap->regmap, SWR_VMAX_REG, &val); + regmap_read(swr_hap->regmap, SWR_READ_DATA_REG, &val); + dev_dbg(swr_hap->dev, "%s: swr_vmax is set to 0x%x\n", __func__, val); swr_device_wakeup_vote(swr_hap->swr_slave); swr_connect_port(swr_hap->swr_slave, &port_id, num_port, &ch_mask, &ch_rate, &num_ch, &port_type); @@ -275,6 +285,39 @@ static int hap_enable_swr_dac_port(struct snd_soc_dapm_widget *w, return 0; } +static int haptics_vmax_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = + snd_soc_kcontrol_component(kcontrol); + struct swr_haptics_dev *swr_hap = + snd_soc_component_get_drvdata(component); + + pr_debug("%s: vmax %u\n", __func__, swr_hap->vmax); + ucontrol->value.integer.value[0] = swr_hap->vmax; + + return 0; +} + +static int haptics_vmax_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = + snd_soc_kcontrol_component(kcontrol); + struct swr_haptics_dev *swr_hap = + snd_soc_component_get_drvdata(component); + + swr_hap->vmax = ucontrol->value.integer.value[0]; + pr_debug("%s: vmax %u\n", __func__, swr_hap->vmax); + + return 0; +} + +static const struct snd_kcontrol_new haptics_snd_controls[] = { + SOC_SINGLE_EXT("Haptics Amplitude Step", SND_SOC_NOPM, 0, 100, 0, + haptics_vmax_get, haptics_vmax_put), +}; + static const struct snd_soc_dapm_widget haptics_comp_dapm_widgets[] = { SND_SOC_DAPM_INPUT("HAP_IN"), SND_SOC_DAPM_MIXER_E("SWR DAC_Port", SND_SOC_NOPM, 0, 0, @@ -321,6 +364,8 @@ static const struct snd_soc_component_driver swr_haptics_component = { .name = "swr-haptics", .probe = haptics_comp_probe, .remove = haptics_comp_remove, + .controls = haptics_snd_controls, + .num_controls = ARRAY_SIZE(haptics_snd_controls), .dapm_widgets = haptics_comp_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(haptics_comp_dapm_widgets), .dapm_routes = haptics_comp_dapm_route, @@ -388,6 +433,8 @@ static int swr_haptics_probe(struct swr_device *sdev) if (!swr_hap) return -ENOMEM; + /* VMAX default to 5V */ + swr_hap->vmax = 100; swr_hap->swr_slave = sdev; swr_hap->dev = &sdev->dev; swr_set_dev_data(sdev, swr_hap);