mirror of
https://github.com/armbian/build.git
synced 2025-08-11 21:56:58 +02:00
03f380178d
* Move Meson64 to 5.6.y * Move Meson64 U-boot to 2020.04 Tested on Odroid C2 * Merge, replace and update patches from Khadas branch
114 lines
3.8 KiB
Diff
114 lines
3.8 KiB
Diff
From 79bf504bff5167b244e1e86cd6e85c6a6c87764f Mon Sep 17 00:00:00 2001
|
|
From: Jerome Brunet <jbrunet@baylibre.com>
|
|
Date: Mon, 17 Feb 2020 17:16:47 +0000
|
|
Subject: [PATCH 026/101] FROMGIT: ASoC: meson: aiu: simplify component
|
|
addition
|
|
|
|
Now that the component name is unique within ASoC, there is no need to
|
|
hack the debugfs prefix to add more than one ASoC component to a linux
|
|
device. Remove the unnecessary function and use
|
|
snd_soc_register_component() directly.
|
|
|
|
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
|
|
---
|
|
sound/soc/meson/aiu-acodec-ctrl.c | 7 +++----
|
|
sound/soc/meson/aiu-codec-ctrl.c | 7 +++----
|
|
sound/soc/meson/aiu.c | 20 --------------------
|
|
sound/soc/meson/aiu.h | 8 --------
|
|
4 files changed, 6 insertions(+), 36 deletions(-)
|
|
|
|
diff --git a/sound/soc/meson/aiu-acodec-ctrl.c b/sound/soc/meson/aiu-acodec-ctrl.c
|
|
index b8e88b1a4fc8..7078197e0cc5 100644
|
|
--- a/sound/soc/meson/aiu-acodec-ctrl.c
|
|
+++ b/sound/soc/meson/aiu-acodec-ctrl.c
|
|
@@ -197,8 +197,7 @@ static const struct snd_soc_component_driver aiu_acodec_ctrl_component = {
|
|
|
|
int aiu_acodec_ctrl_register_component(struct device *dev)
|
|
{
|
|
- return aiu_add_component(dev, &aiu_acodec_ctrl_component,
|
|
- aiu_acodec_ctrl_dai_drv,
|
|
- ARRAY_SIZE(aiu_acodec_ctrl_dai_drv),
|
|
- "acodec");
|
|
+ return snd_soc_register_component(dev, &aiu_acodec_ctrl_component,
|
|
+ aiu_acodec_ctrl_dai_drv,
|
|
+ ARRAY_SIZE(aiu_acodec_ctrl_dai_drv));
|
|
}
|
|
diff --git a/sound/soc/meson/aiu-codec-ctrl.c b/sound/soc/meson/aiu-codec-ctrl.c
|
|
index 8646a953e3b3..4b773d3e8b07 100644
|
|
--- a/sound/soc/meson/aiu-codec-ctrl.c
|
|
+++ b/sound/soc/meson/aiu-codec-ctrl.c
|
|
@@ -144,9 +144,8 @@ static const struct snd_soc_component_driver aiu_hdmi_ctrl_component = {
|
|
|
|
int aiu_hdmi_ctrl_register_component(struct device *dev)
|
|
{
|
|
- return aiu_add_component(dev, &aiu_hdmi_ctrl_component,
|
|
- aiu_hdmi_ctrl_dai_drv,
|
|
- ARRAY_SIZE(aiu_hdmi_ctrl_dai_drv),
|
|
- "hdmi");
|
|
+ return snd_soc_register_component(dev, &aiu_hdmi_ctrl_component,
|
|
+ aiu_hdmi_ctrl_dai_drv,
|
|
+ ARRAY_SIZE(aiu_hdmi_ctrl_dai_drv));
|
|
}
|
|
|
|
diff --git a/sound/soc/meson/aiu.c b/sound/soc/meson/aiu.c
|
|
index 34b40b8b8299..d3e2d40e9562 100644
|
|
--- a/sound/soc/meson/aiu.c
|
|
+++ b/sound/soc/meson/aiu.c
|
|
@@ -71,26 +71,6 @@ int aiu_of_xlate_dai_name(struct snd_soc_component *component,
|
|
return 0;
|
|
}
|
|
|
|
-int aiu_add_component(struct device *dev,
|
|
- const struct snd_soc_component_driver *component_driver,
|
|
- struct snd_soc_dai_driver *dai_drv,
|
|
- int num_dai,
|
|
- const char *debugfs_prefix)
|
|
-{
|
|
- struct snd_soc_component *component;
|
|
-
|
|
- component = devm_kzalloc(dev, sizeof(*component), GFP_KERNEL);
|
|
- if (!component)
|
|
- return -ENOMEM;
|
|
-
|
|
-#ifdef CONFIG_DEBUG_FS
|
|
- component->debugfs_prefix = debugfs_prefix;
|
|
-#endif
|
|
-
|
|
- return snd_soc_add_component(dev, component, component_driver,
|
|
- dai_drv, num_dai);
|
|
-}
|
|
-
|
|
static int aiu_cpu_of_xlate_dai_name(struct snd_soc_component *component,
|
|
struct of_phandle_args *args,
|
|
const char **dai_name)
|
|
diff --git a/sound/soc/meson/aiu.h b/sound/soc/meson/aiu.h
|
|
index 097c26de7b7c..06a968c55728 100644
|
|
--- a/sound/soc/meson/aiu.h
|
|
+++ b/sound/soc/meson/aiu.h
|
|
@@ -11,9 +11,7 @@ struct clk;
|
|
struct clk_bulk_data;
|
|
struct device;
|
|
struct of_phandle_args;
|
|
-struct snd_soc_component_driver;
|
|
struct snd_soc_dai;
|
|
-struct snd_soc_dai_driver;
|
|
struct snd_soc_dai_ops;
|
|
|
|
enum aiu_clk_ids {
|
|
@@ -45,12 +43,6 @@ int aiu_of_xlate_dai_name(struct snd_soc_component *component,
|
|
const char **dai_name,
|
|
unsigned int component_id);
|
|
|
|
-int aiu_add_component(struct device *dev,
|
|
- const struct snd_soc_component_driver *component_driver,
|
|
- struct snd_soc_dai_driver *dai_drv,
|
|
- int num_dai,
|
|
- const char *debugfs_prefix);
|
|
-
|
|
int aiu_hdmi_ctrl_register_component(struct device *dev);
|
|
int aiu_acodec_ctrl_register_component(struct device *dev);
|
|
|
|
--
|
|
2.17.1
|
|
|