msm: Rename msmfalcon/apqfalcon to sdm660/sda660
Update the code name from msmfalcon/apqfalcon to sdm660/sda660.
As part of this, update the filename containing "falcon" and
files content containing "falcon".
Change-Id: Iec85862251b9e1b4dcc8bdce8b214ce87c0049bc
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Signed-off-by: Banajit Goswami <bgoswami@codeaurora.org>
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 5236cbc..e0198d2 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -927,11 +927,11 @@
config AUDIO_EXT_CLK
tristate
- default y if SND_SOC_WCD9335=y || SND_SOC_WCD9330=y || SND_SOC_MSMFALCON_CDC=y
+ default y if SND_SOC_WCD9335=y || SND_SOC_WCD9330=y || SND_SOC_SDM660_CDC=y
config SND_SOC_WCD_MBHC
tristate
- default y if (SND_SOC_MSM8909_WCD=y || SND_SOC_MSMFALCON_CDC=y || SND_SOC_WCD9335=y) && SND_SOC_MDMCALIFORNIUM!=y
+ default y if (SND_SOC_MSM8909_WCD=y || SND_SOC_SDM660_CDC=y || SND_SOC_WCD9335=y) && SND_SOC_MDMCALIFORNIUM!=y
config SND_SOC_WCD_DSP_MGR
tristate
@@ -1164,7 +1164,7 @@
HDMI audio drivers should be built only if the platform
supports hdmi panel.
-source "sound/soc/codecs/msmfalcon_cdc/Kconfig"
+source "sound/soc/codecs/sdm660_cdc/Kconfig"
source "sound/soc/codecs/msm_sdw/Kconfig"
endmenu
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 992f90b0..20ae32e 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -482,5 +482,5 @@
obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o
obj-$(CONFIG_SND_SOC_MAX98504) += snd-soc-max98504.o
obj-$(CONFIG_SND_SOC_TPA6130A2) += snd-soc-tpa6130a2.o
-obj-y += msmfalcon_cdc/
+obj-y += sdm660_cdc/
obj-y += msm_sdw/
diff --git a/sound/soc/codecs/msmfalcon_cdc/Kconfig b/sound/soc/codecs/msmfalcon_cdc/Kconfig
deleted file mode 100644
index dc461a6..0000000
--- a/sound/soc/codecs/msmfalcon_cdc/Kconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-
-config SND_SOC_MSMFALCON_CDC
- tristate "MSM Internal PMIC based codec"
diff --git a/sound/soc/codecs/msmfalcon_cdc/Makefile b/sound/soc/codecs/msmfalcon_cdc/Makefile
deleted file mode 100644
index 814308d..0000000
--- a/sound/soc/codecs/msmfalcon_cdc/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-snd-soc-msmfalcon-cdc-objs := msm-analog-cdc.o msm-digital-cdc.o msmfalcon-regmap.o
-obj-$(CONFIG_SND_SOC_MSMFALCON_CDC) += snd-soc-msmfalcon-cdc.o msmfalcon-cdc-irq.o
diff --git a/sound/soc/codecs/sdm660_cdc/Kconfig b/sound/soc/codecs/sdm660_cdc/Kconfig
new file mode 100644
index 0000000..d370da3
--- /dev/null
+++ b/sound/soc/codecs/sdm660_cdc/Kconfig
@@ -0,0 +1,3 @@
+
+config SND_SOC_SDM660_CDC
+ tristate "MSM Internal PMIC based codec"
diff --git a/sound/soc/codecs/sdm660_cdc/Makefile b/sound/soc/codecs/sdm660_cdc/Makefile
new file mode 100644
index 0000000..d846fae
--- /dev/null
+++ b/sound/soc/codecs/sdm660_cdc/Makefile
@@ -0,0 +1,2 @@
+snd-soc-sdm660-cdc-objs := msm-analog-cdc.o msm-digital-cdc.o sdm660-regmap.o
+obj-$(CONFIG_SND_SOC_SDM660_CDC) += snd-soc-sdm660-cdc.o sdm660-cdc-irq.o
diff --git a/sound/soc/codecs/msmfalcon_cdc/msm-analog-cdc.c b/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c
similarity index 84%
rename from sound/soc/codecs/msmfalcon_cdc/msm-analog-cdc.c
rename to sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c
index 387af8b..7585084 100644
--- a/sound/soc/codecs/msmfalcon_cdc/msm-analog-cdc.c
+++ b/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c
@@ -28,17 +28,17 @@
#include <sound/tlv.h>
#include <sound/q6core.h>
#include "msm-analog-cdc.h"
-#include "msmfalcon-cdc-irq.h"
-#include "msmfalcon-cdc-registers.h"
+#include "sdm660-cdc-irq.h"
+#include "sdm660-cdc-registers.h"
#include "msm-cdc-common.h"
-#include "../../msm/msmfalcon-common.h"
+#include "../../msm/sdm660-common.h"
#include "../wcd-mbhc-v2.h"
#define DRV_NAME "pmic_analog_codec"
-#define MSMFALCON_CDC_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
+#define SDM660_CDC_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |\
SNDRV_PCM_RATE_48000)
-#define MSMFALCON_CDC_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\
+#define SDM660_CDC_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\
SNDRV_PCM_FMTBIT_S24_LE)
#define MSM_DIG_CDC_STRING_LEN 80
#define MSM_ANLG_CDC_VERSION_ENTRY_SIZE 32
@@ -74,8 +74,8 @@
#define MAX_BOOST_VOLTAGE 5550
#define BOOST_VOLTAGE_STEP 50
-#define MSMFALCON_CDC_MBHC_BTN_COARSE_ADJ 100 /* in mV */
-#define MSMFALCON_CDC_MBHC_BTN_FINE_ADJ 12 /* in mV */
+#define SDM660_CDC_MBHC_BTN_COARSE_ADJ 100 /* in mV */
+#define SDM660_CDC_MBHC_BTN_FINE_ADJ 12 /* in mV */
#define VOLTAGE_CONVERTER(value, min_value, step_size)\
((value - min_value)/step_size)
@@ -192,10 +192,10 @@
};
static int msm_anlg_cdc_dt_parse_vreg_info(struct device *dev,
- struct msmfalcon_cdc_regulator *vreg,
+ struct sdm660_cdc_regulator *vreg,
const char *vreg_name,
bool ondemand);
-static struct msmfalcon_cdc_pdata *msm_anlg_cdc_populate_dt_pdata(
+static struct sdm660_cdc_pdata *msm_anlg_cdc_populate_dt_pdata(
struct device *dev);
static int msm_anlg_cdc_enable_ext_mb_source(struct wcd_mbhc *wcd_mbhc,
bool turn_on);
@@ -208,21 +208,21 @@
bool micbias1, bool micbias2);
static bool msm_anlg_cdc_use_mb(struct snd_soc_codec *codec);
-static int get_codec_version(struct msmfalcon_cdc_priv *msmfalcon_cdc)
+static int get_codec_version(struct sdm660_cdc_priv *sdm660_cdc)
{
- if (msmfalcon_cdc->codec_version == DRAX_CDC)
+ if (sdm660_cdc->codec_version == DRAX_CDC)
return DRAX_CDC;
- else if (msmfalcon_cdc->codec_version == DIANGU)
+ else if (sdm660_cdc->codec_version == DIANGU)
return DIANGU;
- else if (msmfalcon_cdc->codec_version == CAJON_2_0)
+ else if (sdm660_cdc->codec_version == CAJON_2_0)
return CAJON_2_0;
- else if (msmfalcon_cdc->codec_version == CAJON)
+ else if (sdm660_cdc->codec_version == CAJON)
return CAJON;
- else if (msmfalcon_cdc->codec_version == CONGA)
+ else if (sdm660_cdc->codec_version == CONGA)
return CONGA;
- else if (msmfalcon_cdc->pmic_rev == TOMBAK_2_0)
+ else if (sdm660_cdc->pmic_rev == TOMBAK_2_0)
return TOMBAK_2_0;
- else if (msmfalcon_cdc->pmic_rev == TOMBAK_1_0)
+ else if (sdm660_cdc->pmic_rev == TOMBAK_1_0)
return TOMBAK_1_0;
pr_err("%s: unsupported codec version\n", __func__);
@@ -232,11 +232,11 @@
static void wcd_mbhc_meas_imped(struct snd_soc_codec *codec,
s16 *impedance_l, s16 *impedance_r)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
- if ((msmfalcon_cdc->imped_det_pin == WCD_MBHC_DET_BOTH) ||
- (msmfalcon_cdc->imped_det_pin == WCD_MBHC_DET_HPHL)) {
+ if ((sdm660_cdc->imped_det_pin == WCD_MBHC_DET_BOTH) ||
+ (sdm660_cdc->imped_det_pin == WCD_MBHC_DET_HPHL)) {
/* Enable ZDET_L_MEAS_EN */
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_MBHC_FSM_CTL,
@@ -251,8 +251,8 @@
MSM89XX_PMIC_ANALOG_MBHC_FSM_CTL,
0x08, 0x00);
}
- if ((msmfalcon_cdc->imped_det_pin == WCD_MBHC_DET_BOTH) ||
- (msmfalcon_cdc->imped_det_pin == WCD_MBHC_DET_HPHR)) {
+ if ((sdm660_cdc->imped_det_pin == WCD_MBHC_DET_BOTH) ||
+ (sdm660_cdc->imped_det_pin == WCD_MBHC_DET_HPHR)) {
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_MBHC_FSM_CTL,
0x04, 0x04);
@@ -270,16 +270,16 @@
static void msm_anlg_cdc_set_ref_current(struct snd_soc_codec *codec,
enum wcd_curr_ref curr_ref)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
dev_dbg(codec->dev, "%s: curr_ref: %d\n", __func__, curr_ref);
- if (get_codec_version(msmfalcon_cdc) < CAJON)
+ if (get_codec_version(sdm660_cdc) < CAJON)
dev_dbg(codec->dev, "%s: Setting ref current not required\n",
__func__);
- msmfalcon_cdc->imped_i_ref = imped_i_ref[curr_ref];
+ sdm660_cdc->imped_i_ref = imped_i_ref[curr_ref];
switch (curr_ref) {
case I_h4_UA:
@@ -318,15 +318,15 @@
{
int i = 2;
s16 compare_imp = 0;
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
- if (msmfalcon_cdc->imped_det_pin == WCD_MBHC_DET_HPHR)
+ if (sdm660_cdc->imped_det_pin == WCD_MBHC_DET_HPHR)
compare_imp = *impedance_r;
else
compare_imp = *impedance_l;
- if (get_codec_version(msmfalcon_cdc) < CAJON) {
+ if (get_codec_version(sdm660_cdc) < CAJON) {
dev_dbg(codec->dev,
"%s: Reference current adjustment not required\n",
__func__);
@@ -336,7 +336,7 @@
while (compare_imp < imped_i_ref[i].min_val) {
msm_anlg_cdc_set_ref_current(codec, imped_i_ref[++i].curr_ref);
wcd_mbhc_meas_imped(codec, impedance_l, impedance_r);
- compare_imp = (msmfalcon_cdc->imped_det_pin ==
+ compare_imp = (sdm660_cdc->imped_det_pin ==
WCD_MBHC_DET_HPHR) ? *impedance_r : *impedance_l;
if (i >= I_1_UA)
break;
@@ -348,28 +348,28 @@
int (*codec_spk_ext_pa)(struct snd_soc_codec *codec,
int enable), struct snd_soc_codec *codec)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc;
+ struct sdm660_cdc_priv *sdm660_cdc;
if (!codec) {
pr_err("%s: NULL codec pointer!\n", __func__);
return;
}
- msmfalcon_cdc = snd_soc_codec_get_drvdata(codec);
+ sdm660_cdc = snd_soc_codec_get_drvdata(codec);
dev_dbg(codec->dev, "%s: Enter\n", __func__);
- msmfalcon_cdc->codec_spk_ext_pa_cb = codec_spk_ext_pa;
+ sdm660_cdc->codec_spk_ext_pa_cb = codec_spk_ext_pa;
}
static void msm_anlg_cdc_compute_impedance(struct snd_soc_codec *codec, s16 l,
s16 r, uint32_t *zl, uint32_t *zr,
bool high)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
uint32_t rl = 0, rr = 0;
- struct wcd_imped_i_ref R = msmfalcon_cdc->imped_i_ref;
- int codec_ver = get_codec_version(msmfalcon_cdc);
+ struct wcd_imped_i_ref R = sdm660_cdc->imped_i_ref;
+ int codec_ver = get_codec_version(sdm660_cdc);
switch (codec_ver) {
case TOMBAK_1_0:
@@ -393,17 +393,17 @@
case CAJON_2_0:
case DIANGU:
case DRAX_CDC:
- if (msmfalcon_cdc->imped_det_pin == WCD_MBHC_DET_HPHL) {
+ if (sdm660_cdc->imped_det_pin == WCD_MBHC_DET_HPHL) {
rr = (uint32_t)(((DEFAULT_MULTIPLIER * (10 * r - 5)) -
(DEFAULT_OFFSET * DEFAULT_GAIN))/DEFAULT_GAIN);
rl = (uint32_t)(((10000 * (R.multiplier * (10 * l - 5)))
- R.offset * R.gain_adj)/(R.gain_adj * 100));
- } else if (msmfalcon_cdc->imped_det_pin == WCD_MBHC_DET_HPHR) {
+ } else if (sdm660_cdc->imped_det_pin == WCD_MBHC_DET_HPHR) {
rr = (uint32_t)(((10000 * (R.multiplier * (10 * r - 5)))
- R.offset * R.gain_adj)/(R.gain_adj * 100));
rl = (uint32_t)(((DEFAULT_MULTIPLIER * (10 * l - 5))-
(DEFAULT_OFFSET * DEFAULT_GAIN))/DEFAULT_GAIN);
- } else if (msmfalcon_cdc->imped_det_pin == WCD_MBHC_DET_NONE) {
+ } else if (sdm660_cdc->imped_det_pin == WCD_MBHC_DET_NONE) {
rr = (uint32_t)(((DEFAULT_MULTIPLIER * (10 * r - 5)) -
(DEFAULT_OFFSET * DEFAULT_GAIN))/DEFAULT_GAIN);
rl = (uint32_t)(((DEFAULT_MULTIPLIER * (10 * l - 5))-
@@ -427,7 +427,7 @@
struct wcd_mbhc *wcd_mbhc,
enum wcd_cal_type type)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc;
+ struct sdm660_cdc_priv *sdm660_cdc;
struct firmware_cal *hwdep_cal;
struct snd_soc_codec *codec = wcd_mbhc->codec;
@@ -435,8 +435,8 @@
pr_err("%s: NULL codec pointer\n", __func__);
return NULL;
}
- msmfalcon_cdc = snd_soc_codec_get_drvdata(codec);
- hwdep_cal = wcdcal_get_fw_cal(msmfalcon_cdc->fw_data, type);
+ sdm660_cdc = snd_soc_codec_get_drvdata(codec);
+ hwdep_cal = wcdcal_get_fw_cal(sdm660_cdc->fw_data, type);
if (!hwdep_cal) {
dev_err(codec->dev, "%s: cal not sent by %d\n",
__func__, type);
@@ -595,9 +595,9 @@
btn_voltage = ((is_micbias) ? btn_high : btn_low);
for (i = 0; i < num_btn; i++) {
- course = (btn_voltage[i] / MSMFALCON_CDC_MBHC_BTN_COARSE_ADJ);
- fine = ((btn_voltage[i] % MSMFALCON_CDC_MBHC_BTN_COARSE_ADJ) /
- MSMFALCON_CDC_MBHC_BTN_FINE_ADJ);
+ course = (btn_voltage[i] / SDM660_CDC_MBHC_BTN_COARSE_ADJ);
+ fine = ((btn_voltage[i] % SDM660_CDC_MBHC_BTN_COARSE_ADJ) /
+ SDM660_CDC_MBHC_BTN_FINE_ADJ);
reg_val = (course << 5) | (fine << 2);
snd_soc_update_bits(codec, reg_addr, 0xFC, reg_val);
@@ -612,7 +612,7 @@
uint32_t *zl, uint32_t *zr)
{
struct snd_soc_codec *codec = mbhc->codec;
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
s16 impedance_l, impedance_r;
s16 impedance_l_fixed;
@@ -627,7 +627,7 @@
reg3 = snd_soc_read(codec, MSM89XX_PMIC_ANALOG_MICB_2_EN);
reg4 = snd_soc_read(codec, MSM89XX_PMIC_ANALOG_MBHC_FSM_CTL);
- msmfalcon_cdc->imped_det_pin = WCD_MBHC_DET_BOTH;
+ sdm660_cdc->imped_det_pin = WCD_MBHC_DET_BOTH;
mbhc->hph_type = WCD_MBHC_HPH_NONE;
/* disable FSM and micbias and enable pullup*/
@@ -673,21 +673,21 @@
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_MBHC_BTN0_ZDETL_CTL,
0x03, 0x00);
- msmfalcon_cdc->imped_det_pin = (impedance_l > 2 &&
+ sdm660_cdc->imped_det_pin = (impedance_l > 2 &&
impedance_r > 2) ?
WCD_MBHC_DET_NONE :
((impedance_l > 2) ?
WCD_MBHC_DET_HPHR :
WCD_MBHC_DET_HPHL);
- if (msmfalcon_cdc->imped_det_pin == WCD_MBHC_DET_NONE)
+ if (sdm660_cdc->imped_det_pin == WCD_MBHC_DET_NONE)
goto exit;
} else {
- if (get_codec_version(msmfalcon_cdc) >= CAJON) {
+ if (get_codec_version(sdm660_cdc) >= CAJON) {
if (impedance_l == 63 && impedance_r == 63) {
dev_dbg(codec->dev,
"%s: HPHL and HPHR are floating\n",
__func__);
- msmfalcon_cdc->imped_det_pin =
+ sdm660_cdc->imped_det_pin =
WCD_MBHC_DET_NONE;
mbhc->hph_type = WCD_MBHC_HPH_NONE;
} else if (impedance_l == 63
@@ -695,7 +695,7 @@
dev_dbg(codec->dev,
"%s: Mono HS with HPHL floating\n",
__func__);
- msmfalcon_cdc->imped_det_pin =
+ sdm660_cdc->imped_det_pin =
WCD_MBHC_DET_HPHR;
mbhc->hph_type = WCD_MBHC_HPH_MONO;
} else if (impedance_r == 63 &&
@@ -703,7 +703,7 @@
dev_dbg(codec->dev,
"%s: Mono HS with HPHR floating\n",
__func__);
- msmfalcon_cdc->imped_det_pin =
+ sdm660_cdc->imped_det_pin =
WCD_MBHC_DET_HPHL;
mbhc->hph_type = WCD_MBHC_HPH_MONO;
} else if (impedance_l > 3 && impedance_r > 3 &&
@@ -717,7 +717,7 @@
dev_dbg(codec->dev,
"%s: Mono Headset\n",
__func__);
- msmfalcon_cdc->imped_det_pin =
+ sdm660_cdc->imped_det_pin =
WCD_MBHC_DET_NONE;
mbhc->hph_type =
WCD_MBHC_HPH_MONO;
@@ -725,7 +725,7 @@
dev_dbg(codec->dev,
"%s: STEREO headset is found\n",
__func__);
- msmfalcon_cdc->imped_det_pin =
+ sdm660_cdc->imped_det_pin =
WCD_MBHC_DET_BOTH;
mbhc->hph_type = WCD_MBHC_HPH_STEREO;
}
@@ -777,8 +777,8 @@
*/
if (!min_range_used ||
- msmfalcon_cdc->imped_det_pin == WCD_MBHC_DET_HPHL ||
- msmfalcon_cdc->imped_det_pin == WCD_MBHC_DET_HPHR)
+ sdm660_cdc->imped_det_pin == WCD_MBHC_DET_HPHL ||
+ sdm660_cdc->imped_det_pin == WCD_MBHC_DET_HPHR)
goto exit;
@@ -875,7 +875,7 @@
struct notifier_block *nblock,
bool enable)
{
- struct msmfalcon_cdc *handle_cdc = handle;
+ struct sdm660_cdc *handle_cdc = handle;
if (enable)
return blocking_notifier_chain_register(&handle_cdc->notifier,
@@ -889,15 +889,15 @@
bool enable)
{
struct snd_soc_codec *codec = wcd_mbhc->codec;
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
if (enable)
return blocking_notifier_chain_register(
- &msmfalcon_cdc->notifier,
+ &sdm660_cdc->notifier,
nblock);
- return blocking_notifier_chain_unregister(&msmfalcon_cdc->notifier,
+ return blocking_notifier_chain_unregister(&sdm660_cdc->notifier,
nblock);
}
@@ -945,27 +945,27 @@
static void msm_anlg_cdc_dig_notifier_call(struct snd_soc_codec *codec,
const enum dig_cdc_notify_event event)
{
- struct msmfalcon_cdc *msmfalcon_cdc = codec->control_data;
+ struct sdm660_cdc *sdm660_cdc = codec->control_data;
pr_debug("%s: notifier call event %d\n", __func__, event);
- blocking_notifier_call_chain(&msmfalcon_cdc->notifier,
+ blocking_notifier_call_chain(&sdm660_cdc->notifier,
event, NULL);
}
static void msm_anlg_cdc_notifier_call(struct snd_soc_codec *codec,
const enum wcd_notify_event event)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
dev_dbg(codec->dev, "%s: notifier call event %d\n", __func__, event);
- blocking_notifier_call_chain(&msmfalcon_cdc->notifier, event,
- &msmfalcon_cdc->mbhc);
+ blocking_notifier_call_chain(&sdm660_cdc->notifier, event,
+ &sdm660_cdc->mbhc);
}
static void msm_anlg_cdc_boost_on(struct snd_soc_codec *codec)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
snd_soc_update_bits(codec,
@@ -973,7 +973,7 @@
snd_soc_write(codec, MSM89XX_PMIC_ANALOG_SEC_ACCESS, 0xA5);
snd_soc_write(codec, MSM89XX_PMIC_ANALOG_PERPH_RESET_CTL3, 0x0F);
snd_soc_write(codec, MSM89XX_PMIC_ANALOG_MASTER_BIAS_CTL, 0x30);
- if (get_codec_version(msmfalcon_cdc) < CAJON_2_0)
+ if (get_codec_version(sdm660_cdc) < CAJON_2_0)
snd_soc_write(codec, MSM89XX_PMIC_ANALOG_CURRENT_LIMIT, 0x82);
else
snd_soc_write(codec, MSM89XX_PMIC_ANALOG_CURRENT_LIMIT, 0xA2);
@@ -987,7 +987,7 @@
0x03, 0x03);
snd_soc_update_bits(codec, MSM89XX_PMIC_ANALOG_SPKR_OCP_CTL,
0xE1, 0xE1);
- if (get_codec_version(msmfalcon_cdc) < CAJON_2_0) {
+ if (get_codec_version(sdm660_cdc) < CAJON_2_0) {
snd_soc_update_bits(codec, MSM89XX_PMIC_DIGITAL_CDC_DIG_CLK_CTL,
0x20, 0x20);
/* Wait for 1ms after clock ctl enable */
@@ -1021,10 +1021,10 @@
static void msm_anlg_cdc_bypass_on(struct snd_soc_codec *codec)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
- if (get_codec_version(msmfalcon_cdc) < CAJON_2_0) {
+ if (get_codec_version(sdm660_cdc) < CAJON_2_0) {
snd_soc_write(codec,
MSM89XX_PMIC_ANALOG_SEC_ACCESS,
0xA5);
@@ -1058,10 +1058,10 @@
static void msm_anlg_cdc_bypass_off(struct snd_soc_codec *codec)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
- if (get_codec_version(msmfalcon_cdc) < CAJON_2_0) {
+ if (get_codec_version(sdm660_cdc) < CAJON_2_0) {
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_BOOST_EN_CTL,
0x80, 0x00);
@@ -1087,13 +1087,13 @@
static void msm_anlg_cdc_boost_mode_sequence(struct snd_soc_codec *codec,
int flag)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
if (flag == EAR_PMU) {
- switch (msmfalcon_cdc->boost_option) {
+ switch (sdm660_cdc->boost_option) {
case BOOST_SWITCH:
- if (msmfalcon_cdc->ear_pa_boost_set) {
+ if (sdm660_cdc->ear_pa_boost_set) {
msm_anlg_cdc_boost_off(codec);
msm_anlg_cdc_bypass_on(codec);
}
@@ -1110,13 +1110,13 @@
default:
dev_err(codec->dev,
"%s: invalid boost option: %d\n", __func__,
- msmfalcon_cdc->boost_option);
+ sdm660_cdc->boost_option);
break;
}
} else if (flag == EAR_PMD) {
- switch (msmfalcon_cdc->boost_option) {
+ switch (sdm660_cdc->boost_option) {
case BOOST_SWITCH:
- if (msmfalcon_cdc->ear_pa_boost_set)
+ if (sdm660_cdc->ear_pa_boost_set)
msm_anlg_cdc_bypass_off(codec);
break;
case BOOST_ALWAYS:
@@ -1133,13 +1133,13 @@
default:
dev_err(codec->dev,
"%s: invalid boost option: %d\n", __func__,
- msmfalcon_cdc->boost_option);
+ sdm660_cdc->boost_option);
break;
}
} else if (flag == SPK_PMU) {
- switch (msmfalcon_cdc->boost_option) {
+ switch (sdm660_cdc->boost_option) {
case BOOST_SWITCH:
- if (msmfalcon_cdc->spk_boost_set) {
+ if (sdm660_cdc->spk_boost_set) {
msm_anlg_cdc_bypass_off(codec);
msm_anlg_cdc_boost_on(codec);
}
@@ -1156,13 +1156,13 @@
default:
dev_err(codec->dev,
"%s: invalid boost option: %d\n", __func__,
- msmfalcon_cdc->boost_option);
+ sdm660_cdc->boost_option);
break;
}
} else if (flag == SPK_PMD) {
- switch (msmfalcon_cdc->boost_option) {
+ switch (sdm660_cdc->boost_option) {
case BOOST_SWITCH:
- if (msmfalcon_cdc->spk_boost_set) {
+ if (sdm660_cdc->spk_boost_set) {
msm_anlg_cdc_boost_off(codec);
/*
* Add 40 ms sleep for the spk
@@ -1188,14 +1188,14 @@
default:
dev_err(codec->dev,
"%s: invalid boost option: %d\n", __func__,
- msmfalcon_cdc->boost_option);
+ sdm660_cdc->boost_option);
break;
}
}
}
static int msm_anlg_cdc_dt_parse_vreg_info(struct device *dev,
- struct msmfalcon_cdc_regulator *vreg, const char *vreg_name,
+ struct sdm660_cdc_regulator *vreg, const char *vreg_name,
bool ondemand)
{
int len, ret = 0;
@@ -1250,7 +1250,7 @@
static void msm_anlg_cdc_dt_parse_boost_info(struct snd_soc_codec *codec)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc_priv =
+ struct sdm660_cdc_priv *sdm660_cdc_priv =
snd_soc_codec_get_drvdata(codec);
const char *prop_name = "qcom,cdc-boost-voltage";
int boost_voltage, ret;
@@ -1269,7 +1269,7 @@
boost_voltage = DEFAULT_BOOST_VOLTAGE;
}
- msmfalcon_cdc_priv->boost_voltage =
+ sdm660_cdc_priv->boost_voltage =
VOLTAGE_CONVERTER(boost_voltage, MIN_BOOST_VOLTAGE,
BOOST_VOLTAGE_STEP);
dev_dbg(codec->dev, "Boost voltage value is: %d\n",
@@ -1291,10 +1291,10 @@
}
}
-static struct msmfalcon_cdc_pdata *msm_anlg_cdc_populate_dt_pdata(
+static struct sdm660_cdc_pdata *msm_anlg_cdc_populate_dt_pdata(
struct device *dev)
{
- struct msmfalcon_cdc_pdata *pdata;
+ struct sdm660_cdc_pdata *pdata;
int ret, static_cnt, ond_cnt, idx, i;
const char *name = NULL;
const char *static_prop_name = "qcom,cdc-static-supplies";
@@ -1384,7 +1384,7 @@
{
int ret = 0;
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
struct on_demand_supply *supply;
@@ -1396,9 +1396,9 @@
}
dev_dbg(codec->dev, "%s: supply: %s event: %d ref: %d\n",
__func__, on_demand_supply_name[w->shift], event,
- atomic_read(&msmfalcon_cdc->on_demand_list[w->shift].ref));
+ atomic_read(&sdm660_cdc->on_demand_list[w->shift].ref));
- supply = &msmfalcon_cdc->on_demand_list[w->shift];
+ supply = &sdm660_cdc->on_demand_list[w->shift];
WARN_ONCE(!supply->supply, "%s isn't defined\n",
on_demand_supply_name[w->shift]);
if (!supply->supply) {
@@ -1462,7 +1462,7 @@
int event)
{
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
dev_dbg(codec->dev, "%s: event = %d\n", __func__, event);
@@ -1474,7 +1474,7 @@
MSM89XX_PMIC_DIGITAL_CDC_DIG_CLK_CTL,
0x80, 0x80);
msm_anlg_cdc_boost_mode_sequence(codec, EAR_PMU);
- } else if (get_codec_version(msmfalcon_cdc) >= DIANGU) {
+ } else if (get_codec_version(sdm660_cdc) >= DIANGU) {
snd_soc_update_bits(codec,
MSM89XX_PMIC_DIGITAL_CDC_DIG_CLK_CTL,
0x80, 0x80);
@@ -1495,10 +1495,10 @@
snd_soc_update_bits(codec,
MSM89XX_PMIC_DIGITAL_CDC_DIG_CLK_CTL,
0x80, 0x00);
- if (msmfalcon_cdc->boost_option != BOOST_ALWAYS) {
+ if (sdm660_cdc->boost_option != BOOST_ALWAYS) {
dev_dbg(codec->dev,
"%s: boost_option:%d, tear down ear\n",
- __func__, msmfalcon_cdc->boost_option);
+ __func__, sdm660_cdc->boost_option);
msm_anlg_cdc_boost_mode_sequence(codec,
EAR_PMD);
}
@@ -1510,16 +1510,16 @@
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_RX_EAR_CTL, 0x80, 0x00);
} else {
- if (get_codec_version(msmfalcon_cdc) < DIANGU)
+ if (get_codec_version(sdm660_cdc) < DIANGU)
snd_soc_update_bits(codec,
MSM89XX_PMIC_DIGITAL_CDC_DIG_CLK_CTL,
0x40, 0x00);
- if (msmfalcon_cdc->rx_bias_count == 0)
+ if (sdm660_cdc->rx_bias_count == 0)
snd_soc_update_bits(codec,
MSM89XX_PMIC_DIGITAL_CDC_DIG_CLK_CTL,
0x80, 0x00);
dev_dbg(codec->dev, "%s: rx_bias_count = %d\n",
- __func__, msmfalcon_cdc->rx_bias_count);
+ __func__, sdm660_cdc->rx_bias_count);
}
break;
}
@@ -1530,13 +1530,13 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
ucontrol->value.integer.value[0] =
- (msmfalcon_cdc->ear_pa_boost_set ? 1 : 0);
- dev_dbg(codec->dev, "%s: msmfalcon_cdc->ear_pa_boost_set = %d\n",
- __func__, msmfalcon_cdc->ear_pa_boost_set);
+ (sdm660_cdc->ear_pa_boost_set ? 1 : 0);
+ dev_dbg(codec->dev, "%s: sdm660_cdc->ear_pa_boost_set = %d\n",
+ __func__, sdm660_cdc->ear_pa_boost_set);
return 0;
}
@@ -1544,12 +1544,12 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
dev_dbg(codec->dev, "%s: ucontrol->value.integer.value[0] = %ld\n",
__func__, ucontrol->value.integer.value[0]);
- msmfalcon_cdc->ear_pa_boost_set =
+ sdm660_cdc->ear_pa_boost_set =
(ucontrol->value.integer.value[0] ? true : false);
return 0;
}
@@ -1596,10 +1596,10 @@
{
u8 ear_pa_gain;
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
- if (get_codec_version(msmfalcon_cdc) >= DIANGU) {
+ if (get_codec_version(sdm660_cdc) >= DIANGU) {
ear_pa_gain = snd_soc_read(codec,
MSM89XX_PMIC_ANALOG_RX_COM_BIAS_DAC);
ear_pa_gain = (ear_pa_gain >> 1) & 0x3;
@@ -1643,13 +1643,13 @@
{
u8 ear_pa_gain;
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
dev_dbg(codec->dev, "%s: ucontrol->value.integer.value[0] = %ld\n",
__func__, ucontrol->value.integer.value[0]);
- if (get_codec_version(msmfalcon_cdc) >= DIANGU) {
+ if (get_codec_version(sdm660_cdc) >= DIANGU) {
switch (ucontrol->value.integer.value[0]) {
case 0:
ear_pa_gain = 0x06;
@@ -1691,20 +1691,20 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
- if (msmfalcon_cdc->hph_mode == NORMAL_MODE) {
+ if (sdm660_cdc->hph_mode == NORMAL_MODE) {
ucontrol->value.integer.value[0] = 0;
- } else if (msmfalcon_cdc->hph_mode == HD2_MODE) {
+ } else if (sdm660_cdc->hph_mode == HD2_MODE) {
ucontrol->value.integer.value[0] = 1;
} else {
dev_err(codec->dev, "%s: ERROR: Default HPH Mode= %d\n",
- __func__, msmfalcon_cdc->hph_mode);
+ __func__, sdm660_cdc->hph_mode);
}
- dev_dbg(codec->dev, "%s: msmfalcon_cdc->hph_mode = %d\n", __func__,
- msmfalcon_cdc->hph_mode);
+ dev_dbg(codec->dev, "%s: sdm660_cdc->hph_mode = %d\n", __func__,
+ sdm660_cdc->hph_mode);
return 0;
}
@@ -1712,7 +1712,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
dev_dbg(codec->dev, "%s: ucontrol->value.integer.value[0] = %ld\n",
@@ -1720,18 +1720,18 @@
switch (ucontrol->value.integer.value[0]) {
case 0:
- msmfalcon_cdc->hph_mode = NORMAL_MODE;
+ sdm660_cdc->hph_mode = NORMAL_MODE;
break;
case 1:
- if (get_codec_version(msmfalcon_cdc) >= DIANGU)
- msmfalcon_cdc->hph_mode = HD2_MODE;
+ if (get_codec_version(sdm660_cdc) >= DIANGU)
+ sdm660_cdc->hph_mode = HD2_MODE;
break;
default:
- msmfalcon_cdc->hph_mode = NORMAL_MODE;
+ sdm660_cdc->hph_mode = NORMAL_MODE;
break;
}
- dev_dbg(codec->dev, "%s: msmfalcon_cdc->hph_mode_set = %d\n",
- __func__, msmfalcon_cdc->hph_mode);
+ dev_dbg(codec->dev, "%s: sdm660_cdc->hph_mode_set = %d\n",
+ __func__, sdm660_cdc->hph_mode);
return 0;
}
@@ -1739,25 +1739,25 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
- if (msmfalcon_cdc->boost_option == BOOST_SWITCH) {
+ if (sdm660_cdc->boost_option == BOOST_SWITCH) {
ucontrol->value.integer.value[0] = 0;
- } else if (msmfalcon_cdc->boost_option == BOOST_ALWAYS) {
+ } else if (sdm660_cdc->boost_option == BOOST_ALWAYS) {
ucontrol->value.integer.value[0] = 1;
- } else if (msmfalcon_cdc->boost_option == BYPASS_ALWAYS) {
+ } else if (sdm660_cdc->boost_option == BYPASS_ALWAYS) {
ucontrol->value.integer.value[0] = 2;
- } else if (msmfalcon_cdc->boost_option == BOOST_ON_FOREVER) {
+ } else if (sdm660_cdc->boost_option == BOOST_ON_FOREVER) {
ucontrol->value.integer.value[0] = 3;
} else {
dev_err(codec->dev, "%s: ERROR: Unsupported Boost option= %d\n",
- __func__, msmfalcon_cdc->boost_option);
+ __func__, sdm660_cdc->boost_option);
return -EINVAL;
}
- dev_dbg(codec->dev, "%s: msmfalcon_cdc->boost_option = %d\n", __func__,
- msmfalcon_cdc->boost_option);
+ dev_dbg(codec->dev, "%s: sdm660_cdc->boost_option = %d\n", __func__,
+ sdm660_cdc->boost_option);
return 0;
}
@@ -1765,7 +1765,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
dev_dbg(codec->dev, "%s: ucontrol->value.integer.value[0] = %ld\n",
@@ -1773,26 +1773,26 @@
switch (ucontrol->value.integer.value[0]) {
case 0:
- msmfalcon_cdc->boost_option = BOOST_SWITCH;
+ sdm660_cdc->boost_option = BOOST_SWITCH;
break;
case 1:
- msmfalcon_cdc->boost_option = BOOST_ALWAYS;
+ sdm660_cdc->boost_option = BOOST_ALWAYS;
break;
case 2:
- msmfalcon_cdc->boost_option = BYPASS_ALWAYS;
+ sdm660_cdc->boost_option = BYPASS_ALWAYS;
msm_anlg_cdc_bypass_on(codec);
break;
case 3:
- msmfalcon_cdc->boost_option = BOOST_ON_FOREVER;
+ sdm660_cdc->boost_option = BOOST_ON_FOREVER;
msm_anlg_cdc_boost_on(codec);
break;
default:
pr_err("%s: invalid boost option: %d\n", __func__,
- msmfalcon_cdc->boost_option);
+ sdm660_cdc->boost_option);
return -EINVAL;
}
- dev_dbg(codec->dev, "%s: msmfalcon_cdc->boost_option_set = %d\n",
- __func__, msmfalcon_cdc->boost_option);
+ dev_dbg(codec->dev, "%s: sdm660_cdc->boost_option_set = %d\n",
+ __func__, sdm660_cdc->boost_option);
return 0;
}
@@ -1800,21 +1800,21 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
- if (msmfalcon_cdc->spk_boost_set == false) {
+ if (sdm660_cdc->spk_boost_set == false) {
ucontrol->value.integer.value[0] = 0;
- } else if (msmfalcon_cdc->spk_boost_set == true) {
+ } else if (sdm660_cdc->spk_boost_set == true) {
ucontrol->value.integer.value[0] = 1;
} else {
dev_err(codec->dev, "%s: ERROR: Unsupported Speaker Boost = %d\n",
- __func__, msmfalcon_cdc->spk_boost_set);
+ __func__, sdm660_cdc->spk_boost_set);
return -EINVAL;
}
- dev_dbg(codec->dev, "%s: msmfalcon_cdc->spk_boost_set = %d\n", __func__,
- msmfalcon_cdc->spk_boost_set);
+ dev_dbg(codec->dev, "%s: sdm660_cdc->spk_boost_set = %d\n", __func__,
+ sdm660_cdc->spk_boost_set);
return 0;
}
@@ -1822,7 +1822,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
dev_dbg(codec->dev, "%s: ucontrol->value.integer.value[0] = %ld\n",
@@ -1830,16 +1830,16 @@
switch (ucontrol->value.integer.value[0]) {
case 0:
- msmfalcon_cdc->spk_boost_set = false;
+ sdm660_cdc->spk_boost_set = false;
break;
case 1:
- msmfalcon_cdc->spk_boost_set = true;
+ sdm660_cdc->spk_boost_set = true;
break;
default:
return -EINVAL;
}
- dev_dbg(codec->dev, "%s: msmfalcon_cdc->spk_boost_set = %d\n",
- __func__, msmfalcon_cdc->spk_boost_set);
+ dev_dbg(codec->dev, "%s: sdm660_cdc->spk_boost_set = %d\n",
+ __func__, sdm660_cdc->spk_boost_set);
return 0;
}
@@ -1847,16 +1847,16 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
- if (msmfalcon_cdc->ext_spk_boost_set == false)
+ if (sdm660_cdc->ext_spk_boost_set == false)
ucontrol->value.integer.value[0] = 0;
else
ucontrol->value.integer.value[0] = 1;
- dev_dbg(codec->dev, "%s: msmfalcon_cdc->ext_spk_boost_set = %d\n",
- __func__, msmfalcon_cdc->ext_spk_boost_set);
+ dev_dbg(codec->dev, "%s: sdm660_cdc->ext_spk_boost_set = %d\n",
+ __func__, sdm660_cdc->ext_spk_boost_set);
return 0;
}
@@ -1864,7 +1864,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
dev_dbg(codec->dev, "%s: ucontrol->value.integer.value[0] = %ld\n",
@@ -1872,16 +1872,16 @@
switch (ucontrol->value.integer.value[0]) {
case 0:
- msmfalcon_cdc->ext_spk_boost_set = false;
+ sdm660_cdc->ext_spk_boost_set = false;
break;
case 1:
- msmfalcon_cdc->ext_spk_boost_set = true;
+ sdm660_cdc->ext_spk_boost_set = true;
break;
default:
return -EINVAL;
}
- dev_dbg(codec->dev, "%s: msmfalcon_cdc->spk_boost_set = %d\n",
- __func__, msmfalcon_cdc->spk_boost_set);
+ dev_dbg(codec->dev, "%s: sdm660_cdc->spk_boost_set = %d\n",
+ __func__, sdm660_cdc->spk_boost_set);
return 0;
}
@@ -1975,7 +1975,7 @@
bool hphr;
struct soc_multi_mixer_control *mc;
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
- struct msmfalcon_cdc_priv *priv = snd_soc_codec_get_drvdata(codec);
+ struct sdm660_cdc_priv *priv = snd_soc_codec_get_drvdata(codec);
mc = (struct soc_multi_mixer_control *)(kcontrol->private_value);
@@ -2000,12 +2000,12 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
- struct msmfalcon_cdc_priv *priv = snd_soc_codec_get_drvdata(codec);
+ struct sdm660_cdc_priv *priv = snd_soc_codec_get_drvdata(codec);
struct wcd_mbhc *mbhc;
if (!priv) {
dev_err(codec->dev,
- "%s: msmfalcon_cdc-wcd private data is NULL\n",
+ "%s: sdm660_cdc-wcd private data is NULL\n",
__func__);
return -EINVAL;
}
@@ -2129,7 +2129,7 @@
static void msm_anlg_cdc_codec_enable_adc_block(struct snd_soc_codec *codec,
int enable)
{
- struct msmfalcon_cdc_priv *wcd8x16 = snd_soc_codec_get_drvdata(codec);
+ struct sdm660_cdc_priv *wcd8x16 = snd_soc_codec_get_drvdata(codec);
dev_dbg(codec->dev, "%s %d\n", __func__, enable);
@@ -2238,7 +2238,7 @@
int event)
{
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
dev_dbg(codec->dev, "%s %d %s\n", __func__, event, w->name);
@@ -2248,9 +2248,9 @@
MSM89XX_PMIC_DIGITAL_CDC_ANA_CLK_CTL, 0x10, 0x10);
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_SPKR_PWRSTG_CTL, 0x01, 0x01);
- switch (msmfalcon_cdc->boost_option) {
+ switch (sdm660_cdc->boost_option) {
case BOOST_SWITCH:
- if (!msmfalcon_cdc->spk_boost_set)
+ if (!sdm660_cdc->spk_boost_set)
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_SPKR_DAC_CTL,
0x10, 0x10);
@@ -2266,23 +2266,23 @@
default:
dev_err(codec->dev,
"%s: invalid boost option: %d\n", __func__,
- msmfalcon_cdc->boost_option);
+ sdm660_cdc->boost_option);
break;
}
/* Wait for 1ms after SPK_DAC CTL setting */
usleep_range(CODEC_DELAY_1_MS, CODEC_DELAY_1_1_MS);
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_SPKR_PWRSTG_CTL, 0xE0, 0xE0);
- if (get_codec_version(msmfalcon_cdc) != TOMBAK_1_0)
+ if (get_codec_version(sdm660_cdc) != TOMBAK_1_0)
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_RX_EAR_CTL, 0x01, 0x01);
break;
case SND_SOC_DAPM_POST_PMU:
/* Wait for 1ms after SPK_VBAT_LDO Enable */
usleep_range(CODEC_DELAY_1_MS, CODEC_DELAY_1_1_MS);
- switch (msmfalcon_cdc->boost_option) {
+ switch (sdm660_cdc->boost_option) {
case BOOST_SWITCH:
- if (msmfalcon_cdc->spk_boost_set)
+ if (sdm660_cdc->spk_boost_set)
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_SPKR_DRV_CTL,
0xEF, 0xEF);
@@ -2304,7 +2304,7 @@
default:
dev_err(codec->dev,
"%s: invalid boost option: %d\n", __func__,
- msmfalcon_cdc->boost_option);
+ sdm660_cdc->boost_option);
break;
}
msm_anlg_cdc_dig_notifier_call(codec,
@@ -2320,12 +2320,12 @@
usleep_range(CODEC_DELAY_1_MS, CODEC_DELAY_1_1_MS);
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_SPKR_DAC_CTL, 0x10, 0x10);
- if (get_codec_version(msmfalcon_cdc) < CAJON_2_0)
+ if (get_codec_version(sdm660_cdc) < CAJON_2_0)
msm_anlg_cdc_boost_mode_sequence(codec, SPK_PMD);
snd_soc_update_bits(codec, w->reg, 0x80, 0x00);
- switch (msmfalcon_cdc->boost_option) {
+ switch (sdm660_cdc->boost_option) {
case BOOST_SWITCH:
- if (msmfalcon_cdc->spk_boost_set)
+ if (sdm660_cdc->spk_boost_set)
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_SPKR_DRV_CTL,
0xEF, 0x69);
@@ -2341,7 +2341,7 @@
default:
dev_err(codec->dev,
"%s: invalid boost option: %d\n", __func__,
- msmfalcon_cdc->boost_option);
+ sdm660_cdc->boost_option);
break;
}
break;
@@ -2354,12 +2354,12 @@
MSM89XX_PMIC_ANALOG_SPKR_PWRSTG_CTL, 0x01, 0x00);
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_SPKR_DAC_CTL, 0x10, 0x00);
- if (get_codec_version(msmfalcon_cdc) != TOMBAK_1_0)
+ if (get_codec_version(sdm660_cdc) != TOMBAK_1_0)
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_RX_EAR_CTL, 0x01, 0x00);
snd_soc_update_bits(codec,
MSM89XX_PMIC_DIGITAL_CDC_ANA_CLK_CTL, 0x10, 0x00);
- if (get_codec_version(msmfalcon_cdc) >= CAJON_2_0)
+ if (get_codec_version(sdm660_cdc) >= CAJON_2_0)
msm_anlg_cdc_boost_mode_sequence(codec, SPK_PMD);
break;
}
@@ -2371,7 +2371,7 @@
int event)
{
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
struct msm_asoc_mach_data *pdata = NULL;
@@ -2385,7 +2385,7 @@
snd_soc_update_bits(codec, w->reg, 0x80, 0x80);
break;
case SND_SOC_DAPM_POST_PMD:
- if (msmfalcon_cdc->rx_bias_count == 0)
+ if (sdm660_cdc->rx_bias_count == 0)
snd_soc_update_bits(codec,
MSM89XX_PMIC_DIGITAL_CDC_DIG_CLK_CTL,
0x80, 0x00);
@@ -2397,10 +2397,10 @@
static bool msm_anlg_cdc_use_mb(struct snd_soc_codec *codec)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
- if (get_codec_version(msmfalcon_cdc) < CAJON)
+ if (get_codec_version(sdm660_cdc) < CAJON)
return true;
else
return false;
@@ -2409,10 +2409,10 @@
static void msm_anlg_cdc_set_auto_zeroing(struct snd_soc_codec *codec,
bool enable)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
- if (get_codec_version(msmfalcon_cdc) < CONGA) {
+ if (get_codec_version(sdm660_cdc) < CONGA) {
if (enable)
/*
* Set autozeroing for special headset detection and
@@ -2435,10 +2435,10 @@
static void msm_anlg_cdc_trim_btn_reg(struct snd_soc_codec *codec)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
- if (get_codec_version(msmfalcon_cdc) == TOMBAK_1_0) {
+ if (get_codec_version(sdm660_cdc) == TOMBAK_1_0) {
pr_debug("%s: This device needs to be trimmed\n", __func__);
/*
* Calculate the trim value for each device used
@@ -2498,7 +2498,7 @@
int event)
{
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
u16 micb_int_reg;
char *internal1_text = "Internal1";
@@ -2525,7 +2525,7 @@
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
if (strnstr(w->name, internal1_text, strlen(w->name))) {
- if (get_codec_version(msmfalcon_cdc) >= CAJON)
+ if (get_codec_version(sdm660_cdc) >= CAJON)
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_TX_1_2_ATEST_CTL_2,
0x02, 0x02);
@@ -2538,7 +2538,7 @@
/*
* update MSM89XX_PMIC_ANALOG_TX_1_2_ATEST_CTL_2
* for external bias only, not for external2.
- */
+ */
} else if (!strnstr(w->name, external2_text, strlen(w->name)) &&
strnstr(w->name, external_text,
strlen(w->name))) {
@@ -2554,7 +2554,7 @@
break;
case SND_SOC_DAPM_POST_PMU:
- if (get_codec_version(msmfalcon_cdc) <= TOMBAK_2_0)
+ if (get_codec_version(sdm660_cdc) <= TOMBAK_2_0)
/*
* Wait for 20ms post micbias enable
* for version < tombak 2.0.
@@ -2599,7 +2599,7 @@
static void update_clkdiv(void *handle, int val)
{
- struct msmfalcon_cdc *handle_cdc = handle;
+ struct sdm660_cdc *handle_cdc = handle;
struct snd_soc_codec *codec = handle_cdc->codec;
snd_soc_update_bits(codec,
@@ -2609,24 +2609,24 @@
static int get_cdc_version(void *handle)
{
- struct msmfalcon_cdc *handle_cdc = handle;
+ struct sdm660_cdc *handle_cdc = handle;
struct snd_soc_codec *codec = handle_cdc->codec;
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
- return get_codec_version(msmfalcon_cdc);
+ return get_codec_version(sdm660_cdc);
}
-static int msmfalcon_wcd_codec_enable_vdd_spkr(struct snd_soc_dapm_widget *w,
+static int sdm660_wcd_codec_enable_vdd_spkr(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol,
int event)
{
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
int ret = 0;
- if (!msmfalcon_cdc->ext_spk_boost_set) {
+ if (!sdm660_cdc->ext_spk_boost_set) {
dev_dbg(codec->dev, "%s: ext_boost not supported/disabled\n",
__func__);
return 0;
@@ -2634,8 +2634,8 @@
dev_dbg(codec->dev, "%s: %s %d\n", __func__, w->name, event);
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
- if (msmfalcon_cdc->spkdrv_reg) {
- ret = regulator_enable(msmfalcon_cdc->spkdrv_reg);
+ if (sdm660_cdc->spkdrv_reg) {
+ ret = regulator_enable(sdm660_cdc->spkdrv_reg);
if (ret)
dev_err(codec->dev,
"%s Failed to enable spkdrv reg %s\n",
@@ -2643,8 +2643,8 @@
}
break;
case SND_SOC_DAPM_POST_PMD:
- if (msmfalcon_cdc->spkdrv_reg) {
- ret = regulator_disable(msmfalcon_cdc->spkdrv_reg);
+ if (sdm660_cdc->spkdrv_reg) {
+ ret = regulator_disable(sdm660_cdc->spkdrv_reg);
if (ret)
dev_err(codec->dev,
"%s: Failed to disable spkdrv_reg %s\n",
@@ -2662,15 +2662,15 @@
int event)
{
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
dev_dbg(codec->dev, "%s %d\n", __func__, event);
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
- msmfalcon_cdc->rx_bias_count++;
- if (msmfalcon_cdc->rx_bias_count == 1) {
+ sdm660_cdc->rx_bias_count++;
+ if (sdm660_cdc->rx_bias_count == 1) {
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_RX_COM_BIAS_DAC,
0x80, 0x80);
@@ -2680,8 +2680,8 @@
}
break;
case SND_SOC_DAPM_POST_PMD:
- msmfalcon_cdc->rx_bias_count--;
- if (msmfalcon_cdc->rx_bias_count == 0) {
+ sdm660_cdc->rx_bias_count--;
+ if (sdm660_cdc->rx_bias_count == 0) {
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_RX_COM_BIAS_DAC,
0x01, 0x00);
@@ -2692,7 +2692,7 @@
break;
}
dev_dbg(codec->dev, "%s rx_bias_count = %d\n",
- __func__, msmfalcon_cdc->rx_bias_count);
+ __func__, sdm660_cdc->rx_bias_count);
return 0;
}
@@ -2716,7 +2716,7 @@
{
uint32_t value;
int codec_version;
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
value = wcd_get_impedance_value(imped);
@@ -2728,7 +2728,7 @@
return;
}
- codec_version = get_codec_version(msmfalcon_cdc);
+ codec_version = get_codec_version(sdm660_cdc);
if (set_gain) {
switch (codec_version) {
@@ -2789,22 +2789,22 @@
{
uint32_t impedl, impedr;
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
int ret;
dev_dbg(codec->dev, "%s %s %d\n", __func__, w->name, event);
- ret = wcd_mbhc_get_impedance(&msmfalcon_cdc->mbhc,
+ ret = wcd_mbhc_get_impedance(&sdm660_cdc->mbhc,
&impedl, &impedr);
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
- if (get_codec_version(msmfalcon_cdc) > CAJON)
+ if (get_codec_version(sdm660_cdc) > CAJON)
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_RX_HPH_CNP_EN,
0x08, 0x08);
- if (get_codec_version(msmfalcon_cdc) == CAJON ||
- get_codec_version(msmfalcon_cdc) == CAJON_2_0) {
+ if (get_codec_version(sdm660_cdc) == CAJON ||
+ get_codec_version(sdm660_cdc) == CAJON_2_0) {
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_RX_HPH_L_TEST,
0x80, 0x80);
@@ -2812,11 +2812,11 @@
MSM89XX_PMIC_ANALOG_RX_HPH_R_TEST,
0x80, 0x80);
}
- if (get_codec_version(msmfalcon_cdc) > CAJON)
+ if (get_codec_version(sdm660_cdc) > CAJON)
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_RX_HPH_CNP_EN,
0x08, 0x00);
- if (msmfalcon_cdc->hph_mode == HD2_MODE)
+ if (sdm660_cdc->hph_mode == HD2_MODE)
msm_anlg_cdc_dig_notifier_call(codec,
DIG_CDC_EVENT_PRE_RX1_INT_ON);
snd_soc_update_bits(codec,
@@ -2841,7 +2841,7 @@
MSM89XX_PMIC_DIGITAL_CDC_ANA_CLK_CTL, 0x02, 0x00);
snd_soc_update_bits(codec,
MSM89XX_PMIC_DIGITAL_CDC_DIG_CLK_CTL, 0x01, 0x00);
- if (msmfalcon_cdc->hph_mode == HD2_MODE)
+ if (sdm660_cdc->hph_mode == HD2_MODE)
msm_anlg_cdc_dig_notifier_call(codec,
DIG_CDC_EVENT_POST_RX1_INT_OFF);
break;
@@ -2905,14 +2905,14 @@
int event)
{
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
dev_dbg(codec->dev, "%s %s %d\n", __func__, w->name, event);
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
- if (msmfalcon_cdc->hph_mode == HD2_MODE)
+ if (sdm660_cdc->hph_mode == HD2_MODE)
msm_anlg_cdc_dig_notifier_call(codec,
DIG_CDC_EVENT_PRE_RX2_INT_ON);
snd_soc_update_bits(codec,
@@ -2931,7 +2931,7 @@
MSM89XX_PMIC_DIGITAL_CDC_ANA_CLK_CTL, 0x01, 0x00);
snd_soc_update_bits(codec,
MSM89XX_PMIC_DIGITAL_CDC_DIG_CLK_CTL, 0x02, 0x00);
- if (msmfalcon_cdc->hph_mode == HD2_MODE)
+ if (sdm660_cdc->hph_mode == HD2_MODE)
msm_anlg_cdc_dig_notifier_call(codec,
DIG_CDC_EVENT_POST_RX2_INT_OFF);
break;
@@ -2944,7 +2944,7 @@
int event)
{
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
dev_dbg(codec->dev, "%s: %s event = %d\n", __func__, w->name, event);
@@ -2997,7 +2997,7 @@
msm_anlg_cdc_notifier_call(codec,
WCD_EVENT_PRE_HPHR_PA_OFF);
}
- if (get_codec_version(msmfalcon_cdc) >= CAJON) {
+ if (get_codec_version(sdm660_cdc) >= CAJON) {
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_RX_HPH_BIAS_CNP,
0xF0, 0x30);
@@ -3006,12 +3006,12 @@
case SND_SOC_DAPM_POST_PMD:
if (w->shift == 5) {
clear_bit(WCD_MBHC_HPHL_PA_OFF_ACK,
- &msmfalcon_cdc->mbhc.hph_pa_dac_state);
+ &sdm660_cdc->mbhc.hph_pa_dac_state);
msm_anlg_cdc_notifier_call(codec,
WCD_EVENT_POST_HPHL_PA_OFF);
} else if (w->shift == 4) {
clear_bit(WCD_MBHC_HPHR_PA_OFF_ACK,
- &msmfalcon_cdc->mbhc.hph_pa_dac_state);
+ &sdm660_cdc->mbhc.hph_pa_dac_state);
msm_anlg_cdc_notifier_call(codec,
WCD_EVENT_POST_HPHR_PA_OFF);
}
@@ -3106,7 +3106,7 @@
static int msm_anlg_cdc_startup(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(dai->codec);
dev_dbg(dai->codec->dev, "%s(): substream = %s stream = %d\n",
@@ -3116,7 +3116,7 @@
* If status_mask is BUS_DOWN it means SSR is not complete.
* So return error.
*/
- if (test_bit(BUS_DOWN, &msmfalcon_cdc->status_mask)) {
+ if (test_bit(BUS_DOWN, &sdm660_cdc->status_mask)) {
dev_err(dai->codec->dev, "Error, Device is not up post SSR\n");
return -EINVAL;
}
@@ -3134,20 +3134,20 @@
int msm_anlg_cdc_mclk_enable(struct snd_soc_codec *codec,
int mclk_enable, bool dapm)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
dev_dbg(codec->dev, "%s: mclk_enable = %u, dapm = %d\n",
__func__, mclk_enable, dapm);
if (mclk_enable) {
- msmfalcon_cdc->int_mclk0_enabled = true;
+ sdm660_cdc->int_mclk0_enabled = true;
msm_anlg_cdc_codec_enable_clock_block(codec, 1);
} else {
- if (!msmfalcon_cdc->int_mclk0_enabled) {
+ if (!sdm660_cdc->int_mclk0_enabled) {
dev_err(codec->dev, "Error, MCLK already diabled\n");
return -EINVAL;
}
- msmfalcon_cdc->int_mclk0_enabled = false;
+ sdm660_cdc->int_mclk0_enabled = false;
msm_anlg_cdc_codec_enable_clock_block(codec, 0);
}
return 0;
@@ -3199,8 +3199,8 @@
.id = AIF1_PB,
.playback = {
.stream_name = "Playback",
- .rates = MSMFALCON_CDC_RATES,
- .formats = MSMFALCON_CDC_FORMATS,
+ .rates = SDM660_CDC_RATES,
+ .formats = SDM660_CDC_FORMATS,
.rate_max = 192000,
.rate_min = 8000,
.channels_min = 1,
@@ -3213,8 +3213,8 @@
.id = AIF1_CAP,
.capture = {
.stream_name = "Record",
- .rates = MSMFALCON_CDC_RATES,
- .formats = MSMFALCON_CDC_FORMATS,
+ .rates = SDM660_CDC_RATES,
+ .formats = SDM660_CDC_FORMATS,
.rate_max = 48000,
.rate_min = 8000,
.channels_min = 1,
@@ -3227,8 +3227,8 @@
.id = AIF3_SVA,
.capture = {
.stream_name = "RecordSVA",
- .rates = MSMFALCON_CDC_RATES,
- .formats = MSMFALCON_CDC_FORMATS,
+ .rates = SDM660_CDC_RATES,
+ .formats = SDM660_CDC_FORMATS,
.rate_max = 48000,
.rate_min = 8000,
.channels_min = 1,
@@ -3241,8 +3241,8 @@
.id = AIF2_VIFEED,
.capture = {
.stream_name = "VIfeed",
- .rates = MSMFALCON_CDC_RATES,
- .formats = MSMFALCON_CDC_FORMATS,
+ .rates = SDM660_CDC_RATES,
+ .formats = SDM660_CDC_FORMATS,
.rate_max = 48000,
.rate_min = 48000,
.channels_min = 2,
@@ -3279,7 +3279,7 @@
int event)
{
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
dev_dbg(codec->dev, "%s: %s event = %d\n", __func__, w->name, event);
@@ -3287,14 +3287,14 @@
case SND_SOC_DAPM_POST_PMU:
dev_dbg(codec->dev,
"%s: enable external speaker PA\n", __func__);
- if (msmfalcon_cdc->codec_spk_ext_pa_cb)
- msmfalcon_cdc->codec_spk_ext_pa_cb(codec, 1);
+ if (sdm660_cdc->codec_spk_ext_pa_cb)
+ sdm660_cdc->codec_spk_ext_pa_cb(codec, 1);
break;
case SND_SOC_DAPM_PRE_PMD:
dev_dbg(codec->dev,
"%s: enable external speaker PA\n", __func__);
- if (msmfalcon_cdc->codec_spk_ext_pa_cb)
- msmfalcon_cdc->codec_spk_ext_pa_cb(codec, 0);
+ if (sdm660_cdc->codec_spk_ext_pa_cb)
+ sdm660_cdc->codec_spk_ext_pa_cb(codec, 0);
break;
}
return 0;
@@ -3305,7 +3305,7 @@
int event)
{
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
switch (event) {
@@ -3315,10 +3315,10 @@
__func__);
snd_soc_update_bits(codec, MSM89XX_PMIC_ANALOG_RX_EAR_CTL,
0x80, 0x80);
- if (get_codec_version(msmfalcon_cdc) < CONGA)
+ if (get_codec_version(sdm660_cdc) < CONGA)
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_RX_HPH_CNP_WG_TIME, 0xFF, 0x2A);
- if (get_codec_version(msmfalcon_cdc) >= DIANGU) {
+ if (get_codec_version(sdm660_cdc) >= DIANGU) {
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_RX_COM_BIAS_DAC, 0x08, 0x00);
snd_soc_update_bits(codec,
@@ -3343,13 +3343,13 @@
DIG_CDC_EVENT_RX1_MUTE_ON);
/* Wait for 20ms for RX digital mute to take effect */
msleep(20);
- if (msmfalcon_cdc->boost_option == BOOST_ALWAYS) {
+ if (sdm660_cdc->boost_option == BOOST_ALWAYS) {
dev_dbg(codec->dev,
"%s: boost_option:%d, tear down ear\n",
- __func__, msmfalcon_cdc->boost_option);
+ __func__, sdm660_cdc->boost_option);
msm_anlg_cdc_boost_mode_sequence(codec, EAR_PMD);
}
- if (get_codec_version(msmfalcon_cdc) >= DIANGU) {
+ if (get_codec_version(sdm660_cdc) >= DIANGU) {
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_RX_HPH_L_TEST, 0x04, 0x0);
snd_soc_update_bits(codec,
@@ -3364,10 +3364,10 @@
0x40, 0x00);
/* Wait for 7ms after EAR PA teardown */
usleep_range(7000, 7100);
- if (get_codec_version(msmfalcon_cdc) < CONGA)
+ if (get_codec_version(sdm660_cdc) < CONGA)
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_RX_HPH_CNP_WG_TIME, 0xFF, 0x16);
- if (get_codec_version(msmfalcon_cdc) >= DIANGU)
+ if (get_codec_version(sdm660_cdc) >= DIANGU)
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_RX_COM_BIAS_DAC, 0x08, 0x08);
break;
@@ -3452,7 +3452,7 @@
msm_anlg_cdc_codec_enable_rx_bias, SND_SOC_DAPM_PRE_PMU |
SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_SUPPLY("VDD_SPKDRV", SND_SOC_NOPM, 0, 0,
- msmfalcon_wcd_codec_enable_vdd_spkr,
+ sdm660_wcd_codec_enable_vdd_spkr,
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_SUPPLY("INT_LDO_H", SND_SOC_NOPM, 1, 0, NULL, 0),
SND_SOC_DAPM_SUPPLY("MICBIAS_REGULATOR", SND_SOC_NOPM,
@@ -3512,13 +3512,13 @@
SND_SOC_DAPM_OUTPUT("ADC3_OUT"),
};
-static const struct msmfalcon_cdc_reg_mask_val msm_anlg_cdc_reg_defaults[] = {
+static const struct sdm660_cdc_reg_mask_val msm_anlg_cdc_reg_defaults[] = {
MSM89XX_REG_VAL(MSM89XX_PMIC_ANALOG_SPKR_DAC_CTL, 0x03),
MSM89XX_REG_VAL(MSM89XX_PMIC_ANALOG_CURRENT_LIMIT, 0x82),
MSM89XX_REG_VAL(MSM89XX_PMIC_ANALOG_SPKR_OCP_CTL, 0xE1),
};
-static const struct msmfalcon_cdc_reg_mask_val
+static const struct sdm660_cdc_reg_mask_val
msm_anlg_cdc_reg_defaults_2_0[] = {
MSM89XX_REG_VAL(MSM89XX_PMIC_DIGITAL_SEC_ACCESS, 0xA5),
MSM89XX_REG_VAL(MSM89XX_PMIC_DIGITAL_PERPH_RESET_CTL3, 0x0F),
@@ -3536,7 +3536,7 @@
MSM89XX_REG_VAL(MSM89XX_PMIC_DIGITAL_CDC_RST_CTL, 0x80),
};
-static const struct msmfalcon_cdc_reg_mask_val conga_wcd_reg_defaults[] = {
+static const struct sdm660_cdc_reg_mask_val conga_wcd_reg_defaults[] = {
MSM89XX_REG_VAL(MSM89XX_PMIC_DIGITAL_SEC_ACCESS, 0xA5),
MSM89XX_REG_VAL(MSM89XX_PMIC_DIGITAL_PERPH_RESET_CTL3, 0x0F),
MSM89XX_REG_VAL(MSM89XX_PMIC_ANALOG_SEC_ACCESS, 0xA5),
@@ -3551,7 +3551,7 @@
MSM89XX_REG_VAL(MSM89XX_PMIC_DIGITAL_CDC_RST_CTL, 0x80),
};
-static const struct msmfalcon_cdc_reg_mask_val cajon_wcd_reg_defaults[] = {
+static const struct sdm660_cdc_reg_mask_val cajon_wcd_reg_defaults[] = {
MSM89XX_REG_VAL(MSM89XX_PMIC_DIGITAL_SEC_ACCESS, 0xA5),
MSM89XX_REG_VAL(MSM89XX_PMIC_DIGITAL_PERPH_RESET_CTL3, 0x0F),
MSM89XX_REG_VAL(MSM89XX_PMIC_ANALOG_SEC_ACCESS, 0xA5),
@@ -3569,7 +3569,7 @@
MSM89XX_REG_VAL(MSM89XX_PMIC_DIGITAL_CDC_RST_CTL, 0x80),
};
-static const struct msmfalcon_cdc_reg_mask_val cajon2p0_wcd_reg_defaults[] = {
+static const struct sdm660_cdc_reg_mask_val cajon2p0_wcd_reg_defaults[] = {
MSM89XX_REG_VAL(MSM89XX_PMIC_DIGITAL_SEC_ACCESS, 0xA5),
MSM89XX_REG_VAL(MSM89XX_PMIC_DIGITAL_PERPH_RESET_CTL3, 0x0F),
MSM89XX_REG_VAL(MSM89XX_PMIC_ANALOG_SEC_ACCESS, 0xA5),
@@ -3592,10 +3592,10 @@
static void msm_anlg_cdc_update_reg_defaults(struct snd_soc_codec *codec)
{
u32 i, version;
- struct msmfalcon_cdc_priv *msmfalcon_cdc =
+ struct sdm660_cdc_priv *sdm660_cdc =
snd_soc_codec_get_drvdata(codec);
- version = get_codec_version(msmfalcon_cdc);
+ version = get_codec_version(sdm660_cdc);
if (version == TOMBAK_1_0) {
for (i = 0; i < ARRAY_SIZE(msm_anlg_cdc_reg_defaults); i++)
snd_soc_write(codec, msm_anlg_cdc_reg_defaults[i].reg,
@@ -3624,7 +3624,7 @@
}
}
-static const struct msmfalcon_cdc_reg_mask_val
+static const struct sdm660_cdc_reg_mask_val
msm_anlg_cdc_codec_reg_init_val[] = {
/* Initialize current threshold to 350MA
@@ -3679,18 +3679,18 @@
}
static struct regulator *msm_anlg_cdc_find_regulator(
- const struct msmfalcon_cdc *msmfalcon_cdc,
+ const struct sdm660_cdc *sdm660_cdc,
const char *name)
{
int i;
- for (i = 0; i < msmfalcon_cdc->num_of_supplies; i++) {
- if (msmfalcon_cdc->supplies[i].supply &&
- !strcmp(msmfalcon_cdc->supplies[i].supply, name))
- return msmfalcon_cdc->supplies[i].consumer;
+ for (i = 0; i < sdm660_cdc->num_of_supplies; i++) {
+ if (sdm660_cdc->supplies[i].supply &&
+ !strcmp(sdm660_cdc->supplies[i].supply, name))
+ return sdm660_cdc->supplies[i].consumer;
}
- dev_err(msmfalcon_cdc->dev, "Error: regulator not found:%s\n"
+ dev_err(sdm660_cdc->dev, "Error: regulator not found:%s\n"
, name);
return NULL;
}
@@ -3698,7 +3698,7 @@
static int msm_anlg_cdc_device_down(struct snd_soc_codec *codec)
{
struct msm_asoc_mach_data *pdata = NULL;
- struct msmfalcon_cdc_priv *msmfalcon_cdc_priv =
+ struct sdm660_cdc_priv *sdm660_cdc_priv =
snd_soc_codec_get_drvdata(codec);
unsigned int tx_1_en;
unsigned int tx_2_en;
@@ -3714,7 +3714,7 @@
MSM89XX_PMIC_ANALOG_TX_1_EN, tx_1_en);
snd_soc_write(codec,
MSM89XX_PMIC_ANALOG_TX_2_EN, tx_2_en);
- if (msmfalcon_cdc_priv->boost_option == BOOST_ON_FOREVER) {
+ if (sdm660_cdc_priv->boost_option == BOOST_ON_FOREVER) {
if ((snd_soc_read(codec, MSM89XX_PMIC_ANALOG_SPKR_DRV_CTL)
& 0x80) == 0) {
msm_anlg_cdc_dig_notifier_call(codec,
@@ -3752,7 +3752,7 @@
}
}
msm_anlg_cdc_boost_off(codec);
- msmfalcon_cdc_priv->hph_mode = NORMAL_MODE;
+ sdm660_cdc_priv->hph_mode = NORMAL_MODE;
/* 40ms to allow boost to discharge */
msleep(40);
@@ -3773,21 +3773,21 @@
msm_anlg_cdc_bringup(codec);
atomic_set(&pdata->int_mclk0_enabled, false);
msm_anlg_cdc_dig_notifier_call(codec, DIG_CDC_EVENT_SSR_DOWN);
- set_bit(BUS_DOWN, &msmfalcon_cdc_priv->status_mask);
+ set_bit(BUS_DOWN, &sdm660_cdc_priv->status_mask);
snd_soc_card_change_online_state(codec->component.card, 0);
return 0;
}
static int msm_anlg_cdc_device_up(struct snd_soc_codec *codec)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc_priv =
+ struct sdm660_cdc_priv *sdm660_cdc_priv =
snd_soc_codec_get_drvdata(codec);
int ret = 0;
dev_dbg(codec->dev, "%s: device up!\n", __func__);
msm_anlg_cdc_dig_notifier_call(codec, DIG_CDC_EVENT_SSR_UP);
- clear_bit(BUS_DOWN, &msmfalcon_cdc_priv->status_mask);
+ clear_bit(BUS_DOWN, &sdm660_cdc_priv->status_mask);
snd_soc_card_change_online_state(codec->component.card, 1);
/* delay is required to make sure sound card state updated */
usleep_range(5000, 5100);
@@ -3807,38 +3807,38 @@
msm_anlg_cdc_set_boost_v(codec);
msm_anlg_cdc_set_micb_v(codec);
- if (msmfalcon_cdc_priv->boost_option == BOOST_ON_FOREVER)
+ if (sdm660_cdc_priv->boost_option == BOOST_ON_FOREVER)
msm_anlg_cdc_boost_on(codec);
- else if (msmfalcon_cdc_priv->boost_option == BYPASS_ALWAYS)
+ else if (sdm660_cdc_priv->boost_option == BYPASS_ALWAYS)
msm_anlg_cdc_bypass_on(codec);
msm_anlg_cdc_configure_cap(codec, false, false);
- wcd_mbhc_stop(&msmfalcon_cdc_priv->mbhc);
- wcd_mbhc_deinit(&msmfalcon_cdc_priv->mbhc);
- ret = wcd_mbhc_init(&msmfalcon_cdc_priv->mbhc, codec, &mbhc_cb,
+ wcd_mbhc_stop(&sdm660_cdc_priv->mbhc);
+ wcd_mbhc_deinit(&sdm660_cdc_priv->mbhc);
+ ret = wcd_mbhc_init(&sdm660_cdc_priv->mbhc, codec, &mbhc_cb,
&intr_ids, wcd_mbhc_registers, true);
if (ret)
dev_err(codec->dev, "%s: mbhc initialization failed\n",
__func__);
else
- wcd_mbhc_start(&msmfalcon_cdc_priv->mbhc,
- msmfalcon_cdc_priv->mbhc.mbhc_cfg);
+ wcd_mbhc_start(&sdm660_cdc_priv->mbhc,
+ sdm660_cdc_priv->mbhc.mbhc_cfg);
return 0;
}
-static int msmfalcon_cdc_notifier_service_cb(struct notifier_block *nb,
+static int sdm660_cdc_notifier_service_cb(struct notifier_block *nb,
unsigned long opcode, void *ptr)
{
struct snd_soc_codec *codec;
- struct msmfalcon_cdc_priv *msmfalcon_cdc_priv =
- container_of(nb, struct msmfalcon_cdc_priv,
+ struct sdm660_cdc_priv *sdm660_cdc_priv =
+ container_of(nb, struct sdm660_cdc_priv,
audio_ssr_nb);
bool adsp_ready = false;
bool timedout;
unsigned long timeout;
- codec = msmfalcon_cdc_priv->codec;
+ codec = sdm660_cdc_priv->codec;
dev_dbg(codec->dev, "%s: Service opcode 0x%lx\n", __func__, opcode);
switch (opcode) {
@@ -3888,19 +3888,19 @@
int msm_anlg_cdc_hs_detect(struct snd_soc_codec *codec,
struct wcd_mbhc_config *mbhc_cfg)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc_priv =
+ struct sdm660_cdc_priv *sdm660_cdc_priv =
snd_soc_codec_get_drvdata(codec);
- return wcd_mbhc_start(&msmfalcon_cdc_priv->mbhc, mbhc_cfg);
+ return wcd_mbhc_start(&sdm660_cdc_priv->mbhc, mbhc_cfg);
}
EXPORT_SYMBOL(msm_anlg_cdc_hs_detect);
void msm_anlg_cdc_hs_detect_exit(struct snd_soc_codec *codec)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc_priv =
+ struct sdm660_cdc_priv *sdm660_cdc_priv =
snd_soc_codec_get_drvdata(codec);
- wcd_mbhc_stop(&msmfalcon_cdc_priv->mbhc);
+ wcd_mbhc_stop(&sdm660_cdc_priv->mbhc);
}
EXPORT_SYMBOL(msm_anlg_cdc_hs_detect_exit);
@@ -3914,8 +3914,8 @@
static void msm_anlg_cdc_set_micb_v(struct snd_soc_codec *codec)
{
- struct msmfalcon_cdc *msmfalcon_cdc = codec->control_data;
- struct msmfalcon_cdc_pdata *pdata = msmfalcon_cdc->dev->platform_data;
+ struct sdm660_cdc *sdm660_cdc = codec->control_data;
+ struct sdm660_cdc_pdata *pdata = sdm660_cdc->dev->platform_data;
u8 reg_val;
reg_val = VOLTAGE_CONVERTER(pdata->micbias.cfilt1_mv, MICBIAS_MIN_VAL,
@@ -3928,11 +3928,11 @@
static void msm_anlg_cdc_set_boost_v(struct snd_soc_codec *codec)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc_priv =
+ struct sdm660_cdc_priv *sdm660_cdc_priv =
snd_soc_codec_get_drvdata(codec);
snd_soc_update_bits(codec, MSM89XX_PMIC_ANALOG_OUTPUT_VOLTAGE,
- 0x1F, msmfalcon_cdc_priv->boost_voltage);
+ 0x1F, sdm660_cdc_priv->boost_voltage);
}
static void msm_anlg_cdc_configure_cap(struct snd_soc_codec *codec,
@@ -3975,17 +3975,17 @@
char __user *buf, size_t count,
loff_t pos)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc_priv;
+ struct sdm660_cdc_priv *sdm660_cdc_priv;
char buffer[MSM_ANLG_CDC_VERSION_ENTRY_SIZE];
int len = 0;
- msmfalcon_cdc_priv = (struct msmfalcon_cdc_priv *) entry->private_data;
- if (!msmfalcon_cdc_priv) {
- pr_err("%s: msmfalcon_cdc_priv is null\n", __func__);
+ sdm660_cdc_priv = (struct sdm660_cdc_priv *) entry->private_data;
+ if (!sdm660_cdc_priv) {
+ pr_err("%s: sdm660_cdc_priv is null\n", __func__);
return -EINVAL;
}
- switch (get_codec_version(msmfalcon_cdc_priv)) {
+ switch (get_codec_version(sdm660_cdc_priv)) {
case DRAX_CDC:
len = snprintf(buffer, sizeof(buffer), "DRAX_CDC_1_0\n");
break;
@@ -4014,18 +4014,18 @@
struct snd_soc_codec *codec)
{
struct snd_info_entry *version_entry;
- struct msmfalcon_cdc_priv *msmfalcon_cdc_priv;
+ struct sdm660_cdc_priv *sdm660_cdc_priv;
struct snd_soc_card *card;
if (!codec_root || !codec)
return -EINVAL;
- msmfalcon_cdc_priv = snd_soc_codec_get_drvdata(codec);
+ sdm660_cdc_priv = snd_soc_codec_get_drvdata(codec);
card = codec->component.card;
- msmfalcon_cdc_priv->entry = snd_register_module_info(codec_root->module,
+ sdm660_cdc_priv->entry = snd_register_module_info(codec_root->module,
"pmic_analog",
codec_root);
- if (!msmfalcon_cdc_priv->entry) {
+ if (!sdm660_cdc_priv->entry) {
dev_dbg(codec->dev, "%s: failed to create pmic_analog entry\n",
__func__);
return -ENOMEM;
@@ -4033,14 +4033,14 @@
version_entry = snd_info_create_card_entry(card->snd_card,
"version",
- msmfalcon_cdc_priv->entry);
+ sdm660_cdc_priv->entry);
if (!version_entry) {
dev_dbg(codec->dev, "%s: failed to create pmic_analog version entry\n",
__func__);
return -ENOMEM;
}
- version_entry->private_data = msmfalcon_cdc_priv;
+ version_entry->private_data = sdm660_cdc_priv;
version_entry->size = MSM_ANLG_CDC_VERSION_ENTRY_SIZE;
version_entry->content = SNDRV_INFO_CONTENT_DATA;
version_entry->c.ops = &msm_anlg_codec_info_ops;
@@ -4049,70 +4049,70 @@
snd_info_free_entry(version_entry);
return -ENOMEM;
}
- msmfalcon_cdc_priv->version_entry = version_entry;
+ sdm660_cdc_priv->version_entry = version_entry;
return 0;
}
EXPORT_SYMBOL(msm_anlg_codec_info_create_codec_entry);
static int msm_anlg_cdc_soc_probe(struct snd_soc_codec *codec)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc_priv;
- struct msmfalcon_cdc *handle_cdc;
+ struct sdm660_cdc_priv *sdm660_cdc_priv;
+ struct sdm660_cdc *handle_cdc;
int ret;
- msmfalcon_cdc_priv = devm_kzalloc(codec->dev,
- sizeof(struct msmfalcon_cdc_priv),
+ sdm660_cdc_priv = devm_kzalloc(codec->dev,
+ sizeof(struct sdm660_cdc_priv),
GFP_KERNEL);
- if (!msmfalcon_cdc_priv)
+ if (!sdm660_cdc_priv)
return -ENOMEM;
codec->control_data = dev_get_drvdata(codec->dev);
- snd_soc_codec_set_drvdata(codec, msmfalcon_cdc_priv);
- msmfalcon_cdc_priv->codec = codec;
+ snd_soc_codec_set_drvdata(codec, sdm660_cdc_priv);
+ sdm660_cdc_priv->codec = codec;
handle_cdc = codec->control_data;
handle_cdc->codec = codec;
/* codec resmgr module init */
- msmfalcon_cdc_priv->spkdrv_reg =
+ sdm660_cdc_priv->spkdrv_reg =
msm_anlg_cdc_find_regulator(codec->control_data,
MSM89XX_VDD_SPKDRV_NAME);
- msmfalcon_cdc_priv->pmic_rev =
+ sdm660_cdc_priv->pmic_rev =
snd_soc_read(codec,
MSM89XX_PMIC_DIGITAL_REVISION1);
- msmfalcon_cdc_priv->codec_version =
+ sdm660_cdc_priv->codec_version =
snd_soc_read(codec,
MSM89XX_PMIC_DIGITAL_PERPH_SUBTYPE);
- msmfalcon_cdc_priv->analog_major_rev =
+ sdm660_cdc_priv->analog_major_rev =
snd_soc_read(codec,
MSM89XX_PMIC_ANALOG_REVISION4);
- if (msmfalcon_cdc_priv->codec_version == CONGA) {
+ if (sdm660_cdc_priv->codec_version == CONGA) {
dev_dbg(codec->dev, "%s :Conga REV: %d\n", __func__,
- msmfalcon_cdc_priv->codec_version);
- msmfalcon_cdc_priv->ext_spk_boost_set = true;
+ sdm660_cdc_priv->codec_version);
+ sdm660_cdc_priv->ext_spk_boost_set = true;
} else {
dev_dbg(codec->dev, "%s :PMIC REV: %d\n", __func__,
- msmfalcon_cdc_priv->pmic_rev);
- if (msmfalcon_cdc_priv->pmic_rev == TOMBAK_1_0 &&
- msmfalcon_cdc_priv->codec_version == CAJON_2_0) {
- if (msmfalcon_cdc_priv->analog_major_rev == 0x02) {
- msmfalcon_cdc_priv->codec_version = DRAX_CDC;
+ sdm660_cdc_priv->pmic_rev);
+ if (sdm660_cdc_priv->pmic_rev == TOMBAK_1_0 &&
+ sdm660_cdc_priv->codec_version == CAJON_2_0) {
+ if (sdm660_cdc_priv->analog_major_rev == 0x02) {
+ sdm660_cdc_priv->codec_version = DRAX_CDC;
dev_dbg(codec->dev,
"%s : Drax codec detected\n", __func__);
} else {
- msmfalcon_cdc_priv->codec_version = DIANGU;
+ sdm660_cdc_priv->codec_version = DIANGU;
dev_dbg(codec->dev, "%s : Diangu detected\n",
__func__);
}
- } else if (msmfalcon_cdc_priv->pmic_rev == TOMBAK_1_0 &&
+ } else if (sdm660_cdc_priv->pmic_rev == TOMBAK_1_0 &&
(snd_soc_read(codec, MSM89XX_PMIC_ANALOG_NCP_FBCTRL)
& 0x80)) {
- msmfalcon_cdc_priv->codec_version = CAJON;
+ sdm660_cdc_priv->codec_version = CAJON;
dev_dbg(codec->dev, "%s : Cajon detected\n", __func__);
- } else if (msmfalcon_cdc_priv->pmic_rev == TOMBAK_2_0 &&
+ } else if (sdm660_cdc_priv->pmic_rev == TOMBAK_2_0 &&
(snd_soc_read(codec, MSM89XX_PMIC_ANALOG_NCP_FBCTRL)
& 0x80)) {
- msmfalcon_cdc_priv->codec_version = CAJON_2_0;
+ sdm660_cdc_priv->codec_version = CAJON_2_0;
dev_dbg(codec->dev, "%s : Cajon 2.0 detected\n",
__func__);
}
@@ -4121,8 +4121,8 @@
* set to default boost option BOOST_SWITCH, user mixer path can change
* it to BOOST_ALWAYS or BOOST_BYPASS based on solution chosen.
*/
- msmfalcon_cdc_priv->boost_option = BOOST_SWITCH;
- msmfalcon_cdc_priv->hph_mode = NORMAL_MODE;
+ sdm660_cdc_priv->boost_option = BOOST_SWITCH;
+ sdm660_cdc_priv->hph_mode = NORMAL_MODE;
msm_anlg_cdc_dt_parse_boost_info(codec);
msm_anlg_cdc_set_boost_v(codec);
@@ -4139,52 +4139,52 @@
wcd9xxx_spmi_set_codec(codec);
- msmfalcon_cdc_priv->on_demand_list[ON_DEMAND_MICBIAS].supply =
+ sdm660_cdc_priv->on_demand_list[ON_DEMAND_MICBIAS].supply =
msm_anlg_cdc_find_regulator(
codec->control_data,
on_demand_supply_name[ON_DEMAND_MICBIAS]);
- atomic_set(&msmfalcon_cdc_priv->on_demand_list[ON_DEMAND_MICBIAS].ref,
+ atomic_set(&sdm660_cdc_priv->on_demand_list[ON_DEMAND_MICBIAS].ref,
0);
- BLOCKING_INIT_NOTIFIER_HEAD(&msmfalcon_cdc_priv->notifier);
+ BLOCKING_INIT_NOTIFIER_HEAD(&sdm660_cdc_priv->notifier);
- msmfalcon_cdc_priv->fw_data = devm_kzalloc(codec->dev,
- sizeof(*(msmfalcon_cdc_priv->fw_data)),
+ sdm660_cdc_priv->fw_data = devm_kzalloc(codec->dev,
+ sizeof(*(sdm660_cdc_priv->fw_data)),
GFP_KERNEL);
- if (!msmfalcon_cdc_priv->fw_data)
+ if (!sdm660_cdc_priv->fw_data)
return -ENOMEM;
- set_bit(WCD9XXX_MBHC_CAL, msmfalcon_cdc_priv->fw_data->cal_bit);
- ret = wcd_cal_create_hwdep(msmfalcon_cdc_priv->fw_data,
+ set_bit(WCD9XXX_MBHC_CAL, sdm660_cdc_priv->fw_data->cal_bit);
+ ret = wcd_cal_create_hwdep(sdm660_cdc_priv->fw_data,
WCD9XXX_CODEC_HWDEP_NODE, codec);
if (ret < 0) {
dev_err(codec->dev, "%s hwdep failed %d\n", __func__, ret);
return ret;
}
- wcd_mbhc_init(&msmfalcon_cdc_priv->mbhc, codec, &mbhc_cb, &intr_ids,
+ wcd_mbhc_init(&sdm660_cdc_priv->mbhc, codec, &mbhc_cb, &intr_ids,
wcd_mbhc_registers, true);
- msmfalcon_cdc_priv->int_mclk0_enabled = false;
+ sdm660_cdc_priv->int_mclk0_enabled = false;
/*Update speaker boost configuration*/
- msmfalcon_cdc_priv->spk_boost_set = spkr_boost_en;
+ sdm660_cdc_priv->spk_boost_set = spkr_boost_en;
pr_debug("%s: speaker boost configured = %d\n",
- __func__, msmfalcon_cdc_priv->spk_boost_set);
+ __func__, sdm660_cdc_priv->spk_boost_set);
/* Set initial MICBIAS voltage level */
msm_anlg_cdc_set_micb_v(codec);
/* Set initial cap mode */
msm_anlg_cdc_configure_cap(codec, false, false);
- msmfalcon_cdc_priv->audio_ssr_nb.notifier_call =
- msmfalcon_cdc_notifier_service_cb;
+ sdm660_cdc_priv->audio_ssr_nb.notifier_call =
+ sdm660_cdc_notifier_service_cb;
ret = audio_notifier_register("pmic_analog_cdc",
AUDIO_NOTIFIER_ADSP_DOMAIN,
- &msmfalcon_cdc_priv->audio_ssr_nb);
+ &sdm660_cdc_priv->audio_ssr_nb);
if (ret < 0) {
pr_err("%s: Audio notifier register failed ret = %d\n",
__func__, ret);
- wcd_mbhc_deinit(&msmfalcon_cdc_priv->mbhc);
+ wcd_mbhc_deinit(&sdm660_cdc_priv->mbhc);
return ret;
}
return 0;
@@ -4192,69 +4192,69 @@
static int msm_anlg_cdc_soc_remove(struct snd_soc_codec *codec)
{
- struct msmfalcon_cdc_priv *msmfalcon_cdc_priv =
+ struct sdm660_cdc_priv *sdm660_cdc_priv =
snd_soc_codec_get_drvdata(codec);
- msmfalcon_cdc_priv->spkdrv_reg = NULL;
- msmfalcon_cdc_priv->on_demand_list[ON_DEMAND_MICBIAS].supply = NULL;
- atomic_set(&msmfalcon_cdc_priv->on_demand_list[ON_DEMAND_MICBIAS].ref,
+ sdm660_cdc_priv->spkdrv_reg = NULL;
+ sdm660_cdc_priv->on_demand_list[ON_DEMAND_MICBIAS].supply = NULL;
+ atomic_set(&sdm660_cdc_priv->on_demand_list[ON_DEMAND_MICBIAS].ref,
0);
- wcd_mbhc_deinit(&msmfalcon_cdc_priv->mbhc);
+ wcd_mbhc_deinit(&sdm660_cdc_priv->mbhc);
return 0;
}
static int msm_anlg_cdc_enable_static_supplies_to_optimum(
- struct msmfalcon_cdc *msmfalcon_cdc,
- struct msmfalcon_cdc_pdata *pdata)
+ struct sdm660_cdc *sdm660_cdc,
+ struct sdm660_cdc_pdata *pdata)
{
int i;
int ret = 0;
- for (i = 0; i < msmfalcon_cdc->num_of_supplies; i++) {
+ for (i = 0; i < sdm660_cdc->num_of_supplies; i++) {
if (pdata->regulator[i].ondemand)
continue;
if (regulator_count_voltages(
- msmfalcon_cdc->supplies[i].consumer) <= 0)
+ sdm660_cdc->supplies[i].consumer) <= 0)
continue;
ret = regulator_set_voltage(
- msmfalcon_cdc->supplies[i].consumer,
+ sdm660_cdc->supplies[i].consumer,
pdata->regulator[i].min_uv,
pdata->regulator[i].max_uv);
if (ret) {
- dev_err(msmfalcon_cdc->dev,
+ dev_err(sdm660_cdc->dev,
"Setting volt failed for regulator %s err %d\n",
- msmfalcon_cdc->supplies[i].supply, ret);
+ sdm660_cdc->supplies[i].supply, ret);
}
- ret = regulator_set_load(msmfalcon_cdc->supplies[i].consumer,
+ ret = regulator_set_load(sdm660_cdc->supplies[i].consumer,
pdata->regulator[i].optimum_ua);
- dev_dbg(msmfalcon_cdc->dev, "Regulator %s set optimum mode\n",
- msmfalcon_cdc->supplies[i].supply);
+ dev_dbg(sdm660_cdc->dev, "Regulator %s set optimum mode\n",
+ sdm660_cdc->supplies[i].supply);
}
return ret;
}
static int msm_anlg_cdc_disable_static_supplies_to_optimum(
- struct msmfalcon_cdc *msmfalcon_cdc,
- struct msmfalcon_cdc_pdata *pdata)
+ struct sdm660_cdc *sdm660_cdc,
+ struct sdm660_cdc_pdata *pdata)
{
int i;
int ret = 0;
- for (i = 0; i < msmfalcon_cdc->num_of_supplies; i++) {
+ for (i = 0; i < sdm660_cdc->num_of_supplies; i++) {
if (pdata->regulator[i].ondemand)
continue;
if (regulator_count_voltages(
- msmfalcon_cdc->supplies[i].consumer) <= 0)
+ sdm660_cdc->supplies[i].consumer) <= 0)
continue;
- regulator_set_voltage(msmfalcon_cdc->supplies[i].consumer, 0,
+ regulator_set_voltage(sdm660_cdc->supplies[i].consumer, 0,
pdata->regulator[i].max_uv);
- regulator_set_load(msmfalcon_cdc->supplies[i].consumer, 0);
- dev_dbg(msmfalcon_cdc->dev, "Regulator %s set optimum mode\n",
- msmfalcon_cdc->supplies[i].supply);
+ regulator_set_load(sdm660_cdc->supplies[i].consumer, 0);
+ dev_dbg(sdm660_cdc->dev, "Regulator %s set optimum mode\n",
+ sdm660_cdc->supplies[i].supply);
}
return ret;
@@ -4263,9 +4263,9 @@
static int msm_anlg_cdc_suspend(struct snd_soc_codec *codec)
{
struct msm_asoc_mach_data *pdata = NULL;
- struct msmfalcon_cdc *msmfalcon_cdc = codec->control_data;
- struct msmfalcon_cdc_pdata *msmfalcon_cdc_pdata =
- msmfalcon_cdc->dev->platform_data;
+ struct sdm660_cdc *sdm660_cdc = codec->control_data;
+ struct sdm660_cdc_pdata *sdm660_cdc_pdata =
+ sdm660_cdc->dev->platform_data;
pdata = snd_soc_card_get_drvdata(codec->component.card);
pr_debug("%s: mclk cnt = %d, mclk_enabled = %d\n",
@@ -4280,21 +4280,21 @@
atomic_set(&pdata->int_mclk0_enabled, false);
mutex_unlock(&pdata->cdc_int_mclk0_mutex);
}
- msm_anlg_cdc_disable_static_supplies_to_optimum(msmfalcon_cdc,
- msmfalcon_cdc_pdata);
+ msm_anlg_cdc_disable_static_supplies_to_optimum(sdm660_cdc,
+ sdm660_cdc_pdata);
return 0;
}
static int msm_anlg_cdc_resume(struct snd_soc_codec *codec)
{
struct msm_asoc_mach_data *pdata = NULL;
- struct msmfalcon_cdc *msmfalcon_cdc = codec->control_data;
- struct msmfalcon_cdc_pdata *msmfalcon_cdc_pdata =
- msmfalcon_cdc->dev->platform_data;
+ struct sdm660_cdc *sdm660_cdc = codec->control_data;
+ struct sdm660_cdc_pdata *sdm660_cdc_pdata =
+ sdm660_cdc->dev->platform_data;
pdata = snd_soc_card_get_drvdata(codec->component.card);
- msm_anlg_cdc_enable_static_supplies_to_optimum(msmfalcon_cdc,
- msmfalcon_cdc_pdata);
+ msm_anlg_cdc_enable_static_supplies_to_optimum(sdm660_cdc,
+ sdm660_cdc_pdata);
return 0;
}
@@ -4303,7 +4303,7 @@
return dev_get_regmap(dev->parent, NULL);
}
-static struct snd_soc_codec_driver soc_codec_dev_msmfalcon_cdc = {
+static struct snd_soc_codec_driver soc_codec_dev_sdm660_cdc = {
.probe = msm_anlg_cdc_soc_probe,
.remove = msm_anlg_cdc_soc_remove,
.suspend = msm_anlg_cdc_suspend,
@@ -4318,24 +4318,24 @@
.get_regmap = msm_anlg_get_regmap,
};
-static int msm_anlg_cdc_init_supplies(struct msmfalcon_cdc *msmfalcon_cdc,
- struct msmfalcon_cdc_pdata *pdata)
+static int msm_anlg_cdc_init_supplies(struct sdm660_cdc *sdm660_cdc,
+ struct sdm660_cdc_pdata *pdata)
{
int ret;
int i;
- msmfalcon_cdc->supplies = devm_kzalloc(msmfalcon_cdc->dev,
+ sdm660_cdc->supplies = devm_kzalloc(sdm660_cdc->dev,
sizeof(struct regulator_bulk_data) *
ARRAY_SIZE(pdata->regulator),
GFP_KERNEL);
- if (!msmfalcon_cdc->supplies) {
+ if (!sdm660_cdc->supplies) {
ret = -ENOMEM;
goto err;
}
- msmfalcon_cdc->num_of_supplies = 0;
+ sdm660_cdc->num_of_supplies = 0;
if (ARRAY_SIZE(pdata->regulator) > MAX_REGULATOR) {
- dev_err(msmfalcon_cdc->dev, "%s: Array Size out of bound\n",
+ dev_err(sdm660_cdc->dev, "%s: Array Size out of bound\n",
__func__);
ret = -EINVAL;
goto err;
@@ -4343,41 +4343,41 @@
for (i = 0; i < ARRAY_SIZE(pdata->regulator); i++) {
if (pdata->regulator[i].name) {
- msmfalcon_cdc->supplies[i].supply =
+ sdm660_cdc->supplies[i].supply =
pdata->regulator[i].name;
- msmfalcon_cdc->num_of_supplies++;
+ sdm660_cdc->num_of_supplies++;
}
}
- ret = devm_regulator_bulk_get(msmfalcon_cdc->dev,
- msmfalcon_cdc->num_of_supplies,
- msmfalcon_cdc->supplies);
+ ret = devm_regulator_bulk_get(sdm660_cdc->dev,
+ sdm660_cdc->num_of_supplies,
+ sdm660_cdc->supplies);
if (ret != 0) {
- dev_err(msmfalcon_cdc->dev,
+ dev_err(sdm660_cdc->dev,
"Failed to get supplies: err = %d\n",
ret);
goto err_supplies;
}
- for (i = 0; i < msmfalcon_cdc->num_of_supplies; i++) {
+ for (i = 0; i < sdm660_cdc->num_of_supplies; i++) {
if (regulator_count_voltages(
- msmfalcon_cdc->supplies[i].consumer) <= 0)
+ sdm660_cdc->supplies[i].consumer) <= 0)
continue;
- ret = regulator_set_voltage(msmfalcon_cdc->supplies[i].consumer,
+ ret = regulator_set_voltage(sdm660_cdc->supplies[i].consumer,
pdata->regulator[i].min_uv,
pdata->regulator[i].max_uv);
if (ret) {
- dev_err(msmfalcon_cdc->dev,
+ dev_err(sdm660_cdc->dev,
"Setting regulator voltage failed for regulator %s err = %d\n",
- msmfalcon_cdc->supplies[i].supply, ret);
+ sdm660_cdc->supplies[i].supply, ret);
goto err_supplies;
}
- ret = regulator_set_load(msmfalcon_cdc->supplies[i].consumer,
+ ret = regulator_set_load(sdm660_cdc->supplies[i].consumer,
pdata->regulator[i].optimum_ua);
if (ret < 0) {
- dev_err(msmfalcon_cdc->dev,
+ dev_err(sdm660_cdc->dev,
"Setting regulator optimum mode failed for regulator %s err = %d\n",
- msmfalcon_cdc->supplies[i].supply, ret);
+ sdm660_cdc->supplies[i].supply, ret);
goto err_supplies;
} else {
ret = 0;
@@ -4387,65 +4387,65 @@
return ret;
err_supplies:
- kfree(msmfalcon_cdc->supplies);
+ kfree(sdm660_cdc->supplies);
err:
return ret;
}
static int msm_anlg_cdc_enable_static_supplies(
- struct msmfalcon_cdc *msmfalcon_cdc,
- struct msmfalcon_cdc_pdata *pdata)
+ struct sdm660_cdc *sdm660_cdc,
+ struct sdm660_cdc_pdata *pdata)
{
int i;
int ret = 0;
- for (i = 0; i < msmfalcon_cdc->num_of_supplies; i++) {
+ for (i = 0; i < sdm660_cdc->num_of_supplies; i++) {
if (pdata->regulator[i].ondemand)
continue;
- ret = regulator_enable(msmfalcon_cdc->supplies[i].consumer);
+ ret = regulator_enable(sdm660_cdc->supplies[i].consumer);
if (ret) {
- dev_err(msmfalcon_cdc->dev, "Failed to enable %s\n",
- msmfalcon_cdc->supplies[i].supply);
+ dev_err(sdm660_cdc->dev, "Failed to enable %s\n",
+ sdm660_cdc->supplies[i].supply);
break;
}
- dev_dbg(msmfalcon_cdc->dev, "Enabled regulator %s\n",
- msmfalcon_cdc->supplies[i].supply);
+ dev_dbg(sdm660_cdc->dev, "Enabled regulator %s\n",
+ sdm660_cdc->supplies[i].supply);
}
while (ret && --i)
if (!pdata->regulator[i].ondemand)
- regulator_disable(msmfalcon_cdc->supplies[i].consumer);
+ regulator_disable(sdm660_cdc->supplies[i].consumer);
return ret;
}
-static void msm_anlg_cdc_disable_supplies(struct msmfalcon_cdc *msmfalcon_cdc,
- struct msmfalcon_cdc_pdata *pdata)
+static void msm_anlg_cdc_disable_supplies(struct sdm660_cdc *sdm660_cdc,
+ struct sdm660_cdc_pdata *pdata)
{
int i;
- regulator_bulk_disable(msmfalcon_cdc->num_of_supplies,
- msmfalcon_cdc->supplies);
- for (i = 0; i < msmfalcon_cdc->num_of_supplies; i++) {
+ regulator_bulk_disable(sdm660_cdc->num_of_supplies,
+ sdm660_cdc->supplies);
+ for (i = 0; i < sdm660_cdc->num_of_supplies; i++) {
if (regulator_count_voltages(
- msmfalcon_cdc->supplies[i].consumer) <= 0)
+ sdm660_cdc->supplies[i].consumer) <= 0)
continue;
- regulator_set_voltage(msmfalcon_cdc->supplies[i].consumer, 0,
+ regulator_set_voltage(sdm660_cdc->supplies[i].consumer, 0,
pdata->regulator[i].max_uv);
- regulator_set_load(msmfalcon_cdc->supplies[i].consumer, 0);
+ regulator_set_load(sdm660_cdc->supplies[i].consumer, 0);
}
- regulator_bulk_free(msmfalcon_cdc->num_of_supplies,
- msmfalcon_cdc->supplies);
- kfree(msmfalcon_cdc->supplies);
+ regulator_bulk_free(sdm660_cdc->num_of_supplies,
+ sdm660_cdc->supplies);
+ kfree(sdm660_cdc->supplies);
}
-static const struct of_device_id msmfalcon_codec_of_match[] = {
+static const struct of_device_id sdm660_codec_of_match[] = {
{ .compatible = "qcom,pmic-analog-codec", },
{},
};
static void msm_anlg_add_child_devices(struct work_struct *work)
{
- struct msmfalcon_cdc *pdata;
+ struct sdm660_cdc *pdata;
struct platform_device *pdev;
struct device_node *node;
struct msm_dig_ctrl_data *dig_ctrl_data = NULL, *temp;
@@ -4453,7 +4453,7 @@
struct msm_dig_ctrl_platform_data *platdata;
char plat_dev_name[MSM_DIG_CDC_STRING_LEN];
- pdata = container_of(work, struct msmfalcon_cdc,
+ pdata = container_of(work, struct sdm660_cdc,
msm_anlg_add_child_devices_work);
if (!pdata) {
pr_err("%s: Memory for pdata does not exist\n",
@@ -4534,8 +4534,8 @@
static int msm_anlg_cdc_probe(struct platform_device *pdev)
{
int ret = 0;
- struct msmfalcon_cdc *msmfalcon_cdc = NULL;
- struct msmfalcon_cdc_pdata *pdata;
+ struct sdm660_cdc *sdm660_cdc = NULL;
+ struct sdm660_cdc_pdata *pdata;
int adsp_state;
adsp_state = apr_get_subsys_state();
@@ -4561,21 +4561,21 @@
__func__);
goto rtn;
}
- msmfalcon_cdc = devm_kzalloc(&pdev->dev, sizeof(struct msmfalcon_cdc),
+ sdm660_cdc = devm_kzalloc(&pdev->dev, sizeof(struct sdm660_cdc),
GFP_KERNEL);
- if (msmfalcon_cdc == NULL) {
+ if (sdm660_cdc == NULL) {
ret = -ENOMEM;
goto rtn;
}
- msmfalcon_cdc->dev = &pdev->dev;
- ret = msm_anlg_cdc_init_supplies(msmfalcon_cdc, pdata);
+ sdm660_cdc->dev = &pdev->dev;
+ ret = msm_anlg_cdc_init_supplies(sdm660_cdc, pdata);
if (ret) {
dev_err(&pdev->dev, "%s: Fail to enable Codec supplies\n",
__func__);
goto rtn;
}
- ret = msm_anlg_cdc_enable_static_supplies(msmfalcon_cdc, pdata);
+ ret = msm_anlg_cdc_enable_static_supplies(sdm660_cdc, pdata);
if (ret) {
dev_err(&pdev->dev,
"%s: Fail to enable Codec pre-reset supplies\n",
@@ -4585,7 +4585,7 @@
/* Allow supplies to be ready */
usleep_range(5, 6);
- dev_set_drvdata(&pdev->dev, msmfalcon_cdc);
+ dev_set_drvdata(&pdev->dev, sdm660_cdc);
if (wcd9xxx_spmi_irq_init()) {
dev_err(&pdev->dev,
"%s: irq initialization failed\n", __func__);
@@ -4595,7 +4595,7 @@
}
ret = snd_soc_register_codec(&pdev->dev,
- &soc_codec_dev_msmfalcon_cdc,
+ &soc_codec_dev_sdm660_cdc,
msm_anlg_cdc_i2s_dai,
ARRAY_SIZE(msm_anlg_cdc_i2s_dai));
if (ret) {
@@ -4604,29 +4604,29 @@
__func__, ret);
goto err_supplies;
}
- msmfalcon_cdc->dig_plat_data.handle = (void *) msmfalcon_cdc;
- msmfalcon_cdc->dig_plat_data.update_clkdiv = update_clkdiv;
- msmfalcon_cdc->dig_plat_data.get_cdc_version = get_cdc_version;
- msmfalcon_cdc->dig_plat_data.register_notifier =
+ sdm660_cdc->dig_plat_data.handle = (void *) sdm660_cdc;
+ sdm660_cdc->dig_plat_data.update_clkdiv = update_clkdiv;
+ sdm660_cdc->dig_plat_data.get_cdc_version = get_cdc_version;
+ sdm660_cdc->dig_plat_data.register_notifier =
msm_anlg_cdc_dig_register_notifier;
- INIT_WORK(&msmfalcon_cdc->msm_anlg_add_child_devices_work,
+ INIT_WORK(&sdm660_cdc->msm_anlg_add_child_devices_work,
msm_anlg_add_child_devices);
- schedule_work(&msmfalcon_cdc->msm_anlg_add_child_devices_work);
+ schedule_work(&sdm660_cdc->msm_anlg_add_child_devices_work);
return ret;
err_supplies:
- msm_anlg_cdc_disable_supplies(msmfalcon_cdc, pdata);
+ msm_anlg_cdc_disable_supplies(sdm660_cdc, pdata);
rtn:
return ret;
}
static int msm_anlg_cdc_remove(struct platform_device *pdev)
{
- struct msmfalcon_cdc *msmfalcon_cdc = dev_get_drvdata(&pdev->dev);
- struct msmfalcon_cdc_pdata *pdata = msmfalcon_cdc->dev->platform_data;
+ struct sdm660_cdc *sdm660_cdc = dev_get_drvdata(&pdev->dev);
+ struct sdm660_cdc_pdata *pdata = sdm660_cdc->dev->platform_data;
snd_soc_unregister_codec(&pdev->dev);
- msm_anlg_cdc_disable_supplies(msmfalcon_cdc, pdata);
+ msm_anlg_cdc_disable_supplies(sdm660_cdc, pdata);
return 0;
}
@@ -4634,7 +4634,7 @@
.driver = {
.owner = THIS_MODULE,
.name = DRV_NAME,
- .of_match_table = of_match_ptr(msmfalcon_codec_of_match)
+ .of_match_table = of_match_ptr(sdm660_codec_of_match)
},
.probe = msm_anlg_cdc_probe,
.remove = msm_anlg_cdc_remove,
diff --git a/sound/soc/codecs/msmfalcon_cdc/msm-analog-cdc.h b/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.h
similarity index 93%
rename from sound/soc/codecs/msmfalcon_cdc/msm-analog-cdc.h
rename to sound/soc/codecs/sdm660_cdc/msm-analog-cdc.h
index e618d2c..bb3af57 100644
--- a/sound/soc/codecs/msmfalcon_cdc/msm-analog-cdc.h
+++ b/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.h
@@ -17,7 +17,7 @@
#include <sound/q6afe-v2.h>
#include "../wcd-mbhc-v2.h"
#include "../wcdcal-hwdep.h"
-#include "msmfalcon-cdc-registers.h"
+#include "sdm660-cdc-registers.h"
#define MICBIAS_EXT_BYP_CAP 0x00
#define MICBIAS_NO_EXT_BYP_CAP 0x01
@@ -83,14 +83,14 @@
bool bias2_is_headset_only;
};
-enum msmfalcon_cdc_pid_current {
+enum sdm660_cdc_pid_current {
MSM89XX_PID_MIC_2P5_UA,
MSM89XX_PID_MIC_5_UA,
MSM89XX_PID_MIC_10_UA,
MSM89XX_PID_MIC_20_UA,
};
-struct msmfalcon_cdc_reg_mask_val {
+struct sdm660_cdc_reg_mask_val {
u16 reg;
u8 mask;
u8 val;
@@ -132,7 +132,7 @@
CODEC_DELAY_1_1_MS = 1100,
};
-struct msmfalcon_cdc_regulator {
+struct sdm660_cdc_regulator {
const char *name;
int min_uv;
int max_uv;
@@ -154,7 +154,7 @@
int offset;
};
-enum msmfalcon_cdc_micbias_num {
+enum sdm660_cdc_micbias_num {
MSM89XX_MICBIAS1 = 0,
};
@@ -172,7 +172,7 @@
bool enable);
};
-struct msmfalcon_cdc {
+struct sdm660_cdc {
struct device *dev;
u32 num_of_supplies;
struct regulator_bulk_data *supplies;
@@ -184,12 +184,12 @@
struct blocking_notifier_head notifier;
};
-struct msmfalcon_cdc_pdata {
+struct sdm660_cdc_pdata {
struct wcd_micbias_setting micbias;
- struct msmfalcon_cdc_regulator regulator[MAX_REGULATOR];
+ struct sdm660_cdc_regulator regulator[MAX_REGULATOR];
};
-struct msmfalcon_cdc_priv {
+struct sdm660_cdc_priv {
struct snd_soc_codec *codec;
u16 pmic_rev;
u16 codec_version;
@@ -230,7 +230,7 @@
extern void msm_anlg_cdc_hs_detect_exit(struct snd_soc_codec *codec);
-extern void msmfalcon_cdc_update_int_spk_boost(bool enable);
+extern void sdm660_cdc_update_int_spk_boost(bool enable);
extern void msm_anlg_cdc_spk_ext_pa_cb(
int (*codec_spk_ext_pa)(struct snd_soc_codec *codec,
diff --git a/sound/soc/codecs/msmfalcon_cdc/msm-cdc-common.h b/sound/soc/codecs/sdm660_cdc/msm-cdc-common.h
similarity index 97%
rename from sound/soc/codecs/msmfalcon_cdc/msm-cdc-common.h
rename to sound/soc/codecs/sdm660_cdc/msm-cdc-common.h
index e109d0c..95dbc76 100644
--- a/sound/soc/codecs/msmfalcon_cdc/msm-cdc-common.h
+++ b/sound/soc/codecs/sdm660_cdc/msm-cdc-common.h
@@ -11,7 +11,7 @@
*/
#include <linux/regmap.h>
-#include "msmfalcon-cdc-registers.h"
+#include "sdm660-cdc-registers.h"
extern struct reg_default
msm89xx_cdc_core_defaults[MSM89XX_CDC_CORE_CACHE_SIZE];
diff --git a/sound/soc/codecs/msmfalcon_cdc/msm-digital-cdc.c b/sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c
similarity index 99%
rename from sound/soc/codecs/msmfalcon_cdc/msm-digital-cdc.c
rename to sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c
index 1829f60..b18077c 100644
--- a/sound/soc/codecs/msmfalcon_cdc/msm-digital-cdc.c
+++ b/sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c
@@ -26,10 +26,10 @@
#include <sound/soc.h>
#include <sound/soc-dapm.h>
#include <sound/tlv.h>
-#include "msmfalcon-cdc-registers.h"
+#include "sdm660-cdc-registers.h"
#include "msm-digital-cdc.h"
#include "msm-cdc-common.h"
-#include "../../msm/msmfalcon-common.h"
+#include "../../msm/sdm660-common.h"
#define DRV_NAME "msm_digital_codec"
#define MCLK_RATE_9P6MHZ 9600000
diff --git a/sound/soc/codecs/msmfalcon_cdc/msm-digital-cdc.h b/sound/soc/codecs/sdm660_cdc/msm-digital-cdc.h
similarity index 100%
rename from sound/soc/codecs/msmfalcon_cdc/msm-digital-cdc.h
rename to sound/soc/codecs/sdm660_cdc/msm-digital-cdc.h
diff --git a/sound/soc/codecs/msmfalcon_cdc/msmfalcon-cdc-irq.c b/sound/soc/codecs/sdm660_cdc/sdm660-cdc-irq.c
similarity index 98%
rename from sound/soc/codecs/msmfalcon_cdc/msmfalcon-cdc-irq.c
rename to sound/soc/codecs/sdm660_cdc/sdm660-cdc-irq.c
index df8b001..b866d77 100644
--- a/sound/soc/codecs/msmfalcon_cdc/msmfalcon-cdc-irq.c
+++ b/sound/soc/codecs/sdm660_cdc/sdm660-cdc-irq.c
@@ -26,8 +26,8 @@
#include <soc/qcom/pm.h>
#include <sound/soc.h>
#include "msm-analog-cdc.h"
-#include "msmfalcon-cdc-irq.h"
-#include "msmfalcon-cdc-registers.h"
+#include "sdm660-cdc-irq.h"
+#include "sdm660-cdc-registers.h"
#define MAX_NUM_IRQS 14
#define NUM_IRQ_REGS 2
diff --git a/sound/soc/codecs/msmfalcon_cdc/msmfalcon-cdc-irq.h b/sound/soc/codecs/sdm660_cdc/sdm660-cdc-irq.h
similarity index 94%
rename from sound/soc/codecs/msmfalcon_cdc/msmfalcon-cdc-irq.h
rename to sound/soc/codecs/sdm660_cdc/sdm660-cdc-irq.h
index 3862865..24ab8ef 100644
--- a/sound/soc/codecs/msmfalcon_cdc/msmfalcon-cdc-irq.h
+++ b/sound/soc/codecs/sdm660_cdc/sdm660-cdc-irq.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2017 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
diff --git a/sound/soc/codecs/msmfalcon_cdc/msmfalcon-cdc-registers.h b/sound/soc/codecs/sdm660_cdc/sdm660-cdc-registers.h
similarity index 99%
rename from sound/soc/codecs/msmfalcon_cdc/msmfalcon-cdc-registers.h
rename to sound/soc/codecs/sdm660_cdc/sdm660-cdc-registers.h
index 6c7150a..1317ce1 100644
--- a/sound/soc/codecs/msmfalcon_cdc/msmfalcon-cdc-registers.h
+++ b/sound/soc/codecs/sdm660_cdc/sdm660-cdc-registers.h
@@ -9,8 +9,8 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-#ifndef MSMFALCON_WCD_REGISTERS_H
-#define MSMFALCON_WCD_REGISTERS_H
+#ifndef SDM660_WCD_REGISTERS_H
+#define SDM660_WCD_REGISTERS_H
#define CDC_DIG_BASE 0xF000
#define CDC_ANA_BASE 0xF100
diff --git a/sound/soc/codecs/msmfalcon_cdc/msmfalcon-regmap.c b/sound/soc/codecs/sdm660_cdc/sdm660-regmap.c
similarity index 99%
rename from sound/soc/codecs/msmfalcon_cdc/msmfalcon-regmap.c
rename to sound/soc/codecs/sdm660_cdc/sdm660-regmap.c
index 1ece086..cc7ae17 100644
--- a/sound/soc/codecs/msmfalcon_cdc/msmfalcon-regmap.c
+++ b/sound/soc/codecs/sdm660_cdc/sdm660-regmap.c
@@ -12,7 +12,7 @@
*/
#include <linux/regmap.h>
-#include "msmfalcon-cdc-registers.h"
+#include "sdm660-cdc-registers.h"
/*
* Default register reset values that are common across different versions
diff --git a/sound/soc/msm/Kconfig b/sound/soc/msm/Kconfig
index b8ce342..11182e1 100644
--- a/sound/soc/msm/Kconfig
+++ b/sound/soc/msm/Kconfig
@@ -108,7 +108,7 @@
listen on codec.
config SND_SOC_INT_CODEC
- tristate "SoC Machine driver for MSMFALCON_INT"
+ tristate "SoC Machine driver for SDM660_INT"
depends on ARCH_QCOM
select SND_SOC_QDSP6V2
select SND_SOC_MSM_STUB
@@ -121,7 +121,7 @@
select MSM_QDSP6V2_CODECS
select MSM_CDC_PINCTRL
select SND_SOC_MSM_SDW
- select SND_SOC_MSMFALCON_CDC
+ select SND_SOC_SDM660_CDC
select QTI_PP
select DTS_SRS_TM
select DOLBY_DAP
@@ -129,7 +129,7 @@
select SND_HWDEP
select MSM_ULTRASOUND
select DTS_EAGLE
- select SND_SOC_MSMFALCON_COMMON
+ select SND_SOC_SDM660_COMMON
select SND_SOC_COMPRESS
select PINCTRL_LPI
help
@@ -140,7 +140,7 @@
DAI-links
config SND_SOC_EXT_CODEC
- tristate "SoC Machine driver for MSMFALCON_EXT"
+ tristate "SoC Machine driver for SDM660_EXT"
depends on ARCH_QCOM
select SND_SOC_QDSP6V2
select SND_SOC_MSM_STUB
@@ -164,7 +164,7 @@
select SND_HWDEP
select MSM_ULTRASOUND
select DTS_EAGLE
- select SND_SOC_MSMFALCON_COMMON
+ select SND_SOC_SDM660_COMMON
select SND_SOC_COMPRESS
select PINCTRL_LPI
help
@@ -233,13 +233,13 @@
the machine driver and the corresponding
DAI-links
-config SND_SOC_FALCON
- tristate "SoC Machine driver for MSMFALCON boards"
- depends on ARCH_MSMFALCON
+config SND_SOC_660
+ tristate "SoC Machine driver for SDM660 boards"
+ depends on ARCH_SDM660
select SND_SOC_INT_CODEC
select SND_SOC_EXT_CODEC
help
- To add support for SoC audio on MSMFALCON.
+ To add support for SoC audio on SDM660.
This will enable sound soc drivers which
interfaces with DSP, also it will enable
the machine driver and the corresponding
diff --git a/sound/soc/msm/Makefile b/sound/soc/msm/Makefile
index 1235e81..5105cd9 100644
--- a/sound/soc/msm/Makefile
+++ b/sound/soc/msm/Makefile
@@ -20,18 +20,18 @@
snd-soc-msm8998-objs := msm8998.o
obj-$(CONFIG_SND_SOC_MSM8998) += snd-soc-msm8998.o
-# for MSMFALCON sound card driver
-snd-soc-msmfalcon-common-objs := msmfalcon-common.o
-obj-$(CONFIG_SND_SOC_MSMFALCON_COMMON) += snd-soc-msmfalcon-common.o
+# for SDM660 sound card driver
+snd-soc-sdm660-common-objs := sdm660-common.o
+obj-$(CONFIG_SND_SOC_SDM660_COMMON) += snd-soc-sdm660-common.o
-# for MSMFALCON sound card driver
-snd-soc-int-codec-objs := msmfalcon-internal.o
-obj-$(CONFIG_SND_SOC_INT_CODEC) += snd-soc-msmfalcon-common.o
+# for SDM660 sound card driver
+snd-soc-int-codec-objs := sdm660-internal.o
+obj-$(CONFIG_SND_SOC_INT_CODEC) += snd-soc-sdm660-common.o
obj-$(CONFIG_SND_SOC_INT_CODEC) += snd-soc-int-codec.o
-# for MSMFALCON sound card driver
-snd-soc-ext-codec-objs := msmfalcon-external.o msmfalcon-ext-dai-links.o
-obj-$(CONFIG_SND_SOC_EXT_CODEC) += snd-soc-msmfalcon-common.o
+# for SDM660 sound card driver
+snd-soc-ext-codec-objs := sdm660-external.o sdm660-ext-dai-links.o
+obj-$(CONFIG_SND_SOC_EXT_CODEC) += snd-soc-sdm660-common.o
obj-$(CONFIG_SND_SOC_EXT_CODEC) += snd-soc-ext-codec.o
# for SDM845 sound card driver
diff --git a/sound/soc/msm/msmfalcon-common.c b/sound/soc/msm/sdm660-common.c
similarity index 98%
rename from sound/soc/msm/msmfalcon-common.c
rename to sound/soc/msm/sdm660-common.c
index fb2abd5..86947bb 100644
--- a/sound/soc/msm/msmfalcon-common.c
+++ b/sound/soc/msm/sdm660-common.c
@@ -16,13 +16,13 @@
#include <sound/pcm_params.h>
#include <sound/q6afe-v2.h>
#include "qdsp6v2/msm-pcm-routing-v2.h"
-#include "msmfalcon-common.h"
-#include "msmfalcon-internal.h"
-#include "msmfalcon-external.h"
-#include "../codecs/msmfalcon_cdc/msm-analog-cdc.h"
+#include "sdm660-common.h"
+#include "sdm660-internal.h"
+#include "sdm660-external.h"
+#include "../codecs/sdm660_cdc/msm-analog-cdc.h"
#include "../codecs/wsa881x.h"
-#define DRV_NAME "msmfalcon-asoc-snd"
+#define DRV_NAME "sdm660-asoc-snd"
#define MSM_INT_DIGITAL_CODEC "msm-dig-codec"
#define PMIC_INT_ANALOG_CODEC "analog-codec"
@@ -2658,12 +2658,12 @@
mi2s_auxpcm_conf[count].pcm_i2s_sel_vt_addr);
}
-static const struct of_device_id msmfalcon_asoc_machine_of_match[] = {
- { .compatible = "qcom,msmfalcon-asoc-snd",
+static const struct of_device_id sdm660_asoc_machine_of_match[] = {
+ { .compatible = "qcom,sdm660-asoc-snd",
.data = "internal_codec"},
- { .compatible = "qcom,msmfalcon-asoc-snd-tasha",
+ { .compatible = "qcom,sdm660-asoc-snd-tasha",
.data = "tasha_codec"},
- { .compatible = "qcom,msmfalcon-asoc-snd-tavil",
+ { .compatible = "qcom,sdm660-asoc-snd-tavil",
.data = "tavil_codec"},
{},
};
@@ -2682,7 +2682,7 @@
if (!pdata)
return -ENOMEM;
- match = of_match_node(msmfalcon_asoc_machine_of_match,
+ match = of_match_node(sdm660_asoc_machine_of_match,
pdev->dev.of_node);
if (!match)
goto err;
@@ -2821,19 +2821,19 @@
return 0;
}
-static struct platform_driver msmfalcon_asoc_machine_driver = {
+static struct platform_driver sdm660_asoc_machine_driver = {
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
.pm = &snd_soc_pm_ops,
- .of_match_table = msmfalcon_asoc_machine_of_match,
+ .of_match_table = sdm660_asoc_machine_of_match,
},
.probe = msm_asoc_machine_probe,
.remove = msm_asoc_machine_remove,
};
-module_platform_driver(msmfalcon_asoc_machine_driver);
+module_platform_driver(sdm660_asoc_machine_driver);
MODULE_DESCRIPTION("ALSA SoC msm");
MODULE_LICENSE("GPL v2");
MODULE_ALIAS("platform:" DRV_NAME);
-MODULE_DEVICE_TABLE(of, msmfalcon_asoc_machine_of_match);
+MODULE_DEVICE_TABLE(of, sdm660_asoc_machine_of_match);
diff --git a/sound/soc/msm/msmfalcon-common.h b/sound/soc/msm/sdm660-common.h
similarity index 97%
rename from sound/soc/msm/msmfalcon-common.h
rename to sound/soc/msm/sdm660-common.h
index 522c7de..90178a5 100644
--- a/sound/soc/msm/msmfalcon-common.h
+++ b/sound/soc/msm/sdm660-common.h
@@ -66,7 +66,7 @@
};
extern const struct snd_kcontrol_new msm_common_snd_controls[];
-struct msmfalcon_codec {
+struct sdm660_codec {
void* (*get_afe_config_fn)(struct snd_soc_codec *codec,
enum afe_config_type config_type);
};
@@ -90,7 +90,7 @@
struct device_node *dmic_gpio_p; /* used by pinctrl API */
struct device_node *ext_spk_gpio_p; /* used by pinctrl API */
struct snd_soc_codec *codec;
- struct msmfalcon_codec msmfalcon_codec_fn;
+ struct sdm660_codec sdm660_codec_fn;
struct snd_info_entry *codec_root;
int spk_ext_pa_gpio;
int mclk_freq;
diff --git a/sound/soc/msm/msmfalcon-ext-dai-links.c b/sound/soc/msm/sdm660-ext-dai-links.c
similarity index 99%
rename from sound/soc/msm/msmfalcon-ext-dai-links.c
rename to sound/soc/msm/sdm660-ext-dai-links.c
index 9b5755a..dbd5ed5 100644
--- a/sound/soc/msm/msmfalcon-ext-dai-links.c
+++ b/sound/soc/msm/sdm660-ext-dai-links.c
@@ -19,11 +19,11 @@
#include <sound/pcm_params.h>
#include "qdsp6v2/msm-pcm-routing-v2.h"
#include "../codecs/wcd9335.h"
-#include "msmfalcon-common.h"
-#include "msmfalcon-external.h"
+#include "sdm660-common.h"
+#include "sdm660-external.h"
#define DEV_NAME_STR_LEN 32
-#define __CHIPSET__ "MSMFALCON "
+#define __CHIPSET__ "SDM660 "
#define MSM_DAILINK_NAME(name) (__CHIPSET__#name)
#define WCN_CDC_SLIM_RX_CH_MAX 2
@@ -1882,7 +1882,7 @@
if (strnstr(card->name, "tasha", strlen(card->name))) {
codec_ver = tasha_codec_ver();
if (codec_ver == WCD9326)
- card->name = "msmfalcon-tashalite-snd-card";
+ card->name = "sdm660-tashalite-snd-card";
len1 = ARRAY_SIZE(msm_ext_common_fe_dai);
len2 = len1 + ARRAY_SIZE(msm_ext_tasha_fe_dai);
diff --git a/sound/soc/msm/msmfalcon-external.c b/sound/soc/msm/sdm660-external.c
similarity index 99%
rename from sound/soc/msm/msmfalcon-external.c
rename to sound/soc/msm/sdm660-external.c
index dbe9201..0d62a86 100644
--- a/sound/soc/msm/msmfalcon-external.c
+++ b/sound/soc/msm/sdm660-external.c
@@ -21,14 +21,14 @@
#include <linux/qdsp6v2/audio_notifier.h>
#include "qdsp6v2/msm-pcm-routing-v2.h"
#include "msm-audio-pinctrl.h"
-#include "msmfalcon-common.h"
-#include "msmfalcon-external.h"
+#include "sdm660-common.h"
+#include "sdm660-external.h"
#include "../codecs/wcd9335.h"
#include "../codecs/wcd934x/wcd934x.h"
#include "../codecs/wcd934x/wcd934x-mbhc.h"
-#define MSMFALCON_SPK_ON 1
-#define MSMFALCON_SPK_OFF 0
+#define SDM660_SPK_ON 1
+#define SDM660_SPK_OFF 0
#define WCD9XXX_MBHC_DEF_BUTTONS 8
#define WCD9XXX_MBHC_DEF_RLOADS 5
@@ -663,7 +663,7 @@
snd_soc_codec_get_dapm(codec);
pr_debug("%s: msm_ext_spk_control = %d", __func__, msm_ext_spk_control);
- if (msm_ext_spk_control == MSMFALCON_SPK_ON) {
+ if (msm_ext_spk_control == SDM660_SPK_ON) {
snd_soc_dapm_enable_pin(dapm, "Lineout_1 amp");
snd_soc_dapm_enable_pin(dapm, "Lineout_3 amp");
} else {
@@ -1281,7 +1281,7 @@
return ret;
}
-static int msmfalcon_notifier_service_cb(struct notifier_block *this,
+static int sdm660_notifier_service_cb(struct notifier_block *this,
unsigned long opcode, void *ptr)
{
int ret;
@@ -1339,7 +1339,7 @@
}
static struct notifier_block service_nb = {
- .notifier_call = msmfalcon_notifier_service_cb,
+ .notifier_call = sdm660_notifier_service_cb,
.priority = -INT_MAX,
};
@@ -1739,7 +1739,7 @@
{
int ret;
- ret = audio_notifier_register("msmfalcon", AUDIO_NOTIFIER_ADSP_DOMAIN,
+ ret = audio_notifier_register("sdm660", AUDIO_NOTIFIER_ADSP_DOMAIN,
&service_nb);
if (ret < 0)
pr_err("%s: Audio notifier register failed ret = %d\n",
diff --git a/sound/soc/msm/msmfalcon-external.h b/sound/soc/msm/sdm660-external.h
similarity index 96%
rename from sound/soc/msm/msmfalcon-external.h
rename to sound/soc/msm/sdm660-external.h
index e7e41f3..16ed071 100644
--- a/sound/soc/msm/msmfalcon-external.h
+++ b/sound/soc/msm/sdm660-external.h
@@ -10,8 +10,8 @@
* GNU General Public License for more details.
*/
-#ifndef __MSMFALCON_EXTERNAL
-#define __MSMFALCON_EXTERNAL
+#ifndef __SDM660_EXTERNAL
+#define __SDM660_EXTERNAL
int msm_snd_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params);
diff --git a/sound/soc/msm/msmfalcon-internal.c b/sound/soc/msm/sdm660-internal.c
similarity index 99%
rename from sound/soc/msm/msmfalcon-internal.c
rename to sound/soc/msm/sdm660-internal.c
index 80a2b2b..03e2e88 100644
--- a/sound/soc/msm/msmfalcon-internal.c
+++ b/sound/soc/msm/sdm660-internal.c
@@ -16,12 +16,12 @@
#include <linux/mfd/msm-cdc-pinctrl.h>
#include <sound/pcm_params.h>
#include "qdsp6v2/msm-pcm-routing-v2.h"
-#include "msmfalcon-common.h"
-#include "../codecs/msmfalcon_cdc/msm-digital-cdc.h"
-#include "../codecs/msmfalcon_cdc/msm-analog-cdc.h"
+#include "sdm660-common.h"
+#include "../codecs/sdm660_cdc/msm-digital-cdc.h"
+#include "../codecs/sdm660_cdc/msm-analog-cdc.h"
#include "../codecs/msm_sdw/msm_sdw.h"
-#define __CHIPSET__ "MSMFALCON "
+#define __CHIPSET__ "SDM660 "
#define MSM_DAILINK_NAME(name) (__CHIPSET__#name)
#define DEFAULT_MCLK_RATE 9600000
@@ -2911,9 +2911,9 @@
ARRAY_SIZE(msm_auxpcm_be_dai_links)+
ARRAY_SIZE(msm_wcn_be_dai_links)];
-static struct snd_soc_card msmfalcon_card = {
- /* snd_soc_card_msmfalcon */
- .name = "msmfalcon-snd-card",
+static struct snd_soc_card sdm660_card = {
+ /* snd_soc_card_sdm660 */
+ .name = "sdm660-snd-card",
.dai_link = msm_int_dai,
.num_links = ARRAY_SIZE(msm_int_dai),
};
@@ -2964,7 +2964,7 @@
static struct snd_soc_card *msm_int_populate_sndcard_dailinks(
struct device *dev)
{
- struct snd_soc_card *card = &msmfalcon_card;
+ struct snd_soc_card *card = &sdm660_card;
struct snd_soc_dai_link *dailink;
int len1;
diff --git a/sound/soc/msm/msmfalcon-internal.h b/sound/soc/msm/sdm660-internal.h
similarity index 94%
rename from sound/soc/msm/msmfalcon-internal.h
rename to sound/soc/msm/sdm660-internal.h
index e5e3e7c..ccc62b8 100644
--- a/sound/soc/msm/msmfalcon-internal.h
+++ b/sound/soc/msm/sdm660-internal.h
@@ -10,8 +10,8 @@
* GNU General Public License for more details.
*/
-#ifndef __MSMFALCON_INTERNAL
-#define __MSMFALCON_INTERNAL
+#ifndef __SDM660_INTERNAL
+#define __SDM660_INTERNAL
#include <sound/soc.h>