From e76f8c269e3558d02e19515cd3cc470e42ddbd36 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Fri, 9 Jan 2026 16:02:05 +0100 Subject: ASoC: codecs: aw88261: Remove AW88261_I2C_NAME macro Replace the macro by its simple string value, to make the code less unnecessarily complicated. Signed-off-by: Luca Weiss Link: https://patch.msgid.link/20260109-aw88261-dt-v1-1-45840c7632a3@fairphone.com Signed-off-by: Mark Brown --- 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 | \ -- cgit v1.2.3 From b9198ce5c6dfee19b9662dda95ba559af9cdf53f Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Fri, 9 Jan 2026 16:02:06 +0100 Subject: ASoC: codecs: aw88261: Add devicetree support Add the compatible "awinic,aw88261" so that module autoloading will work based on the compatible from devicetree. Signed-off-by: Luca Weiss Link: https://patch.msgid.link/20260109-aw88261-dt-v1-2-45840c7632a3@fairphone.com Signed-off-by: Mark Brown --- 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, -- cgit v1.2.3