Unverified Commit ab78322a authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

ASoC: cs42l42: Use device_property API instead of of_property 



Use the device_property APIs so that the code will work on devicetree
and ACPI systems.

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Signed-off-by: default avatarLucas Tanure <tanureal@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210426155303.853236-2-tanureal@opensource.cirrus.com


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

sound/soc/codecs/cs42l42.c

+24 −36
Original line number Diff line number Diff line
@@ -20,10 +20,9 @@ 
#include <linux/regmap.h>

#include <linux/slab.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/regulator/consumer.h>

#include <linux/gpio/consumer.h>

#include <linux/of.h>

#include <linux/of_gpio.h>

#include <linux/of_device.h>

#include <linux/pm_runtime.h>

#include <sound/core.h>
@@ -1637,17 +1636,15 @@ static const unsigned int threshold_defaults[] = { 
	CS42L42_HS_DET_LEVEL_1

};



static int cs42l42_handle_device_data(struct i2c_client *i2c_client,

static int cs42l42_handle_device_data(struct device *dev,

					struct cs42l42_private *cs42l42)

{

	struct device_node *np = i2c_client->dev.of_node;

	unsigned int val;

	unsigned int thresholds[CS42L42_NUM_BIASES];

	u32 thresholds[CS42L42_NUM_BIASES];

	int ret;

	int i;



	ret = of_property_read_u32(np, "cirrus,ts-inv", &val);



	ret = device_property_read_u32(dev, "cirrus,ts-inv", &val);

	if (!ret) {

		switch (val) {

		case CS42L42_TS_INV_EN:
@@ -1655,7 +1652,7 @@ static int cs42l42_handle_device_data(struct i2c_client *i2c_client, 
			cs42l42->ts_inv = val;

			break;

		default:

			dev_err(&i2c_client->dev,

			dev_err(dev,

				"Wrong cirrus,ts-inv DT value %d\n",

				val);

			cs42l42->ts_inv = CS42L42_TS_INV_DIS;
@@ -1668,8 +1665,7 @@ static int cs42l42_handle_device_data(struct i2c_client *i2c_client, 
			CS42L42_TS_INV_MASK,

			(cs42l42->ts_inv << CS42L42_TS_INV_SHIFT));



	ret = of_property_read_u32(np, "cirrus,ts-dbnc-rise", &val);



	ret = device_property_read_u32(dev, "cirrus,ts-dbnc-rise", &val);

	if (!ret) {

		switch (val) {

		case CS42L42_TS_DBNCE_0:
@@ -1683,7 +1679,7 @@ static int cs42l42_handle_device_data(struct i2c_client *i2c_client, 
			cs42l42->ts_dbnc_rise = val;

			break;

		default:

			dev_err(&i2c_client->dev,

			dev_err(dev,

				"Wrong cirrus,ts-dbnc-rise DT value %d\n",

				val);

			cs42l42->ts_dbnc_rise = CS42L42_TS_DBNCE_1000;
@@ -1697,8 +1693,7 @@ static int cs42l42_handle_device_data(struct i2c_client *i2c_client, 
			(cs42l42->ts_dbnc_rise <<

			CS42L42_TS_RISE_DBNCE_TIME_SHIFT));



	ret = of_property_read_u32(np, "cirrus,ts-dbnc-fall", &val);



	ret = device_property_read_u32(dev, "cirrus,ts-dbnc-fall", &val);

	if (!ret) {

		switch (val) {

		case CS42L42_TS_DBNCE_0:
@@ -1712,7 +1707,7 @@ static int cs42l42_handle_device_data(struct i2c_client *i2c_client, 
			cs42l42->ts_dbnc_fall = val;

			break;

		default:

			dev_err(&i2c_client->dev,

			dev_err(dev,

				"Wrong cirrus,ts-dbnc-fall DT value %d\n",

				val);

			cs42l42->ts_dbnc_fall = CS42L42_TS_DBNCE_0;
@@ -1726,13 +1721,12 @@ static int cs42l42_handle_device_data(struct i2c_client *i2c_client, 
			(cs42l42->ts_dbnc_fall <<

			CS42L42_TS_FALL_DBNCE_TIME_SHIFT));



	ret = of_property_read_u32(np, "cirrus,btn-det-init-dbnce", &val);



	ret = device_property_read_u32(dev, "cirrus,btn-det-init-dbnce", &val);

	if (!ret) {

		if (val <= CS42L42_BTN_DET_INIT_DBNCE_MAX)

			cs42l42->btn_det_init_dbnce = val;

		else {

			dev_err(&i2c_client->dev,

			dev_err(dev,

				"Wrong cirrus,btn-det-init-dbnce DT value %d\n",

				val);

			cs42l42->btn_det_init_dbnce =
@@ -1743,13 +1737,12 @@ static int cs42l42_handle_device_data(struct i2c_client *i2c_client, 
			CS42L42_BTN_DET_INIT_DBNCE_DEFAULT;

	}



	ret = of_property_read_u32(np, "cirrus,btn-det-event-dbnce", &val);



	ret = device_property_read_u32(dev, "cirrus,btn-det-event-dbnce", &val);

	if (!ret) {

		if (val <= CS42L42_BTN_DET_EVENT_DBNCE_MAX)

			cs42l42->btn_det_event_dbnce = val;

		else {

			dev_err(&i2c_client->dev,

			dev_err(dev,

				"Wrong cirrus,btn-det-event-dbnce DT value %d\n", val);

			cs42l42->btn_det_event_dbnce =

				CS42L42_BTN_DET_EVENT_DBNCE_DEFAULT;
@@ -1759,19 +1752,17 @@ static int cs42l42_handle_device_data(struct i2c_client *i2c_client, 
			CS42L42_BTN_DET_EVENT_DBNCE_DEFAULT;

	}



	ret = of_property_read_u32_array(np, "cirrus,bias-lvls",

				   (u32 *)thresholds, CS42L42_NUM_BIASES);



	ret = device_property_read_u32_array(dev, "cirrus,bias-lvls",

					     thresholds, ARRAY_SIZE(thresholds));

	if (!ret) {

		for (i = 0; i < CS42L42_NUM_BIASES; i++) {

			if (thresholds[i] <= CS42L42_HS_DET_LEVEL_MAX)

				cs42l42->bias_thresholds[i] = thresholds[i];

			else {

				dev_err(&i2c_client->dev,

				dev_err(dev,

					"Wrong cirrus,bias-lvls[%d] DT value %d\n", i,

					thresholds[i]);

				cs42l42->bias_thresholds[i] =

					threshold_defaults[i];

				cs42l42->bias_thresholds[i] = threshold_defaults[i];

			}

		}

	} else {
@@ -1779,8 +1770,7 @@ static int cs42l42_handle_device_data(struct i2c_client *i2c_client, 
			cs42l42->bias_thresholds[i] = threshold_defaults[i];

	}



	ret = of_property_read_u32(np, "cirrus,hs-bias-ramp-rate", &val);



	ret = device_property_read_u32(dev, "cirrus,hs-bias-ramp-rate", &val);

	if (!ret) {

		switch (val) {

		case CS42L42_HSBIAS_RAMP_FAST_RISE_SLOW_FALL:
@@ -1800,7 +1790,7 @@ static int cs42l42_handle_device_data(struct i2c_client *i2c_client, 
			cs42l42->hs_bias_ramp_time = CS42L42_HSBIAS_RAMP_TIME3;

			break;

		default:

			dev_err(&i2c_client->dev,

			dev_err(dev,

				"Wrong cirrus,hs-bias-ramp-rate DT value %d\n",

				val);

			cs42l42->hs_bias_ramp_rate = CS42L42_HSBIAS_RAMP_SLOW;
@@ -1930,11 +1920,9 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client, 
			(1 << CS42L42_ADC_PDN_SHIFT) |

			(0 << CS42L42_PDN_ALL_SHIFT));



	if (i2c_client->dev.of_node) {

		ret = cs42l42_handle_device_data(i2c_client, cs42l42);

	ret = cs42l42_handle_device_data(&i2c_client->dev, cs42l42);

	if (ret != 0)

		goto err_disable;

	}



	/* Setup headset detection */

	cs42l42_setup_hs_type_detect(cs42l42);