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

Commit 6027c077 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Jonathan Cameron
Browse files

iio: ak8975 : Add AK8963 compatibility mode support 



AK8963 and AK8975 use same register definitions, except the range
of X,Y,Z values. Added support of 8963 based on i2c_device_id.
Unfortunately there is no way to detect the type via registers,
both device registers return 0x48 as id of chipset.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 239670ef

drivers/iio/magnetometer/Kconfig

+2 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,8 @@ config AK8975 
	depends on GPIOLIB

	depends on GPIOLIB

	help

	help

	  Say yes here to build support for Asahi Kasei AK8975 3-Axis

	  Say yes here to build support for Asahi Kasei AK8975 3-Axis

	  Magnetometer.

	  Magnetometer. This driver can also support AK8963, if i2c

	  device name is identified as ak8963.





	  To compile this driver as a module, choose M here: the module

	  To compile this driver as a module, choose M here: the module

	  will be called ak8975.

	  will be called ak8975.

drivers/iio/magnetometer/ak8975.c

+29 −5
Original line number Original line Diff line number Diff line
@@ -85,7 +85,14 @@ 
#define AK8975_MAX_CONVERSION_TIMEOUT	500

#define AK8975_MAX_CONVERSION_TIMEOUT	500

#define AK8975_CONVERSION_DONE_POLL_TIME 10

#define AK8975_CONVERSION_DONE_POLL_TIME 10

#define AK8975_DATA_READY_TIMEOUT	((100*HZ)/1000)

#define AK8975_DATA_READY_TIMEOUT	((100*HZ)/1000)

#define RAW_TO_GAUSS(asa) ((((asa) + 128) * 3000) / 256)

#define RAW_TO_GAUSS_8975(asa) ((((asa) + 128) * 3000) / 256)

#define RAW_TO_GAUSS_8963(asa) ((((asa) + 128) * 6000) / 256)



/* Compatible Asahi Kasei Compass parts */

enum asahi_compass_chipset {

	AK8975,

	AK8963,

};





/*

/*

 * Per-instance context data for the device.

 * Per-instance context data for the device.
@@ -101,6 +108,7 @@ struct ak8975_data { 
	int			eoc_irq;

	int			eoc_irq;

	wait_queue_head_t	data_ready_queue;

	wait_queue_head_t	data_ready_queue;

	unsigned long		flags;

	unsigned long		flags;

	enum asahi_compass_chipset chipset;

};

};





static const int ak8975_index_to_reg[] = {

static const int ak8975_index_to_reg[] = {
@@ -272,9 +280,21 @@ static int ak8975_setup(struct i2c_client *client) 
 * Since ASA doesn't change, we cache the resultant scale factor into the

 * Since ASA doesn't change, we cache the resultant scale factor into the

 * device context in ak8975_setup().

 * device context in ak8975_setup().

 */

 */

	data->raw_to_gauss[0] = RAW_TO_GAUSS(data->asa[0]);

	if (data->chipset == AK8963) {

	data->raw_to_gauss[1] = RAW_TO_GAUSS(data->asa[1]);

		/*

	data->raw_to_gauss[2] = RAW_TO_GAUSS(data->asa[2]);

		 * H range is +-8190 and magnetometer range is +-4912.

		 * So HuT using the above explanation for 8975,

		 * 4912/8190 = ~ 6/10.

		 * So the Hadj should use 6/10 instead of 3/10.

		 */

		data->raw_to_gauss[0] = RAW_TO_GAUSS_8963(data->asa[0]);

		data->raw_to_gauss[1] = RAW_TO_GAUSS_8963(data->asa[1]);

		data->raw_to_gauss[2] = RAW_TO_GAUSS_8963(data->asa[2]);

	} else {

		data->raw_to_gauss[0] = RAW_TO_GAUSS_8975(data->asa[0]);

		data->raw_to_gauss[1] = RAW_TO_GAUSS_8975(data->asa[1]);

		data->raw_to_gauss[2] = RAW_TO_GAUSS_8975(data->asa[2]);

	}





	return 0;

	return 0;

}

}
@@ -499,6 +519,9 @@ static int ak8975_probe(struct i2c_client *client, 
	data->eoc_gpio = eoc_gpio;

	data->eoc_gpio = eoc_gpio;

	data->eoc_irq = 0;

	data->eoc_irq = 0;





	data->chipset = (enum asahi_compass_chipset)(id->driver_data);

	dev_dbg(&client->dev, "Asahi compass chip %s\n", id->name);



	/* Perform some basic start-of-day setup of the device. */

	/* Perform some basic start-of-day setup of the device. */

	err = ak8975_setup(client);

	err = ak8975_setup(client);

	if (err < 0) {

	if (err < 0) {
@@ -552,7 +575,8 @@ static int ak8975_remove(struct i2c_client *client) 
}

}





static const struct i2c_device_id ak8975_id[] = {

static const struct i2c_device_id ak8975_id[] = {

	{"ak8975", 0},

	{"ak8975", AK8975},

	{"ak8963", AK8963},

	{}

	{}

};

};