lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "asoc: add audio driver markers for automotive platforms"

Browse Source
This commit is contained in:
qctecmdr 2021-01-29 08:57:23 -08:00 committed by Gerrit - the friendly Code Review server
commit 4df59ffdfd
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
asoc/sa6155.c
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2014-2020, The Linux Foundation. All rights reserved.
/* Copyright (c) 2014-2021, The Linux Foundation. All rights reserved.
*/
/*
* Copyright 2011, The Android Open Source Project
@ -48,6 +48,7 @@
#include <dsp/audio_notifier.h>
#include <dsp/q6afe-v2.h>
#include <dsp/q6core.h>
#include <soc/qcom/boot_stats.h>
#include "device_event.h"
#include "msm-pcm-routing-v2.h"
#include "msm_dailink.h"
@ -7274,9 +7275,9 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
static int first_probe = 1;
if (first_probe) {
place_marker("M - DRIVER Audio Init");
first_probe = 0;
}
pr_debug("M - DRIVER Audio Init\n");
if (!pdev->dev.of_node) {
dev_err(&pdev->dev, "No platform supplied from device tree\n");
@ -7356,7 +7357,7 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
pr_err("%s: Registration with SND event FWK failed ret = %d\n",
__func__, ret);
pr_debug("M - DRIVER Audio Ready\n");
place_marker("M - DRIVER Audio Ready");
return 0;
err:
msm_release_pinctrl(pdev);

7
asoc/sa8155.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only
/* Copyright (c) 2014-2020, The Linux Foundation. All rights reserved.
/* Copyright (c) 2014-2021, The Linux Foundation. All rights reserved.
*/
/*
* Copyright 2011, The Android Open Source Project
@ -49,6 +49,7 @@
#include <dsp/audio_notifier.h>
#include <dsp/q6afe-v2.h>
#include <dsp/q6core.h>
#include <soc/qcom/boot_stats.h>
#include "device_event.h"
#include "msm-pcm-routing-v2.h"
#include "msm_dailink.h"
@ -7271,9 +7272,9 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
static int first_probe = 1;
if (first_probe) {
place_marker("M - DRIVER Audio Init");
first_probe = 0;
}
pr_debug("M - DRIVER Audio Init\n");
if (!pdev->dev.of_node) {
dev_err(&pdev->dev, "No platform supplied from device tree\n");
@ -7353,7 +7354,7 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
pr_err("%s: Registration with SND event FWK failed ret = %d\n",
__func__, ret);
pr_debug("M - DRIVER Audio Ready\n");
place_marker("M - DRIVER Audio Ready");
return 0;
err:
msm_release_pinctrl(pdev);