ASoC: Merge up fixes (cfee987c) · Commits · EulixOS / Software / Kernel

MAINTAINERS

+33 −0

Original line number	Diff line number	Diff line
		@@ -21063,6 +21063,39 @@ S: Maintained
		F: Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
		F: sound/soc/ti/

		TEXAS INSTRUMENTS AUDIO (ASoC/HDA) DRIVERS
		M: Shenghao Ding <shenghao-ding@ti.com>
		M: Kevin Lu <kevin-lu@ti.com>
		M: Baojun Xu <x1077012@ti.com>
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
		S: Maintained
		F: Documentation/devicetree/bindings/sound/tas2552.txt
		F: Documentation/devicetree/bindings/sound/tas2562.yaml
		F: Documentation/devicetree/bindings/sound/tas2770.yaml
		F: Documentation/devicetree/bindings/sound/tas27xx.yaml
		F: Documentation/devicetree/bindings/sound/ti,pcm1681.txt
		F: Documentation/devicetree/bindings/sound/ti,pcm3168a.yaml
		F: Documentation/devicetree/bindings/sound/ti,tlv320*.yaml
		F: Documentation/devicetree/bindings/sound/tlv320adcx140.yaml
		F: Documentation/devicetree/bindings/sound/tlv320aic31xx.txt
		F: Documentation/devicetree/bindings/sound/tpa6130a2.txt
		F: include/sound/tas2*.h
		F: include/sound/tlv320*.h
		F: include/sound/tpa6130a2-plat.h
		F: sound/pci/hda/tas2781_hda_i2c.c
		F: sound/soc/codecs/pcm1681.c
		F: sound/soc/codecs/pcm1789.
		F: sound/soc/codecs/pcm179x.
		F: sound/soc/codecs/pcm186x.
		F: sound/soc/codecs/pcm3008.*
		F: sound/soc/codecs/pcm3060.
		F: sound/soc/codecs/pcm3168a.
		F: sound/soc/codecs/pcm5102a.c
		F: sound/soc/codecs/pcm512x.
		F: sound/soc/codecs/tas2.
		F: sound/soc/codecs/tlv320.
		F: sound/soc/codecs/tpa6130a2.*

		TEXAS INSTRUMENTS DMA DRIVERS
		M: Peter Ujfalusi <peter.ujfalusi@gmail.com>
		L: dmaengine@vger.kernel.org

