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

Commit 8aa4fe35 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: reorg q6core header file"

parents 05bb2a33 401b3c61

sound/soc/msm/qdsp6v2/q6core.h→include/sound/q6core.h

+0 −0

File moved.

View file

include/uapi/linux/avtimer.h

+1 −0
Original line number Diff line number Diff line
@@ -17,5 +17,6 @@ struct dev_avtimer_data { 
};

int avcs_core_open(void);

int avcs_core_disable_power_collapse(int disable);/* true or flase */

uint64_t avcs_core_query_timer(void);



#endif

sound/soc/codecs/msm8x10-wcd.c

+1 −1
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ 
#include <sound/soc.h>

#include <sound/soc-dapm.h>

#include <sound/tlv.h>

#include <sound/q6core.h>

#include <linux/qdsp6v2/apr.h>

#include "msm8x10-wcd.h"

#include "wcd9xxx-resmgr.h"

#include "msm8x10_wcd_registers.h"

#include "../msm/qdsp6v2/q6core.h"

#include "wcd9xxx-common.h"



#define MSM8X10_WCD_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\

sound/soc/codecs/msm8x16-wcd.c

+1 −1
Original line number Diff line number Diff line
@@ -39,12 +39,12 @@ 
#include <sound/soc.h>

#include <sound/soc-dapm.h>

#include <sound/tlv.h>

#include <sound/q6core.h>

#include <soc/qcom/subsystem_notif.h>

#include "msm8x16-wcd.h"

#include "wcd-mbhc-v2.h"

#include "msm8916-wcd-irq.h"

#include "msm8x16_wcd_registers.h"

#include "../msm/qdsp6v2/q6core.h"



#define MSM8X16_WCD_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\

			SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000)

sound/soc/msm/apq8074.c

+1 −1
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
#include <sound/pcm.h>

#include <sound/jack.h>

#include <sound/q6afe-v2.h>

#include <sound/q6core.h>

#include <sound/pcm_params.h>



#include "qdsp6v2/msm-pcm-routing-v2.h"

#include "qdsp6v2/q6core.h"

#include "../codecs/wcd9xxx-common.h"

#include "../codecs/wcd9320.h"