Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e4cb7b6 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: cs42xx8: Setup of_match_table 



Setup of_match_table and since cs42xx8_of_match is exported and used in
cs42xx8-i2c.c, it cannot be static.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarBrian Austin <brian.austin@cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d375d0ab

sound/soc/codecs/cs42xx8-i2c.c

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
static int cs42xx8_i2c_probe(struct i2c_client *i2c,

			     const struct i2c_device_id *id)

{

	u32 ret = cs42xx8_probe(&i2c->dev,

	int ret = cs42xx8_probe(&i2c->dev,

			devm_regmap_init_i2c(i2c, &cs42xx8_regmap_config));

	if (ret)

		return ret;
@@ -51,6 +51,7 @@ static struct i2c_driver cs42xx8_i2c_driver = { 
		.name = "cs42xx8",

		.owner = THIS_MODULE,

		.pm = &cs42xx8_pm,

		.of_match_table = cs42xx8_of_match,

	},

	.probe = cs42xx8_i2c_probe,

	.remove = cs42xx8_i2c_remove,

sound/soc/codecs/cs42xx8.c

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ const struct cs42xx8_driver_data cs42888_data = { 
};

EXPORT_SYMBOL_GPL(cs42888_data);



static const struct of_device_id cs42xx8_of_match[] = {

const struct of_device_id cs42xx8_of_match[] = {

	{ .compatible = "cirrus,cs42448", .data = &cs42448_data, },

	{ .compatible = "cirrus,cs42888", .data = &cs42888_data, },

	{ /* sentinel */ }

sound/soc/codecs/cs42xx8.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ extern const struct dev_pm_ops cs42xx8_pm; 
extern const struct cs42xx8_driver_data cs42448_data;

extern const struct cs42xx8_driver_data cs42888_data;

extern const struct regmap_config cs42xx8_regmap_config;

extern const struct of_device_id cs42xx8_of_match[];

int cs42xx8_probe(struct device *dev, struct regmap *regmap);



/* CS42888 register map */