Unverified Commit 9dc2e2b6 authored by Mark Brown's avatar Mark Brown
Browse files

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.
parents eb4cd1a4 b9198ce5

sound/soc/codecs/aw88261.c

+9 −2
Original line number Diff line number Diff line
@@ -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,

sound/soc/codecs/aw88261.h

+0 −2
Original line number Diff line number Diff line
@@ -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 | \