mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 13:44:26 -04:00
Merge a0065850fd on remote branch
Change-Id: Iab1b3f5f64d683f1fb776ab8baae33819014b381
This commit is contained in:
commit
6c88d5e9bb
4 changed files with 3708 additions and 3642 deletions
|
|
@ -1,4 +1,5 @@
|
|||
/* Copyright (c) 2014-2021, The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. 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
|
||||
|
|
@ -29,6 +30,9 @@
|
|||
#include <sound/info.h>
|
||||
#include <dsp/audio_notifier.h>
|
||||
#include "msm_dailink.h"
|
||||
#include <soc/qcom/subsystem_restart.h>
|
||||
#include <soc/qcom/subsystem_notif.h>
|
||||
#include <soc/qcom/boot_stats.h>
|
||||
|
||||
|
||||
#define DRV_NAME "spf-asoc-snd"
|
||||
|
|
@ -823,6 +827,31 @@ void msm_common_set_pdata(struct snd_soc_card *card,
|
|||
pdata->common_pdata = common_pdata;
|
||||
}
|
||||
|
||||
static int auto_spf_dummy_ssr_cb(struct notifier_block *this,
|
||||
unsigned long code,
|
||||
void *data)
|
||||
{
|
||||
struct snd_soc_card *card = platform_get_drvdata(spdev);
|
||||
|
||||
switch (code) {
|
||||
case SUBSYS_BEFORE_SHUTDOWN:
|
||||
snd_soc_card_change_online_state(card, 0); // change sndcard status to OFFLINE
|
||||
dev_info(&spdev->dev, "ssr restart, mark sndcard offline\n");
|
||||
break;
|
||||
case SUBSYS_AFTER_POWERUP:
|
||||
snd_soc_card_change_online_state(card, 1); // change sndcard status to ONLINE
|
||||
dev_info(&spdev->dev, "ssr complete, mark sndcard online\n");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct notifier_block auto_spf_dummy_ssr_notifier = {
|
||||
.notifier_call = auto_spf_dummy_ssr_cb,
|
||||
};
|
||||
|
||||
static int msm_asoc_machine_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card;
|
||||
|
|
@ -881,8 +910,13 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
|
|||
}
|
||||
dev_info(&pdev->dev, "Sound card %s registered\n", card->name);
|
||||
pr_err("Sound card %s registered\n", card->name);
|
||||
place_marker("M - sound card init complete");
|
||||
|
||||
spdev = pdev;
|
||||
|
||||
subsys_notif_register_notifier("adsp", &auto_spf_dummy_ssr_notifier);
|
||||
dev_info(&pdev->dev, "Audio driver register for SSR complete\n");
|
||||
|
||||
return 0;
|
||||
err:
|
||||
devm_kfree(&pdev->dev, pdata);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,19 +1,8 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
# Copyright (c) 2021, The Linux Foundation. All rights reserved.
|
||||
# Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.
|
||||
|
||||
ifeq ($(CONFIG_QGKI), y)
|
||||
export CONFIG_SND_SOC_GVM_AUTO_SPF=m
|
||||
export CONFIG_MSM_QDSP6_APRV2_VM=m
|
||||
export CONFIG_MSM_QDSP6_SSR=m
|
||||
export CONFIG_MSM_ADSP_LOADER=m
|
||||
export CONFIG_MSM_QDSP6_NOTIFIER=m
|
||||
export CONFIG_SND_SOC_MSM_QDSP6V2_VM=m
|
||||
export CONFIG_SND_SOC_QDSP6V2=m
|
||||
export CONFIG_QTI_PP=m
|
||||
export CONFIG_SND_HWDEP_ROUTING=m
|
||||
export CONFIG_SND_SOC_MSM_STUB=m
|
||||
export CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
|
||||
export CONFIG_MSM_QDSP6V2_CODECS=m
|
||||
export CONFIG_SND_EVENT=m
|
||||
export CONFIG_SND_SOC_SA8155=m
|
||||
endif
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
/* Copyright (c) 2018-2019, 2021 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2022, Qualcomm Innovation Center, Inc. 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
|
||||
|
|
@ -11,17 +12,5 @@
|
|||
*/
|
||||
|
||||
#define CONFIG_SND_SOC_GVM_AUTO_SPF 1
|
||||
#define CONFIG_MSM_QDSP6_APRV2_VM 1
|
||||
#define CONFIG_MSM_ADSP_LOADER 1
|
||||
#define CONFIG_MSM_QDSP6_SSR 1
|
||||
#define CONFIG_MSM_QDSP6_NOTIFIER 1
|
||||
#define CONFIG_SND_SOC_MSM_QDSP6V2_VM 1
|
||||
#define CONFIG_SND_SOC_QDSP6V2 1
|
||||
#define CONFIG_QTI_PP 1
|
||||
#define CONFIG_SND_HWDEP_ROUTING 1
|
||||
#define CONFIG_SND_SOC_MSM_STUB 1
|
||||
#define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1
|
||||
#define CONFIG_MSM_QDSP6V2_CODECS 1
|
||||
#define CONFIG_SND_EVENT 1
|
||||
#define CONFIG_SND_SOC_SA8155 1
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue