]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
iio: nvi: Add ICM20630 support
authorErik Lilliebjerg <elilliebjerg@nvidia.com>
Fri, 14 Aug 2015 19:48:53 +0000 (12:48 -0700)
committermobile promotions <svcmobile_promotions@nvidia.com>
Sat, 29 Aug 2015 01:36:07 +0000 (18:36 -0700)
Change-Id: I1a32d532adaa983b06e6fab2c90edc2375498651
Signed-off-by: Erik Lilliebjerg <elilliebjerg@nvidia.com>
Reviewed-on: http://git-master/r/783811
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Robert Collins <rcollins@nvidia.com>
Tested-by: Robert Collins <rcollins@nvidia.com>
Reviewed-by: Kerwin Wan <kerwinw@nvidia.com>
GVS: Gerrit_Virtual_Submit

drivers/iio/imu/nvi_mpu/nvi.c
drivers/iio/imu/nvi_mpu/nvi.h

index 78aaf05c5f077465b523f846384e1f1c052554cc..42616f2eb759e28586a84d821d3476e9a9d71b50 100644 (file)
@@ -36,6 +36,7 @@
 #define NVI_NAME_MPU6515               "MPU6515"
 #define NVI_NAME_MPU9350               "MPU9350"
 #define NVI_NAME_ICM20628              "ICM20628"
+#define NVI_NAME_ICM20630              "ICM20630"
 #define NVI_NAME_ICM20632              "ICM20632"
 #define NVI_VENDOR                     "Invensense"
 
@@ -4159,6 +4160,11 @@ static int nvi_id_hal(struct nvi_state *st, u8 dev_id)
                part_name = NVI_NAME_ICM20628;
                break;
 
+       case ICM20630_ID:
+               st->hal = &nvi_hal_20628;
+               part_name = NVI_NAME_ICM20630;
+               break;
+
        case ICM20632_ID:
                st->hal = &nvi_hal_20628;
                part_name = NVI_NAME_ICM20632;
@@ -4206,6 +4212,8 @@ static int nvi_id_dev(struct nvi_state *st, const char *name)
                dev_id = MPU9350_ID;
        else if (!strcmp(name, "icm20628"))
                dev_id = ICM20628_ID;
+       else if (!strcmp(name, "icm20630"))
+               dev_id = ICM20630_ID;
        else if (!strcmp(name, "icm20632"))
                dev_id = ICM20632_ID;
        else
index 7eb69b906a9499ab624007bac010188a69119254..be8dcfa891199fc5b405daf74f000807b015314b 100644 (file)
@@ -29,6 +29,7 @@
 #define MPU9250_ID                     (0x71)
 #define MPU9350_ID                     (0x72)
 #define ICM20628_ID                    (0xA2)
+#define ICM20630_ID                    (0xAB)
 #define ICM20632_ID                    (0xAD)
 
 #define NVI_BYPASS_TIMEOUT_MS          (1000)