Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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.
+9
-4
+9
-2
sound/soc/codecs/aw88261.c
+9
-2
sound/soc/codecs/aw88261.c
···
1264
1264
}
1265
1265
1266
1266
static const struct i2c_device_id aw88261_i2c_id[] = {
1267
-
{ AW88261_I2C_NAME },
1267
+
{ "aw88261" },
1268
1268
{ }
1269
1269
};
1270
1270
MODULE_DEVICE_TABLE(i2c, aw88261_i2c_id);
1271
1271
1272
+
static const struct of_device_id aw88261_of_table[] = {
1273
+
{ .compatible = "awinic,aw88261" },
1274
+
{ }
1275
+
};
1276
+
MODULE_DEVICE_TABLE(of, aw88261_of_table);
1277
+
1272
1278
static struct i2c_driver aw88261_i2c_driver = {
1273
1279
.driver = {
1274
-
.name = AW88261_I2C_NAME,
1280
+
.name = "aw88261",
1281
+
.of_match_table = aw88261_of_table,
1275
1282
},
1276
1283
.probe = aw88261_i2c_probe,
1277
1284
.id_table = aw88261_i2c_id,
-2
sound/soc/codecs/aw88261.h
-2
sound/soc/codecs/aw88261.h
···
370
370
#define AW88261_START_RETRIES (5)
371
371
#define AW88261_START_WORK_DELAY_MS (0)
372
372
373
-
#define AW88261_I2C_NAME "aw88261"
374
-
375
373
#define AW88261_RATES (SNDRV_PCM_RATE_8000_48000 | \
376
374
SNDRV_PCM_RATE_96000)
377
375
#define AW88261_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \