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

Commit 5cef33a2 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: Update the AFE clock API support"

parents 3f5427ea 407925be

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+2 −0
Original line number Diff line number Diff line
@@ -1390,6 +1390,7 @@ the flavor. 
- pinctrl-# : Pinctrl states as mentioned in pinctrl-names.



Optional properties:

- qcom,msm-afe-clk-ver: Provides detail of AFE clock API version.

- qcom,hdmi-dba-codec-rx: Boolean. specifies if HDMI DBA audio support is enabled or not.

- qcom,prim-auxpcm-gpio-clk  : GPIO on which Primary AUXPCM clk signal is coming.

- qcom,prim-auxpcm-gpio-sync : GPIO on which Primary AUXPCM SYNC signal is coming.
@@ -1453,6 +1454,7 @@ Example: 
		reg-names = "csr_gp_io_mux_mic_ctl",

			    "csr_gp_io_mux_spkr_ctl",

			    "csr_gp_io_lpaif_pri_pcm_pri_mode_muxsel";

		qcom,msm-afe-clk-ver = <1>;

		qcom,msm-ext-pa = "primary";

		qcom,hdmi-dba-codec-rx;

		qcom,msm-mclk-freq = <9600000>;

drivers/soc/qcom/qdsp6v2/apr_v2.c

+6 −1
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2012-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
@@ -21,6 +21,11 @@ 


static const char *lpass_subsys_name = "adsp";



enum apr_subsys_state apr_get_subsys_state(void)

{

	return apr_get_q6_state();

}



void apr_set_subsys_state(void)

{

	apr_set_q6_state(APR_SUBSYS_DOWN);

drivers/soc/qcom/qdsp6v2/apr_v3.c

+6 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-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
@@ -21,6 +21,11 @@ 


#define DEST_ID APR_DEST_MODEM



enum apr_subsys_state apr_get_subsys_state(void)

{

	return apr_get_modem_state();

}



void apr_set_subsys_state(void)

{

	apr_set_modem_state(APR_SUBSYS_DOWN);

include/linux/qdsp6v2/apr.h

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2010-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2010-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
@@ -168,6 +168,7 @@ uint16_t apr_get_data_src(struct apr_hdr *hdr); 
void change_q6_state(int state);

void q6audio_dsp_not_responding(void);

void apr_reset(void *handle);

enum apr_subsys_state apr_get_subsys_state(void);

enum apr_subsys_state apr_get_modem_state(void);

void apr_set_modem_state(enum apr_subsys_state state);

enum apr_subsys_state apr_get_q6_state(void);

include/sound/q6afe-v2.h

+4 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-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
@@ -39,6 +39,9 @@ 
#define RT_PROXY_DAI_002_TX	0xE1

#define VIRTUAL_ID_TO_PORTID(val) ((val & 0xF) | 0x2000)



#define AFE_CLK_VERSION_V1    1

#define AFE_CLK_VERSION_V2    2



enum {

	/* IDX 0->4 */

	IDX_PRIMARY_I2S_RX,