Unverified Commit 6a3af823 authored by Mark Brown's avatar Mark Brown
Browse files

Match data improvements for ak4642 driver 

Merge series from Biju Das <biju.das.jz@bp.renesas.com>:

This patch series aims to add match data improvements for ak4642 driver.

This patch series is only compile tested.
parents dbef5166 d9e6a80a

sound/soc/codecs/ak4642.c

+7 −21
Original line number Diff line number Diff line
@@ -628,37 +628,23 @@ static struct clk *ak4642_of_parse_mcko(struct device *dev) 
#define ak4642_of_parse_mcko(d) 0

#endif



static const struct of_device_id ak4642_of_match[];

static const struct i2c_device_id ak4642_i2c_id[];

static int ak4642_i2c_probe(struct i2c_client *i2c)

{

	struct device *dev = &i2c->dev;

	struct device_node *np = dev->of_node;

	const struct ak4642_drvdata *drvdata = NULL;

	const struct ak4642_drvdata *drvdata;

	struct regmap *regmap;

	struct ak4642_priv *priv;

	struct clk *mcko = NULL;



	if (np) {

		const struct of_device_id *of_id;



	if (dev_fwnode(dev)) {

		mcko = ak4642_of_parse_mcko(dev);

		if (IS_ERR(mcko))

			mcko = NULL;



		of_id = of_match_device(ak4642_of_match, dev);

		if (of_id)

			drvdata = of_id->data;

	} else {

		const struct i2c_device_id *id =

			i2c_match_id(ak4642_i2c_id, i2c);

		drvdata = (const struct ak4642_drvdata *)id->driver_data;

	}



	if (!drvdata) {

		dev_err(dev, "Unknown device type\n");

		return -EINVAL;

	}

	drvdata = i2c_get_match_data(i2c);

	if (!drvdata)

		return dev_err_probe(dev, -EINVAL, "Unknown device type\n");



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)
@@ -681,7 +667,7 @@ static const struct of_device_id ak4642_of_match[] = { 
	{ .compatible = "asahi-kasei,ak4642",	.data = &ak4642_drvdata},

	{ .compatible = "asahi-kasei,ak4643",	.data = &ak4643_drvdata},

	{ .compatible = "asahi-kasei,ak4648",	.data = &ak4648_drvdata},

	{},

	{}

};

MODULE_DEVICE_TABLE(of, ak4642_of_match);