evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: msm: add boot marker for mi2s and auto sound card"

Browse source
This commit is contained in:
Linux Build Service Account 2018-05-29 05:07:37 -07:00 • committed by Gerrit - the friendly Code Review server
commit addd4dab16
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sound/soc/msm/apq8096-auto.c
View file

@ -34,6 +34,7 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/info.h> #include <sound/info.h>
#include <device_event.h> #include <device_event.h>
#include <soc/qcom/boot_stats.h>
#include "qdsp6v2/msm-pcm-routing-v2.h" #include "qdsp6v2/msm-pcm-routing-v2.h"
#define DRV_NAME "apq8096-auto-asoc-snd" #define DRV_NAME "apq8096-auto-asoc-snd"
@ -6831,6 +6832,12 @@ static int apq8096_asoc_machine_probe(struct platform_device *pdev)
const struct of_device_id *match; const struct of_device_id *match;
int ret; int ret;
enum apr_subsys_state q6_state; enum apr_subsys_state q6_state;
static int first_probe = 1;
if (first_probe) {
place_marker("M - DRIVER Audio Init");
first_probe = 0;
}
if (!pdev->dev.of_node) { if (!pdev->dev.of_node) {
dev_err(&pdev->dev, "No platform supplied from device tree\n"); dev_err(&pdev->dev, "No platform supplied from device tree\n");
@ -6894,6 +6901,7 @@ static int apq8096_asoc_machine_probe(struct platform_device *pdev)
goto err; goto err;
} }
dev_info(&pdev->dev, "Sound card %s registered\n", card->name); dev_info(&pdev->dev, "Sound card %s registered\n", card->name);
place_marker("M - DRIVER Audio Ready");
return 0; return 0;
err: err:

11
sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
View file

@ -28,6 +28,7 @@
#include <sound/msm-dai-q6-v2.h> #include <sound/msm-dai-q6-v2.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/q6core.h> #include <sound/q6core.h>
#include <soc/qcom/boot_stats.h>
#define MSM_DAI_PRI_AUXPCM_DT_DEV_ID 1 #define MSM_DAI_PRI_AUXPCM_DT_DEV_ID 1
#define MSM_DAI_SEC_AUXPCM_DT_DEV_ID 2 #define MSM_DAI_SEC_AUXPCM_DT_DEV_ID 2
@ -4477,6 +4478,7 @@ static int msm_dai_q6_mi2s_dev_probe(struct platform_device *pdev)
u32 mi2s_intf = 0; u32 mi2s_intf = 0;
struct msm_mi2s_pdata *mi2s_pdata; struct msm_mi2s_pdata *mi2s_pdata;
int rc; int rc;
char boot_marker[40];
rc = of_property_read_u32(pdev->dev.of_node, q6_mi2s_dev_id, rc = of_property_read_u32(pdev->dev.of_node, q6_mi2s_dev_id,
&mi2s_intf); &mi2s_intf);
@ -4486,6 +4488,10 @@ static int msm_dai_q6_mi2s_dev_probe(struct platform_device *pdev)
goto rtn; goto rtn;
} }
snprintf(boot_marker, sizeof(boot_marker),
"M - DRIVER MSM I2S_%d Init", mi2s_intf);
place_marker(boot_marker);
dev_dbg(&pdev->dev, "dev name %s dev id 0x%x\n", dev_name(&pdev->dev), dev_dbg(&pdev->dev, "dev name %s dev id 0x%x\n", dev_name(&pdev->dev),
mi2s_intf); mi2s_intf);
@ -4549,6 +4555,11 @@ static int msm_dai_q6_mi2s_dev_probe(struct platform_device *pdev)
if (IS_ERR_VALUE(rc)) if (IS_ERR_VALUE(rc))
goto err_register; goto err_register;
snprintf(boot_marker, sizeof(boot_marker),
"M - DRIVER MSM I2S_%d Ready", mi2s_intf);
place_marker(boot_marker);
return 0; return 0;
err_register: err_register: