Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4edaff23 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: Add support to compile machine driver for SDM670"

parents e949b6da a477facf

drivers/pinctrl/qcom/pinctrl-lpi.c

+2 −1
Original line number Diff line number Diff line
@@ -448,6 +448,7 @@ static void lpi_gpio_dbg_show_one(struct seq_file *s, 
				  unsigned int offset,

				  unsigned int gpio)

{

	struct lpi_gpio_state *state = gpiochip_get_data(chip);

	struct pinctrl_pin_desc pindesc;

	struct lpi_gpio_pad *pad;

	unsigned int func;
@@ -463,7 +464,7 @@ static void lpi_gpio_dbg_show_one(struct seq_file *s, 
		"pull up"

	};



	pctldev = pctldev ? : to_gpio_state(chip)->ctrl;

	pctldev = pctldev ? : state->ctrl;

	pindesc = pctldev->desc->pins[offset];

	pad = pctldev->desc->pins[offset].drv_data;

	ctl_reg = lpi_gpio_read(pad, LPI_GPIO_REG_DIR_CTL);

sound/soc/codecs/msm_sdw/msm_sdw_cdc.c

+9 −7
Original line number Diff line number Diff line
@@ -1384,7 +1384,7 @@ int msm_sdw_codec_info_create_codec_entry(struct snd_info_entry *codec_root, 


	msm_sdw = snd_soc_codec_get_drvdata(codec);

	card = codec->component.card;

	msm_sdw->entry = snd_register_module_info(codec_root->module,

	msm_sdw->entry = snd_info_create_subdir(codec_root->module,

						  "152c1000.msm-sdw-codec",

						  codec_root);

	if (!msm_sdw->entry) {
@@ -1762,13 +1762,15 @@ static struct regmap *msm_sdw_get_regmap(struct device *dev) 
static struct snd_soc_codec_driver soc_codec_dev_msm_sdw = {

	.probe = msm_sdw_codec_probe,

	.remove = msm_sdw_codec_remove,

	.get_regmap = msm_sdw_get_regmap,

	.component_driver = {

		.controls = msm_sdw_snd_controls,

		.num_controls = ARRAY_SIZE(msm_sdw_snd_controls),

		.dapm_widgets = msm_sdw_dapm_widgets,

		.num_dapm_widgets = ARRAY_SIZE(msm_sdw_dapm_widgets),

		.dapm_routes = audio_map,

		.num_dapm_routes = ARRAY_SIZE(audio_map),

	.get_regmap = msm_sdw_get_regmap,

	},

};



static void msm_sdw_add_child_devices(struct work_struct *work)

sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c

+9 −7
Original line number Diff line number Diff line
@@ -4052,7 +4052,7 @@ int msm_anlg_codec_info_create_codec_entry(struct snd_info_entry *codec_root, 


	sdm660_cdc_priv = snd_soc_codec_get_drvdata(codec);

	card = codec->component.card;

	sdm660_cdc_priv->entry = snd_register_module_info(codec_root->module,

	sdm660_cdc_priv->entry = snd_info_create_subdir(codec_root->module,

							     "spmi0-03",

							     codec_root);

	if (!sdm660_cdc_priv->entry) {
@@ -4320,13 +4320,15 @@ static struct snd_soc_codec_driver soc_codec_dev_sdm660_cdc = { 
	.suspend = msm_anlg_cdc_suspend,

	.resume = msm_anlg_cdc_resume,

	.reg_word_size = 1,

	.get_regmap = msm_anlg_get_regmap,

	.component_driver = {

		.controls = msm_anlg_cdc_snd_controls,

		.num_controls = ARRAY_SIZE(msm_anlg_cdc_snd_controls),

		.dapm_widgets = msm_anlg_cdc_dapm_widgets,

		.num_dapm_widgets = ARRAY_SIZE(msm_anlg_cdc_dapm_widgets),

		.dapm_routes = audio_map,

		.num_dapm_routes = ARRAY_SIZE(audio_map),

	.get_regmap = msm_anlg_get_regmap,

	},

};



static int msm_anlg_cdc_init_supplies(struct sdm660_cdc_priv *sdm660_cdc,

sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c

+9 −7
Original line number Diff line number Diff line
@@ -1157,7 +1157,7 @@ int msm_dig_codec_info_create_codec_entry(struct snd_info_entry *codec_root, 


	msm_dig = snd_soc_codec_get_drvdata(codec);

	card = codec->component.card;

	msm_dig->entry = snd_register_module_info(codec_root->module,

	msm_dig->entry = snd_info_create_subdir(codec_root->module,

						  "msm_digital_codec",

						  codec_root);

	if (!msm_dig->entry) {
@@ -2037,13 +2037,15 @@ static struct snd_soc_codec_driver soc_msm_dig_codec = { 
	.remove = msm_dig_cdc_soc_remove,

	.suspend = msm_dig_cdc_suspend,

	.resume = msm_dig_cdc_resume,

	.get_regmap = msm_digital_get_regmap,

	.component_driver = {

		.controls = msm_dig_snd_controls,

		.num_controls = ARRAY_SIZE(msm_dig_snd_controls),

		.dapm_widgets = msm_dig_dapm_widgets,

		.num_dapm_widgets = ARRAY_SIZE(msm_dig_dapm_widgets),

		.dapm_routes = audio_dig_map,

		.num_dapm_routes = ARRAY_SIZE(audio_dig_map),

	.get_regmap = msm_digital_get_regmap,

	},

};



const struct regmap_config msm_digital_regmap_config = {

sound/soc/msm/Kconfig

+3 −7
Original line number Diff line number Diff line
@@ -112,14 +112,12 @@ config SND_SOC_INT_CODEC 
	select MSM_CDC_PINCTRL

	select SND_SOC_MSM_SDW

	select SND_SOC_SDM660_CDC

	select SND_SOC_MSM_HDMI_CODEC_RX

	select QTI_PP

	select DTS_SRS_TM

	select DOLBY_LICENSE

	select SND_HWDEP

	select MSM_ULTRASOUND

	select DTS_EAGLE

	select SND_SOC_SDM660_COMMON

	select SND_SOC_COMPRESS

	select PINCTRL_LPI

	help
@@ -144,7 +142,6 @@ config SND_SOC_EXT_CODEC 
	select SND_SOC_WCD9335

	select SND_SOC_WCD934X

	select SND_SOC_WSA881X

	select SND_SOC_MSM_HDMI_CODEC_RX

	select MFD_CORE

	select QTI_PP

	select DTS_SRS_TM
@@ -154,7 +151,6 @@ config SND_SOC_EXT_CODEC 
	select SND_HWDEP

	select MSM_ULTRASOUND

	select DTS_EAGLE

	select SND_SOC_SDM660_COMMON

	select SND_SOC_COMPRESS

	select PINCTRL_LPI

	help
@@ -233,12 +229,12 @@ config SND_SOC_MSM8998 
	 DAI-links



config SND_SOC_660

	tristate "SoC Machine driver for SDM660 boards"

	depends on ARCH_SDM660

	tristate "SoC Machine driver for SDM660/670 boards"

	depends on ARCH_SDM660 || ARCH_SDM670

	select SND_SOC_INT_CODEC

	select SND_SOC_EXT_CODEC

	help

	 To add support for SoC audio on SDM660.

	 To add support for SoC audio on SDM660/670.

	 This will enable sound soc drivers which

	 interfaces with DSP, also it will enable

	 the machine driver and the corresponding