Commit fb158971 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jonathan Cameron
Browse files

iio: Allow to read mount matrix from ACPI 



Currently mount matrix is allowed in Device Tree, though there is
no technical issue to extend it to support ACPI.

Convert the function to use device_property_read_string_array() and
thus allow to read mount matrix from ACPI if available.

Example of use in _DSD method:

  Name (_DSD, Package ()
  {
     ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
     Package ()
     {
        Package () { "mount-matrix", Package() {
                "1", "0",     "0",
                "0", "0.866", "0.5",
                "0", "-0.5",  "0.866",
        } },
     }
  })

At the same time drop the "of" prefix from its name and
convert current users.

No functional change intended.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 0a39ac29

drivers/iio/accel/kxsd9.c

+1 −3
Original line number Diff line number Diff line
@@ -420,9 +420,7 @@ int kxsd9_common_probe(struct device *dev, 
	indio_dev->available_scan_masks = kxsd9_scan_masks;



	/* Read the mounting matrix, if present */

	ret = of_iio_read_mount_matrix(dev,

				       "mount-matrix",

				       &st->orientation);

	ret = iio_read_mount_matrix(dev, "mount-matrix", &st->orientation);

	if (ret)

		return ret;

drivers/iio/gyro/mpu3050-core.c

+1 −2
Original line number Diff line number Diff line
@@ -1149,8 +1149,7 @@ int mpu3050_common_probe(struct device *dev, 
	mpu3050->divisor = 99;



	/* Read the mounting matrix, if present */

	ret = of_iio_read_mount_matrix(dev, "mount-matrix",

				       &mpu3050->orientation);

	ret = iio_read_mount_matrix(dev, "mount-matrix", &mpu3050->orientation);

	if (ret)

		return ret;

drivers/iio/imu/inv_mpu6050/inv_mpu_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1021,7 +1021,7 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name, 


	pdata = dev_get_platdata(dev);

	if (!pdata) {

		result = of_iio_read_mount_matrix(dev, "mount-matrix",

		result = iio_read_mount_matrix(dev, "mount-matrix",

					       &st->orientation);

		if (result) {

			dev_err(dev, "Failed to retrieve mounting matrix %d\n",

drivers/iio/industrialio-core.c

+18 −28
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/device.h>

#include <linux/fs.h>

#include <linux/poll.h>

#include <linux/property.h>

#include <linux/sched.h>

#include <linux/wait.h>

#include <linux/cdev.h>
@@ -530,8 +531,8 @@ ssize_t iio_show_mount_matrix(struct iio_dev *indio_dev, uintptr_t priv, 
EXPORT_SYMBOL_GPL(iio_show_mount_matrix);



/**

 * of_iio_read_mount_matrix() - retrieve iio device mounting matrix from

 *                              device-tree "mount-matrix" property

 * iio_read_mount_matrix() - retrieve iio device mounting matrix from

 *                           device "mount-matrix" property

 * @dev:	device the mounting matrix property is assigned to

 * @propname:	device specific mounting matrix property name

 * @matrix:	where to store retrieved matrix
@@ -541,17 +542,15 @@ EXPORT_SYMBOL_GPL(iio_show_mount_matrix); 
 *

 * Return: 0 if success, or a negative error code on failure.

 */

#ifdef CONFIG_OF

int of_iio_read_mount_matrix(const struct device *dev,

			     const char *propname,

int iio_read_mount_matrix(struct device *dev, const char *propname,

			  struct iio_mount_matrix *matrix)

{

	if (dev->of_node) {

		int err = of_property_read_string_array(dev->of_node,

				propname, matrix->rotation,

				ARRAY_SIZE(iio_mount_idmatrix.rotation));

	size_t len = ARRAY_SIZE(iio_mount_idmatrix.rotation);

	int err;



		if (err == ARRAY_SIZE(iio_mount_idmatrix.rotation))

	err = device_property_read_string_array(dev, propname,

						matrix->rotation, len);

	if (err == len)

		return 0;



	if (err >= 0)
@@ -561,20 +560,11 @@ int of_iio_read_mount_matrix(const struct device *dev, 
	if (err != -EINVAL)

		/* Invalid matrix declaration format. */

		return err;

	}



	/* Matrix was not declared at all: fallback to identity. */

	return iio_setup_mount_idmatrix(dev, matrix);

}

#else

int of_iio_read_mount_matrix(const struct device *dev,

			     const char *propname,

			     struct iio_mount_matrix *matrix)

{

	return iio_setup_mount_idmatrix(dev, matrix);

}

#endif

EXPORT_SYMBOL(of_iio_read_mount_matrix);

EXPORT_SYMBOL(iio_read_mount_matrix);



static ssize_t __iio_format_value(char *buf, size_t len, unsigned int type,

				  int size, const int *vals)

drivers/iio/magnetometer/ak8974.c

+2 −3
Original line number Diff line number Diff line
@@ -733,8 +733,7 @@ static int ak8974_probe(struct i2c_client *i2c, 
	ak8974->i2c = i2c;

	mutex_init(&ak8974->lock);



	ret = of_iio_read_mount_matrix(&i2c->dev,

				       "mount-matrix",

	ret = iio_read_mount_matrix(&i2c->dev, "mount-matrix",

				    &ak8974->orientation);

	if (ret)

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE