diff options
| author | Mark Brown <broonie@kernel.org> | 2026-01-13 14:55:44 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-01-13 14:55:44 +0300 |
| commit | 9dc2e2b63e5aeebbf0467aa8914f120bb6dbe7b2 (patch) | |
| tree | 0a79febb3b21f1689c070ef03010362cb2e6c30e | |
| parent | eb4cd1a4a9ef115193a9bef447b5db11bb7defc9 (diff) | |
| parent | b9198ce5c6dfee19b9662dda95ba559af9cdf53f (diff) | |
| download | linux-9dc2e2b63e5aeebbf0467aa8914f120bb6dbe7b2.tar.xz | |
Add devicetree support for aw88261 amplifier driver &
Merge series from Luca Weiss <luca.weiss@fairphone.com>:
A series with a small cleanup and then a patch adding devicetree support
for the aw88261 driver.
| -rw-r--r-- | sound/soc/codecs/aw88261.c | 11 | ||||
| -rw-r--r-- | sound/soc/codecs/aw88261.h | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sound/soc/codecs/aw88261.c b/sound/soc/codecs/aw88261.c index 8f37bfb974ae..810c90f5e783 100644 --- a/sound/soc/codecs/aw88261.c +++ b/sound/soc/codecs/aw88261.c @@ -1264,14 +1264,21 @@ 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 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_I2C_NAME, + .name = "aw88261", + .of_match_table = aw88261_of_table, }, .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 | \ |