Unverified Commit e5afc867 authored by Peter Bergin's avatar Peter Bergin Committed by Mark Brown
Browse files

ASoC: cs42xx8-i2c.c: add module device table for of 



When trying to connect the device with the driver through
device-tree it is not working. The of_device_id is defined in
cs42xx8.c but is not correctly included in cs42xx8-i2c.c.

Move of_device_id table to cs42xx8-i2c.c. Get cs42xx8_driver_data
in cs42xx8_i2c_probe() and pass as argument to cs42xx8_probe(). Move
error check if no driver data found to cs42xx8_i2c_probe().

Signed-off-by: default avatarPeter Bergin <peter@berginkonsult.se>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20221031203723.168177-1-peter@berginkonsult.se


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f8fbf0dc

sound/soc/codecs/cs42xx8-i2c.c

+25 −3
Original line number Diff line number Diff line
@@ -12,15 +12,30 @@ 


#include <linux/i2c.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/pm_runtime.h>

#include <sound/soc.h>



#include "cs42xx8.h"



static const struct of_device_id cs42xx8_of_match[];



static int cs42xx8_i2c_probe(struct i2c_client *i2c)

{

	int ret = cs42xx8_probe(&i2c->dev,

			devm_regmap_init_i2c(i2c, &cs42xx8_regmap_config));

	int ret;

	struct cs42xx8_driver_data *drvdata;

	const struct of_device_id *of_id;



	of_id = of_match_device(cs42xx8_of_match, &i2c->dev);

	if (!of_id) {

		dev_err(&i2c->dev, "failed to find driver data\n");

		return -EINVAL;

	}



	drvdata = (struct cs42xx8_driver_data *)of_id->data;



	ret = cs42xx8_probe(&i2c->dev,

		devm_regmap_init_i2c(i2c, &cs42xx8_regmap_config), drvdata);

	if (ret)

		return ret;
@@ -35,7 +50,14 @@ static void cs42xx8_i2c_remove(struct i2c_client *i2c) 
	pm_runtime_disable(&i2c->dev);

}



static struct i2c_device_id cs42xx8_i2c_id[] = {

static const struct of_device_id cs42xx8_of_match[] = {

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

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

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, cs42xx8_of_match);



static const struct i2c_device_id cs42xx8_i2c_id[] = {

	{"cs42448", (kernel_ulong_t)&cs42448_data},

	{"cs42888", (kernel_ulong_t)&cs42888_data},

	{}

sound/soc/codecs/cs42xx8.c

+3 −19
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/gpio/consumer.h>

#include <linux/pm_runtime.h>

#include <linux/regulator/consumer.h>
@@ -511,17 +510,8 @@ const struct cs42xx8_driver_data cs42888_data = { 
};

EXPORT_SYMBOL_GPL(cs42888_data);



const struct of_device_id cs42xx8_of_match[] = {

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

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

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, cs42xx8_of_match);

EXPORT_SYMBOL_GPL(cs42xx8_of_match);



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

int cs42xx8_probe(struct device *dev, struct regmap *regmap, struct cs42xx8_driver_data *drvdata)

{

	const struct of_device_id *of_id;

	struct cs42xx8_priv *cs42xx8;

	int ret, val, i;
@@ -535,17 +525,11 @@ int cs42xx8_probe(struct device *dev, struct regmap *regmap) 
	if (cs42xx8 == NULL)

		return -ENOMEM;



	cs42xx8->regmap = regmap;

	dev_set_drvdata(dev, cs42xx8);



	of_id = of_match_device(cs42xx8_of_match, dev);

	if (of_id)

		cs42xx8->drvdata = of_id->data;

	cs42xx8->regmap = regmap;



	if (!cs42xx8->drvdata) {

		dev_err(dev, "failed to find driver data\n");

		return -EINVAL;

	}

	cs42xx8->drvdata = drvdata;



	cs42xx8->gpiod_reset = devm_gpiod_get_optional(dev, "reset",

							GPIOD_OUT_HIGH);

sound/soc/codecs/cs42xx8.h

+1 −2
Original line number Diff line number Diff line
@@ -22,8 +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);

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



/* CS42888 register map */

#define CS42XX8_CHIPID				0x01	/* Chip ID */