Eric Lee / smarc-ti-linux-kernel

26
Download as
Browse Code ยป

Commit 76ada52f7f5d4c83cbb6d61e556e3fbd0ac6d34f

Authored by Lars-Peter Clausen
Committed by Jonathan Cameron
1 parent 1db18bb4c2
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

iio:adis16400: Add support for the adis16448 

The adis16448 is more or less from the same family of devices as supported by
this driver. It features three acceleration channels, three angular velocity
channels, three magnetometer channels, one temperature channels and one
barometric pressure channel.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

Showing 2 changed files with 40 additions and 0 deletions Side-by-side Diff

drivers/iio/imu/adis16400.h
Diff comments   View file @ 76ada52
... ... @@ -44,6 +44,9 @@
44 44 #define ADIS16300_ROLL_OUT 0x14 /* Y axis inclinometer output measurement */
45 45 #define ADIS16300_AUX_ADC 0x16 /* Auxiliary ADC measurement */
46 46  
  47 +#define ADIS16448_BARO_OUT 0x16 /* Barometric pressure output */
  48 +#define ADIS16448_TEMP_OUT 0x18 /* Temperature output */
  49 +
47 50 /* Calibration parameters */
48 51 #define ADIS16400_XGYRO_OFF 0x1A /* X-axis gyroscope bias offset factor */
49 52 #define ADIS16400_YGYRO_OFF 0x1C /* Y-axis gyroscope bias offset factor */
... ... @@ -179,6 +182,7 @@
179 182 ADIS16400_SCAN_MAGN_X,
180 183 ADIS16400_SCAN_MAGN_Y,
181 184 ADIS16400_SCAN_MAGN_Z,
  185 + ADIS16400_SCAN_BARO,
182 186 ADIS16350_SCAN_TEMP_X,
183 187 ADIS16350_SCAN_TEMP_Y,
184 188 ADIS16350_SCAN_TEMP_Z,
drivers/iio/imu/adis16400_core.c
Diff comments   View file @ 76ada52
... ... @@ -139,6 +139,7 @@
139 139 ADIS16362,
140 140 ADIS16364,
141 141 ADIS16400,
  142 + ADIS16448,
142 143 };
143 144  
144 145 static int adis16334_get_freq(struct adis16400_state *st)
... ... @@ -633,6 +634,28 @@
633 634 IIO_CHAN_SOFT_TIMESTAMP(12)
634 635 };
635 636  
  637 +static const struct iio_chan_spec adis16448_channels[] = {
  638 + ADIS16400_GYRO_CHAN(X, ADIS16400_XGYRO_OUT, 16),
  639 + ADIS16400_GYRO_CHAN(Y, ADIS16400_YGYRO_OUT, 16),
  640 + ADIS16400_GYRO_CHAN(Z, ADIS16400_ZGYRO_OUT, 16),
  641 + ADIS16400_ACCEL_CHAN(X, ADIS16400_XACCL_OUT, 16),
  642 + ADIS16400_ACCEL_CHAN(Y, ADIS16400_YACCL_OUT, 16),
  643 + ADIS16400_ACCEL_CHAN(Z, ADIS16400_ZACCL_OUT, 16),
  644 + ADIS16400_MAGN_CHAN(X, ADIS16400_XMAGN_OUT, 16),
  645 + ADIS16400_MAGN_CHAN(Y, ADIS16400_YMAGN_OUT, 16),
  646 + ADIS16400_MAGN_CHAN(Z, ADIS16400_ZMAGN_OUT, 16),
  647 + {
  648 + .type = IIO_PRESSURE,
  649 + .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
  650 + IIO_CHAN_INFO_SCALE_SHARED_BIT,
  651 + .address = ADIS16448_BARO_OUT,
  652 + .scan_index = ADIS16400_SCAN_BARO,
  653 + .scan_type = IIO_ST('s', 16, 16, 0),
  654 + },
  655 + ADIS16400_TEMP_CHAN(ADIS16448_TEMP_OUT, 12),
  656 + IIO_CHAN_SOFT_TIMESTAMP(11)
  657 +};
  658 +
636 659 static const struct iio_chan_spec adis16350_channels[] = {
637 660 ADIS16400_SUPPLY_CHAN(ADIS16400_SUPPLY_OUT, 12),
638 661 ADIS16400_GYRO_CHAN(X, ADIS16400_XGYRO_OUT, 14),
... ... @@ -765,6 +788,18 @@
765 788 .temp_offset = 25000000 / 140000, /* 25 C = 0x00 */
766 789 .set_freq = adis16400_set_freq,
767 790 .get_freq = adis16400_get_freq,
  791 + },
  792 + [ADIS16448] = {
  793 + .channels = adis16448_channels,
  794 + .num_channels = ARRAY_SIZE(adis16448_channels),
  795 + .flags = ADIS16400_HAS_PROD_ID |
  796 + ADIS16400_HAS_SERIAL_NUMBER,
  797 + .gyro_scale_micro = IIO_DEGREE_TO_RAD(10000), /* 0.01 deg/s */
  798 + .accel_scale_micro = IIO_G_TO_M_S_2(833), /* 1/1200 g */
  799 + .temp_scale_nano = 73860000, /* 0.07386 C */
  800 + .temp_offset = 31000000 / 73860, /* 31 C = 0x00 */
  801 + .set_freq = adis16334_set_freq,
  802 + .get_freq = adis16334_get_freq,
768 803 }
769 804 };
770 805  
... ... @@ -909,6 +944,7 @@
909 944 {"adis16365", ADIS16360},
910 945 {"adis16400", ADIS16400},
911 946 {"adis16405", ADIS16400},
  947 + {"adis16448", ADIS16448},
912 948 {}
913 949 };
914 950 MODULE_DEVICE_TABLE(spi, adis16400_id);