[PATCH 0/2] Add devicetree support for aw88261 amplifier driver & minor cleanup

[PATCH 0/2] Add devicetree support for aw88261 amplifier driver & minor cleanup

[Luca Weiss]

A series with a small cleanup and then a patch adding devicetree support
for the aw88261 driver.

Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
---
Luca Weiss (2):
      ASoC: codecs: aw88261: Remove AW88261_I2C_NAME macro
      ASoC: codecs: aw88261: Add devicetree support

 sound/soc/codecs/aw88261.c | 11 +++++++++--
 sound/soc/codecs/aw88261.h |  2 --
 2 files changed, 9 insertions(+), 4 deletions(-)
---
base-commit: ef1c7b875741bef0ff37ae8ab8a9aaf407dc141c
change-id: 20260109-aw88261-dt-367910d29a1e

Best regards,
-- 
Luca Weiss <luca.weiss@fairphone.com>

[PATCH 1/2] ASoC: codecs: aw88261: Remove AW88261_I2C_NAME macro

[Luca Weiss]

Replace the macro by its simple string value, to make the code less
unnecessarily complicated.

Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
---
 sound/soc/codecs/aw88261.c | 4 ++--
 sound/soc/codecs/aw88261.h | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sound/soc/codecs/aw88261.c b/sound/soc/codecs/aw88261.c
index 8f37bfb974ae..ceea0c8c60b1 100644
--- a/sound/soc/codecs/aw88261.c
+++ b/sound/soc/codecs/aw88261.c
@@ -1264,14 +1264,14 @@ static int aw88261_i2c_probe(struct i2c_client *i2c)
 }
 
 static const struct i2c_device_id aw88261_i2c_id[] = {
-	{ AW88261_I2C_NAME },
+	{ "aw88261" },
 	{ }
 };
 MODULE_DEVICE_TABLE(i2c, aw88261_i2c_id);
 
 static struct i2c_driver aw88261_i2c_driver = {
 	.driver = {
-		.name = AW88261_I2C_NAME,
+		.name = "aw88261",
 	},
 	.probe = aw88261_i2c_probe,
 	.id_table = aw88261_i2c_id,
diff --git a/sound/soc/codecs/aw88261.h b/sound/soc/codecs/aw88261.h
index 734d0f93ced9..1fee589608d6 100644
--- a/sound/soc/codecs/aw88261.h
+++ b/sound/soc/codecs/aw88261.h
@@ -370,8 +370,6 @@
 #define AW88261_START_RETRIES		(5)
 #define AW88261_START_WORK_DELAY_MS	(0)
 
-#define AW88261_I2C_NAME		"aw88261"
-
 #define AW88261_RATES (SNDRV_PCM_RATE_8000_48000 | \
 			SNDRV_PCM_RATE_96000)
 #define AW88261_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \

-- 
2.52.0

[PATCH 2/2] ASoC: codecs: aw88261: Add devicetree support

[Luca Weiss]

Add the compatible "awinic,aw88261" so that module autoloading will work
based on the compatible from devicetree.

Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
---
 sound/soc/codecs/aw88261.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/sound/soc/codecs/aw88261.c b/sound/soc/codecs/aw88261.c
index ceea0c8c60b1..810c90f5e783 100644
--- a/sound/soc/codecs/aw88261.c
+++ b/sound/soc/codecs/aw88261.c
@@ -1269,9 +1269,16 @@ static const struct i2c_device_id aw88261_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, aw88261_i2c_id);
 
+static const struct of_device_id aw88261_of_table[] = {
+	{ .compatible = "awinic,aw88261" },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, aw88261_of_table);
+
 static struct i2c_driver aw88261_i2c_driver = {
 	.driver = {
 		.name = "aw88261",
+		.of_match_table = aw88261_of_table,
 	},
 	.probe = aw88261_i2c_probe,
 	.id_table = aw88261_i2c_id,

-- 
2.52.0

Re: [PATCH 2/2] ASoC: codecs: aw88261: Add devicetree support

[Bhushan Shah]

On Friday, 9 January 2026 20:32:06 IST Luca Weiss wrote:
> Add the compatible "awinic,aw88261" so that module autoloading will work
> based on the compatible from devicetree.
> 
> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>

Tested-by: Bhushan Shah <bhushan.shah@machinesoul.in>

> ---
>  sound/soc/codecs/aw88261.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/sound/soc/codecs/aw88261.c b/sound/soc/codecs/aw88261.c
> index ceea0c8c60b1..810c90f5e783 100644
> --- a/sound/soc/codecs/aw88261.c
> +++ b/sound/soc/codecs/aw88261.c
> @@ -1269,9 +1269,16 @@ static const struct i2c_device_id aw88261_i2c_id[] =
> { };
>  MODULE_DEVICE_TABLE(i2c, aw88261_i2c_id);
> 
> +static const struct of_device_id aw88261_of_table[] = {
> +	{ .compatible = "awinic,aw88261" },
> +	{ }
> +};
> +MODULE_DEVICE_TABLE(of, aw88261_of_table);
> +
>  static struct i2c_driver aw88261_i2c_driver = {
>  	.driver = {
>  		.name = "aw88261",
> +		.of_match_table = aw88261_of_table,
>  	},
>  	.probe = aw88261_i2c_probe,
>  	.id_table = aw88261_i2c_id,

Re: [PATCH 0/2] Add devicetree support for aw88261 amplifier driver & minor cleanup

[Mark Brown]

On Fri, 09 Jan 2026 16:02:04 +0100, Luca Weiss wrote:
> A series with a small cleanup and then a patch adding devicetree support
> for the aw88261 driver.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/2] ASoC: codecs: aw88261: Remove AW88261_I2C_NAME macro
      commit: e76f8c269e3558d02e19515cd3cc470e42ddbd36
[2/2] ASoC: codecs: aw88261: Add devicetree support
      commit: b9198ce5c6dfee19b9662dda95ba559af9cdf53f

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark