mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-23 10:32:54 +00:00
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
|
From d27f0a78c42650dae9b89adf824dfbeb0adcae1b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
||
|
|
Date: Tue, 8 Mar 2022 13:26:02 -0600
|
||
|
|
Subject: [PATCH 405/424] ASoC: Intel: sof_es8336: get codec device with ACPI
|
||
|
|
instead of bus search
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
We have an existing 'adev' handle from which we can find the codec
|
||
|
|
device, no need for an I2C bus search.
|
||
|
|
|
||
|
|
This change aligns this driver will all other I2S-based machine
|
||
|
|
drivers.
|
||
|
|
|
||
|
|
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
||
|
|
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
|
||
|
|
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
|
||
|
|
Link: https://lore.kernel.org/r/20220308192610.392950-13-pierre-louis.bossart@linux.intel.com
|
||
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
||
|
|
---
|
||
|
|
sound/soc/intel/boards/sof_es8336.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c
|
||
|
|
index eb792bd91..bb4a3491d 100644
|
||
|
|
--- a/sound/soc/intel/boards/sof_es8336.c
|
||
|
|
+++ b/sound/soc/intel/boards/sof_es8336.c
|
||
|
|
@@ -515,9 +515,10 @@ static int sof_es8336_probe(struct platform_device *pdev)
|
||
|
|
return ret;
|
||
|
|
|
||
|
|
/* get speaker enable GPIO */
|
||
|
|
- codec_dev = bus_find_device_by_name(&i2c_bus_type, NULL, codec_name);
|
||
|
|
+ codec_dev = acpi_get_first_physical_node(adev);
|
||
|
|
if (!codec_dev)
|
||
|
|
return -EPROBE_DEFER;
|
||
|
|
+ priv->codec_dev = get_device(codec_dev);
|
||
|
|
|
||
|
|
ret = devm_acpi_dev_add_driver_gpios(codec_dev, gpio_mapping);
|
||
|
|
if (ret)
|
||
|
|
@@ -530,7 +531,6 @@ static int sof_es8336_probe(struct platform_device *pdev)
|
||
|
|
goto err;
|
||
|
|
}
|
||
|
|
|
||
|
|
- priv->codec_dev = codec_dev;
|
||
|
|
INIT_LIST_HEAD(&priv->hdmi_pcm_list);
|
||
|
|
|
||
|
|
snd_soc_card_set_drvdata(card, priv);
|
||
|
|
--
|
||
|
|
2.35.2
|
||
|
|
|