asoc: sa6155: support SSR handling for snd card status
Use SND event FWK for SSR handling. Change snd card status upon SERVICE_DOWN and SERVICE_UP callback when adsp subsystem restart happen. Change-Id: I333e2343e0670f53d40764ce86094c73c836c5c4 Signed-off-by: Erin Yan <xinyey@codeaurora.org>
This commit is contained in:
Erin Yan
Derek Chen
parent
c8940293bf
commit
300664fe83
133
asoc/sa6155.c
133
asoc/sa6155.c
@ -53,6 +53,7 @@
|
||||
#include <sound/pcm.h>
|
||||
#include <sound/pcm_params.h>
|
||||
#include <sound/info.h>
|
||||
#include <soc/snd_event.h>
|
||||
#include <dsp/audio_notifier.h>
|
||||
#include <dsp/q6afe-v2.h>
|
||||
#include <dsp/q6core.h>
|
||||
@ -697,8 +698,6 @@ static SOC_ENUM_SINGLE_EXT_DECL(mi2s_tx_format, bit_format_text);
|
||||
static SOC_ENUM_SINGLE_EXT_DECL(aux_pcm_rx_format, bit_format_text);
|
||||
static SOC_ENUM_SINGLE_EXT_DECL(aux_pcm_tx_format, bit_format_text);
|
||||
|
||||
static bool is_initial_boot = true;
|
||||
|
||||
static struct afe_clk_set mi2s_clk[MI2S_MAX] = {
|
||||
{
|
||||
AFE_API_VERSION_I2S_CONFIG,
|
||||
@ -6985,6 +6984,78 @@ static void msm_i2s_auxpcm_deinit(void)
|
||||
mi2s_intf_conf[count].msm_is_mi2s_master = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static int sa6155_ssr_enable(struct device *dev, void *data)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
||||
int ret = 0;
|
||||
|
||||
if (!card) {
|
||||
dev_err(dev, "%s: card is NULL\n", __func__);
|
||||
ret = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
|
||||
dev_info(dev, "%s: setting snd_card to ONLINE\n", __func__);
|
||||
snd_soc_card_change_online_state(card, 1);
|
||||
|
||||
err:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void sa6155_ssr_disable(struct device *dev, void *data)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
||||
|
||||
if (!card) {
|
||||
dev_err(dev, "%s: card is NULL\n", __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
dev_info(dev, "%s: setting snd_card to OFFLINE\n", __func__);
|
||||
snd_soc_card_change_online_state(card, 0);
|
||||
}
|
||||
|
||||
static const struct snd_event_ops sa6155_ssr_ops = {
|
||||
.enable = sa6155_ssr_enable,
|
||||
.disable = sa6155_ssr_disable,
|
||||
};
|
||||
|
||||
static int msm_audio_ssr_compare(struct device *dev, void *data)
|
||||
{
|
||||
struct device_node *node = data;
|
||||
|
||||
dev_dbg(dev, "%s: dev->of_node = 0x%p, node = 0x%p\n",
|
||||
__func__, dev->of_node, node);
|
||||
return (dev->of_node && dev->of_node == node);
|
||||
}
|
||||
|
||||
static int msm_audio_ssr_register(struct device *dev)
|
||||
{
|
||||
struct device_node *np = dev->of_node;
|
||||
struct snd_event_clients *ssr_clients = NULL;
|
||||
struct device_node *node;
|
||||
int ret;
|
||||
int i;
|
||||
|
||||
for (i = 0; ; i++) {
|
||||
node = of_parse_phandle(np, "qcom,msm_audio_ssr_devs", i);
|
||||
if (!node)
|
||||
break;
|
||||
snd_event_mstr_add_client(&ssr_clients,
|
||||
msm_audio_ssr_compare, node);
|
||||
}
|
||||
|
||||
ret = snd_event_master_register(dev, &sa6155_ssr_ops,
|
||||
ssr_clients, NULL);
|
||||
if (!ret)
|
||||
snd_event_notify(dev, SND_EVENT_UP);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int msm_asoc_machine_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card;
|
||||
@ -7065,6 +7136,11 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
|
||||
|
||||
msm_i2s_auxpcm_init(pdev);
|
||||
|
||||
ret = msm_audio_ssr_register(&pdev->dev);
|
||||
if (ret)
|
||||
pr_err("%s: Registration with SND event FWK failed ret = %d\n",
|
||||
__func__, ret);
|
||||
|
||||
return 0;
|
||||
err:
|
||||
msm_release_pinctrl(pdev);
|
||||
@ -7091,61 +7167,9 @@ static struct platform_driver sa6155_asoc_machine_driver = {
|
||||
.remove = msm_asoc_machine_remove,
|
||||
};
|
||||
|
||||
static int dummy_asoc_machine_probe(struct platform_device *pdev)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int dummy_asoc_machine_remove(struct platform_device *pdev)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_device sa6155_dummy_asoc_machine_device = {
|
||||
.name = "sa6155-asoc-snd-dummy",
|
||||
};
|
||||
|
||||
static struct platform_driver sa6155_dummy_asoc_machine_driver = {
|
||||
.driver = {
|
||||
.name = "sa6155-asoc-snd-dummy",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = dummy_asoc_machine_probe,
|
||||
.remove = dummy_asoc_machine_remove,
|
||||
};
|
||||
|
||||
static int sa6155_notifier_service_cb(struct notifier_block *this,
|
||||
unsigned long opcode, void *ptr)
|
||||
{
|
||||
pr_debug("%s: Service opcode 0x%lx\n", __func__, opcode);
|
||||
|
||||
switch (opcode) {
|
||||
case AUDIO_NOTIFIER_SERVICE_DOWN:
|
||||
break;
|
||||
case AUDIO_NOTIFIER_SERVICE_UP:
|
||||
if (is_initial_boot) {
|
||||
platform_driver_register(&sa6155_dummy_asoc_machine_driver);
|
||||
platform_device_register(&sa6155_dummy_asoc_machine_device);
|
||||
is_initial_boot = false;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return NOTIFY_OK;
|
||||
}
|
||||
|
||||
static struct notifier_block service_nb = {
|
||||
.notifier_call = sa6155_notifier_service_cb,
|
||||
.priority = -INT_MAX,
|
||||
};
|
||||
|
||||
int __init sa6155_init(void)
|
||||
{
|
||||
pr_debug("%s\n", __func__);
|
||||
audio_notifier_register("sa6155", AUDIO_NOTIFIER_ADSP_DOMAIN,
|
||||
&service_nb);
|
||||
return platform_driver_register(&sa6155_asoc_machine_driver);
|
||||
}
|
||||
|
||||
@ -7153,7 +7177,6 @@ void sa6155_exit(void)
|
||||
{
|
||||
pr_debug("%s\n", __func__);
|
||||
platform_driver_unregister(&sa6155_asoc_machine_driver);
|
||||
audio_notifier_deregister("sa6155");
|
||||
}
|
||||
|
||||
module_init(sa6155_init);
|
||||
|
||||
@ -14,3 +14,4 @@ CONFIG_MSM_QDSP6V2_CODECS=m
|
||||
CONFIG_SND_SOC_QDSP6V2=m
|
||||
CONFIG_SND_SOC_SA6155=m
|
||||
CONFIG_SOUNDWIRE_MSTR_CTRL=m
|
||||
CONFIG_SND_EVENT=m
|
||||
|
||||
@ -26,3 +26,4 @@
|
||||
#define CONFIG_SND_SOC_QDSP6V2 1
|
||||
#define CONFIG_SND_SOC_SA6155 1
|
||||
#define CONFIG_SOUNDWIRE_MSTR_CTRL 1
|
||||
#define CONFIG_SND_EVENT 1
|
||||
|
||||
@ -12,8 +12,12 @@ endif
|
||||
endif
|
||||
|
||||
ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET)),true)
|
||||
ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), sm6150_au))
|
||||
AUDIO_SELECT := CONFIG_SND_SOC_SA6155=m
|
||||
else
|
||||
AUDIO_SELECT := CONFIG_SND_SOC_SM6150=m
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(call is-board-platform,kona),true)
|
||||
AUDIO_SELECT := CONFIG_SND_SOC_KONA=m
|
||||
@ -53,6 +57,7 @@ KBUILD_OPTIONS += $(AUDIO_SELECT)
|
||||
|
||||
###########################################################
|
||||
ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET) kona lito),true)
|
||||
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), sm6150_au))
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := $(AUDIO_CHIPSET)_pinctrl_lpi.ko
|
||||
LOCAL_MODULE_KBUILD_NAME := pinctrl_lpi_dlkm.ko
|
||||
@ -61,8 +66,10 @@ LOCAL_MODULE_DEBUG_ENABLE := true
|
||||
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
|
||||
include $(DLKM_DIR)/AndroidKernelModule.mk
|
||||
endif
|
||||
endif
|
||||
###########################################################
|
||||
ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET) kona), true)
|
||||
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), sm6150_au))
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := $(AUDIO_CHIPSET)_pinctrl_wcd.ko
|
||||
LOCAL_MODULE_KBUILD_NAME := pinctrl_wcd_dlkm.ko
|
||||
@ -71,8 +78,9 @@ LOCAL_MODULE_DEBUG_ENABLE := true
|
||||
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
|
||||
include $(DLKM_DIR)/AndroidKernelModule.mk
|
||||
endif
|
||||
endif
|
||||
###########################################################
|
||||
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq))
|
||||
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq sm6150_au))
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := $(AUDIO_CHIPSET)_swr.ko
|
||||
LOCAL_MODULE_KBUILD_NAME := swr_dlkm.ko
|
||||
|
||||
12
soc/Kbuild
12
soc/Kbuild
@ -35,9 +35,15 @@ ifeq ($(KERNEL_BUILD), 0)
|
||||
INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h
|
||||
endif
|
||||
ifeq ($(CONFIG_ARCH_SM6150), y)
|
||||
include $(AUDIO_ROOT)/config/sm6150auto.conf
|
||||
export
|
||||
INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
|
||||
ifdef CONFIG_SND_SOC_SA6155
|
||||
include $(AUDIO_ROOT)/config/sa6155auto.conf
|
||||
export
|
||||
INCS += -include $(AUDIO_ROOT)/config/sa6155autoconf.h
|
||||
else
|
||||
include $(AUDIO_ROOT)/config/sm6150auto.conf
|
||||
export
|
||||
INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
|
||||
endif
|
||||
endif
|
||||
ifeq ($(CONFIG_ARCH_TRINKET), y)
|
||||
include $(AUDIO_ROOT)/config/sm6150auto.conf
|
||||
|
||||
Loading…
Reference in New Issue
Block a user