sound/soc/codecs/cs35l56-i2c.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -62,10 +62,19 @@ static const struct i2c_device_id cs35l56_id_i2c[] = {
		};
		MODULE_DEVICE_TABLE(i2c, cs35l56_id_i2c);

		#ifdef CONFIG_ACPI
		static const struct acpi_device_id cs35l56_asoc_acpi_match[] = {
		{ "CSC355C", 0 },
		{},
		};
		MODULE_DEVICE_TABLE(acpi, cs35l56_asoc_acpi_match);
		#endif

		static struct i2c_driver cs35l56_i2c_driver = {
		.driver = {
		.name = "cs35l56",
		.pm = &cs35l56_pm_ops_i2c_spi,
		.acpi_match_table = ACPI_PTR(cs35l56_asoc_acpi_match),
		},
		.id_table = cs35l56_id_i2c,
		.probe = cs35l56_i2c_probe,

sound/soc/codecs/cs35l56-spi.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -59,10 +59,19 @@ static const struct spi_device_id cs35l56_id_spi[] = {
		};
		MODULE_DEVICE_TABLE(spi, cs35l56_id_spi);

		#ifdef CONFIG_ACPI
		static const struct acpi_device_id cs35l56_asoc_acpi_match[] = {
		{ "CSC355C", 0 },
		{},
		};
		MODULE_DEVICE_TABLE(acpi, cs35l56_asoc_acpi_match);
		#endif

		static struct spi_driver cs35l56_spi_driver = {
		.driver = {
		.name = "cs35l56",
		.pm = &cs35l56_pm_ops_i2c_spi,
		.acpi_match_table = ACPI_PTR(cs35l56_asoc_acpi_match),
		},
		.id_table = cs35l56_id_spi,
		.probe = cs35l56_spi_probe,

sound/soc/codecs/cs35l56.c

+12 −19

Original line number	Diff line number	Diff line
		@@ -5,7 +5,6 @@
		// Copyright (C) 2023 Cirrus Logic, Inc. and
		// Cirrus Logic International Semiconductor Ltd.

		#include <linux/acpi.h>
		#include <linux/completion.h>
		#include <linux/debugfs.h>
		#include <linux/delay.h>
		@@ -1029,26 +1028,22 @@ static int cs35l56_dsp_init(struct cs35l56_private *cs35l56)
		return 0;
		}

		static int cs35l56_acpi_get_name(struct cs35l56_private *cs35l56)
		static int cs35l56_get_firmware_uid(struct cs35l56_private *cs35l56)
		{
		acpi_handle handle = ACPI_HANDLE(cs35l56->base.dev);
		const char *sub;
		struct device *dev = cs35l56->base.dev;
		const char *prop;
		int ret;

		/* If there is no ACPI_HANDLE, there is no ACPI for this system, return 0 */
		if (!handle)
		ret = device_property_read_string(dev, "cirrus,firmware-uid", &prop);
		/* If bad sw node property, return 0 and fallback to legacy firmware path */
		if (ret < 0)
		return 0;

		sub = acpi_get_subsystem_id(handle);
		if (IS_ERR(sub)) {
		/* If bad ACPI, return 0 and fallback to legacy firmware path, otherwise fail */
		if (PTR_ERR(sub) == -ENODATA)
		return 0;
		else
		return PTR_ERR(sub);
		}
		cs35l56->dsp.system_name = devm_kstrdup(dev, prop, GFP_KERNEL);
		if (cs35l56->dsp.system_name == NULL)
		return -ENOMEM;

		cs35l56->dsp.system_name = sub;
		dev_dbg(cs35l56->base.dev, "Subsystem ID: %s\n", cs35l56->dsp.system_name);
		dev_dbg(dev, "Firmware UID: %s\n", cs35l56->dsp.system_name);

		return 0;
		}
		@@ -1095,7 +1090,7 @@ int cs35l56_common_probe(struct cs35l56_private *cs35l56)
		gpiod_set_value_cansleep(cs35l56->base.reset_gpio, 1);
		}

		ret = cs35l56_acpi_get_name(cs35l56);
		ret = cs35l56_get_firmware_uid(cs35l56);
		if (ret != 0)
		goto err;

		@@ -1217,8 +1212,6 @@ void cs35l56_remove(struct cs35l56_private *cs35l56)

		regcache_cache_only(cs35l56->base.regmap, true);

		kfree(cs35l56->dsp.system_name);

		gpiod_set_value_cansleep(cs35l56->base.reset_gpio, 0);
		regulator_bulk_disable(ARRAY_SIZE(cs35l56->supplies), cs35l56->supplies);
		}

sound/soc/codecs/rt1308-sdw.c

+12 −1

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ static bool rt1308_volatile_register(struct device *dev, unsigned int reg)
		case 0x300a:
		case 0xc000:
		case 0xc710:
		case 0xcf01:
		case 0xc860 ... 0xc863:
		case 0xc870 ... 0xc873:
		return true;
		@@ -213,7 +214,7 @@ static int rt1308_io_init(struct device dev, struct sdw_slave slave)
		{
		struct rt1308_sdw_priv *rt1308 = dev_get_drvdata(dev);
		int ret = 0;
		unsigned int tmp;
		unsigned int tmp, hibernation_flag;

		if (rt1308->hw_init)
		return 0;
		@@ -231,6 +232,10 @@ static int rt1308_io_init(struct device dev, struct sdw_slave slave)

		pm_runtime_get_noresume(&slave->dev);

		regmap_read(rt1308->regmap, 0xcf01, &hibernation_flag);
		if ((hibernation_flag != 0x00) && rt1308->first_hw_init)
		goto _preset_ready_;

		/* sw reset */
		regmap_write(rt1308->regmap, RT1308_SDW_RESET, 0);

		@@ -271,6 +276,12 @@ static int rt1308_io_init(struct device dev, struct sdw_slave slave)
		regmap_write(rt1308->regmap, 0xc100, 0xd7);
		regmap_write(rt1308->regmap, 0xc101, 0xd7);

		/* apply BQ params */
		rt1308_apply_bq_params(rt1308);

		regmap_write(rt1308->regmap, 0xcf01, 0x01);

		_preset_ready_:
		if (rt1308->first_hw_init) {
		regcache_cache_bypass(rt1308->regmap, false);
		regcache_mark_dirty(rt1308->regmap);