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

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

Merge "msm: adsp-loader: Modify the adsp_state check to get subsystem"

parents a736b723 f50db36d

drivers/soc/qcom/qdsp6v2/adsp-loader.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2014,2016 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
@@ -88,7 +88,7 @@ static void adsp_loader_do(struct platform_device *pdev) 
		/* adsp_state always returns "0". So load modem image based on

		apr_modem_state to prevent loading of image twice */

		adsp_state = apr_get_modem_state();

		if (adsp_state == APR_SUBSYS_DOWN) {

		if (adsp_state != APR_SUBSYS_LOADED) {

			priv = platform_get_drvdata(pdev);

			if (!priv) {

				dev_err(&pdev->dev,

include/dt-bindings/clock/msm-clocks-8909.h

+2 −0
Original line number Diff line number Diff line
@@ -230,4 +230,6 @@ 
#define clk_audio_ap_clk                        0x312ac429

#define clk_audio_pmi_clk                       0xb7ba2274



#define clk_audio_lpass_mclk			0x575ec22b



#endif

sound/soc/codecs/wcd9335.c

+15 −0
Original line number Diff line number Diff line
@@ -11535,6 +11535,21 @@ static struct snd_soc_dai_driver tasha_i2s_dai[] = { 
		},

		.ops = &tasha_dai_ops,

	},

	{

		.name = "tasha_mad1",

		.id = AIF4_MAD_TX,

		.capture = {

			.stream_name = "AIF4 MAD TX",

			.rates = SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_48000 |

				SNDRV_PCM_RATE_192000 | SNDRV_PCM_RATE_384000,

			.formats = TASHA_FORMATS_S16_S24_S32_LE,

			.rate_min = 16000,

			.rate_max = 384000,

			.channels_min = 1,

			.channels_max = 1,

		},

		.ops = &tasha_dai_ops,

	},

};



static void tasha_codec_power_gate_digital_core(struct tasha_priv *tasha)

sound/soc/msm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -242,6 +242,9 @@ config SND_SOC_MSM8909 
	select MSM_QDSP6V2_CODECS

	select SND_SOC_MSM8X16_WCD

	select SND_SOC_WSA881X_ANALOG

	select SND_SOC_WSA881X

	select SND_SOC_WCD9335

        select SND_SOC_CPE

	select SND_HWDEP

	help

	 To add support for SoC audio on MSM8909 boards.

sound/soc/msm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ snd-soc-mdm9607-objs := mdm9607.o 
obj-$(CONFIG_SND_SOC_MDM9607) += snd-soc-mdm9607.o



# for MSM 8909 sound card driver

snd-soc-msm8909-objs := msm8952.o msm-audio-pinctrl.o

snd-soc-msm8909-objs := msm8952.o msm-audio-pinctrl.o apq8009-i2s-ext-codec.o

obj-$(CONFIG_SND_SOC_MSM8909) += snd-soc-msm8909.o



# for MDM9640 sound card driver