This patch adds support for the MPU 6515 variant. Confirmed that the
driver functions correctly on a LG Nexus 5 (hammerhead) phone.

Signed-off-by: Brian Masney <masn...@onstation.org>
Signed-off-by: Jonathan Marek <jonat...@marek.ca>
---
This is a variation of Jonathan Marek's patch from postmarketOS
https://gitlab.com/postmarketOS/linux-postmarketos/commit/b8ad1ec1859c8bbcbce94944b3f4dd68f8f9fc37
with the following changes:

- The driver was previously throwing a 'whoami mismatch got XXX' error.
  Corrected ordering of hw_info variable to match the index of the
  inv_devices enum. The mpu6515 needed to come after mpu6500, not
  mpu6050.
- Removed regulator code. See next patch in this series.

I got confirmation from Jonathan M. that it was ok for me to submit his
patch upstream with these changes.

Jonathan C.: I assume that it is ok for the device tree binding
documentation to go through IIO? If not, I can split this out into a
separate patch if needed.

 Documentation/devicetree/bindings/iio/imu/inv_mpu6050.txt | 1 +
 drivers/iio/imu/inv_mpu6050/inv_mpu_core.c                | 6 ++++++
 drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c                 | 5 +++++
 drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h                 | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/Documentation/devicetree/bindings/iio/imu/inv_mpu6050.txt 
b/Documentation/devicetree/bindings/iio/imu/inv_mpu6050.txt
index 5f4777e8cc9e..b7def51c8ad9 100644
--- a/Documentation/devicetree/bindings/iio/imu/inv_mpu6050.txt
+++ b/Documentation/devicetree/bindings/iio/imu/inv_mpu6050.txt
@@ -6,6 +6,7 @@ Required properties:
  - compatible : should be one of
                "invensense,mpu6050"
                "invensense,mpu6500"
+               "invensense,mpu6515"
                "invensense,mpu9150"
                "invensense,mpu9250"
                "invensense,mpu9255"
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c 
b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
index de68e83fc52d..12c1b9507007 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
@@ -103,6 +103,12 @@ static const struct inv_mpu6050_hw hw_info[] = {
                .reg = &reg_set_6500,
                .config = &chip_config_6050,
        },
+       {
+               .whoami = INV_MPU6515_WHOAMI_VALUE,
+               .name = "MPU6515",
+               .reg = &reg_set_6500,
+               .config = &chip_config_6050,
+       },
        {
                .whoami = INV_MPU6000_WHOAMI_VALUE,
                .name = "MPU6000",
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c 
b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
index 495409d56207..dd758e3d403d 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
@@ -174,6 +174,7 @@ static int inv_mpu_remove(struct i2c_client *client)
 static const struct i2c_device_id inv_mpu_id[] = {
        {"mpu6050", INV_MPU6050},
        {"mpu6500", INV_MPU6500},
+       {"mpu6515", INV_MPU6515},
        {"mpu9150", INV_MPU9150},
        {"mpu9250", INV_MPU9250},
        {"mpu9255", INV_MPU9255},
@@ -192,6 +193,10 @@ static const struct of_device_id inv_of_match[] = {
                .compatible = "invensense,mpu6500",
                .data = (void *)INV_MPU6500
        },
+       {
+               .compatible = "invensense,mpu6515",
+               .data = (void *)INV_MPU6515
+       },
        {
                .compatible = "invensense,mpu9150",
                .data = (void *)INV_MPU9150
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h 
b/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h
index de8391693e17..e69a59659dbc 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h
@@ -71,6 +71,7 @@ struct inv_mpu6050_reg_map {
 enum inv_devices {
        INV_MPU6050,
        INV_MPU6500,
+       INV_MPU6515,
        INV_MPU6000,
        INV_MPU9150,
        INV_MPU9250,
@@ -256,6 +257,7 @@ struct inv_mpu6050_state {
 #define INV_MPU9150_WHOAMI_VALUE               0x68
 #define INV_MPU9250_WHOAMI_VALUE               0x71
 #define INV_MPU9255_WHOAMI_VALUE               0x73
+#define INV_MPU6515_WHOAMI_VALUE               0x74
 #define INV_ICM20608_WHOAMI_VALUE              0xAF
 
 /* scan element definition */
-- 
2.17.1

Reply via email to