diff options
author | Manuel Stahl <manuel.stahl@iis.fraunhofer.de> | 2014-05-02 05:34:00 -0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2014-02-08 07:29:40 -0500 |
commit | 7da773e61831d677bfbe2bfcf10d39430f5a5bc2 (patch) | |
tree | 18df94588f0a130eaaf78f36c95c0290f1b59152 /drivers/iio | |
parent | ed10557fce856fc6fc79f98bc99c3b8a83fa0106 (diff) |
iio: imu: inv_mpu6050: Fix typo and formatting
Signed-off-by: Manuel Stahl <manuel.stahl@iis.fraunhofer.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r-- | drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 2 | ||||
-rw-r--r-- | drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 38 |
2 files changed, 20 insertions, 20 deletions
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c index bf7223b275ac..cb9f96b446a5 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | |||
@@ -116,7 +116,7 @@ int inv_mpu6050_switch_engine(struct inv_mpu6050_state *st, bool en, u32 mask) | |||
116 | return result; | 116 | return result; |
117 | 117 | ||
118 | if (en) { | 118 | if (en) { |
119 | /* Wait for output stablize */ | 119 | /* Wait for output stabilize */ |
120 | msleep(INV_MPU6050_TEMP_UP_TIME); | 120 | msleep(INV_MPU6050_TEMP_UP_TIME); |
121 | if (INV_MPU6050_BIT_PWR_GYRO_STBY == mask) { | 121 | if (INV_MPU6050_BIT_PWR_GYRO_STBY == mask) { |
122 | /* switch internal clock to PLL */ | 122 | /* switch internal clock to PLL */ |
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h b/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h index f38395529a44..0ab382be1e64 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | |||
@@ -126,35 +126,35 @@ struct inv_mpu6050_state { | |||
126 | #define INV_MPU6050_REG_SAMPLE_RATE_DIV 0x19 | 126 | #define INV_MPU6050_REG_SAMPLE_RATE_DIV 0x19 |
127 | #define INV_MPU6050_REG_CONFIG 0x1A | 127 | #define INV_MPU6050_REG_CONFIG 0x1A |
128 | #define INV_MPU6050_REG_GYRO_CONFIG 0x1B | 128 | #define INV_MPU6050_REG_GYRO_CONFIG 0x1B |
129 | #define INV_MPU6050_REG_ACCEL_CONFIG 0x1C | 129 | #define INV_MPU6050_REG_ACCEL_CONFIG 0x1C |
130 | 130 | ||
131 | #define INV_MPU6050_REG_FIFO_EN 0x23 | 131 | #define INV_MPU6050_REG_FIFO_EN 0x23 |
132 | #define INV_MPU6050_BIT_ACCEL_OUT 0x08 | 132 | #define INV_MPU6050_BIT_ACCEL_OUT 0x08 |
133 | #define INV_MPU6050_BITS_GYRO_OUT 0x70 | 133 | #define INV_MPU6050_BITS_GYRO_OUT 0x70 |
134 | 134 | ||
135 | #define INV_MPU6050_REG_INT_ENABLE 0x38 | 135 | #define INV_MPU6050_REG_INT_ENABLE 0x38 |
136 | #define INV_MPU6050_BIT_DATA_RDY_EN 0x01 | 136 | #define INV_MPU6050_BIT_DATA_RDY_EN 0x01 |
137 | #define INV_MPU6050_BIT_DMP_INT_EN 0x02 | 137 | #define INV_MPU6050_BIT_DMP_INT_EN 0x02 |
138 | 138 | ||
139 | #define INV_MPU6050_REG_RAW_ACCEL 0x3B | 139 | #define INV_MPU6050_REG_RAW_ACCEL 0x3B |
140 | #define INV_MPU6050_REG_TEMPERATURE 0x41 | 140 | #define INV_MPU6050_REG_TEMPERATURE 0x41 |
141 | #define INV_MPU6050_REG_RAW_GYRO 0x43 | 141 | #define INV_MPU6050_REG_RAW_GYRO 0x43 |
142 | 142 | ||
143 | #define INV_MPU6050_REG_USER_CTRL 0x6A | 143 | #define INV_MPU6050_REG_USER_CTRL 0x6A |
144 | #define INV_MPU6050_BIT_FIFO_RST 0x04 | 144 | #define INV_MPU6050_BIT_FIFO_RST 0x04 |
145 | #define INV_MPU6050_BIT_DMP_RST 0x08 | 145 | #define INV_MPU6050_BIT_DMP_RST 0x08 |
146 | #define INV_MPU6050_BIT_I2C_MST_EN 0x20 | 146 | #define INV_MPU6050_BIT_I2C_MST_EN 0x20 |
147 | #define INV_MPU6050_BIT_FIFO_EN 0x40 | 147 | #define INV_MPU6050_BIT_FIFO_EN 0x40 |
148 | #define INV_MPU6050_BIT_DMP_EN 0x80 | 148 | #define INV_MPU6050_BIT_DMP_EN 0x80 |
149 | 149 | ||
150 | #define INV_MPU6050_REG_PWR_MGMT_1 0x6B | 150 | #define INV_MPU6050_REG_PWR_MGMT_1 0x6B |
151 | #define INV_MPU6050_BIT_H_RESET 0x80 | 151 | #define INV_MPU6050_BIT_H_RESET 0x80 |
152 | #define INV_MPU6050_BIT_SLEEP 0x40 | 152 | #define INV_MPU6050_BIT_SLEEP 0x40 |
153 | #define INV_MPU6050_BIT_CLK_MASK 0x7 | 153 | #define INV_MPU6050_BIT_CLK_MASK 0x7 |
154 | 154 | ||
155 | #define INV_MPU6050_REG_PWR_MGMT_2 0x6C | 155 | #define INV_MPU6050_REG_PWR_MGMT_2 0x6C |
156 | #define INV_MPU6050_BIT_PWR_ACCL_STBY 0x38 | 156 | #define INV_MPU6050_BIT_PWR_ACCL_STBY 0x38 |
157 | #define INV_MPU6050_BIT_PWR_GYRO_STBY 0x07 | 157 | #define INV_MPU6050_BIT_PWR_GYRO_STBY 0x07 |
158 | 158 | ||
159 | #define INV_MPU6050_REG_FIFO_COUNT_H 0x72 | 159 | #define INV_MPU6050_REG_FIFO_COUNT_H 0x72 |
160 | #define INV_MPU6050_REG_FIFO_R_W 0x74 | 160 | #define INV_MPU6050_REG_FIFO_R_W 0x74 |
@@ -180,10 +180,10 @@ struct inv_mpu6050_state { | |||
180 | 180 | ||
181 | /* init parameters */ | 181 | /* init parameters */ |
182 | #define INV_MPU6050_INIT_FIFO_RATE 50 | 182 | #define INV_MPU6050_INIT_FIFO_RATE 50 |
183 | #define INV_MPU6050_TIME_STAMP_TOR 5 | 183 | #define INV_MPU6050_TIME_STAMP_TOR 5 |
184 | #define INV_MPU6050_MAX_FIFO_RATE 1000 | 184 | #define INV_MPU6050_MAX_FIFO_RATE 1000 |
185 | #define INV_MPU6050_MIN_FIFO_RATE 4 | 185 | #define INV_MPU6050_MIN_FIFO_RATE 4 |
186 | #define INV_MPU6050_ONE_K_HZ 1000 | 186 | #define INV_MPU6050_ONE_K_HZ 1000 |
187 | 187 | ||
188 | /* scan element definition */ | 188 | /* scan element definition */ |
189 | enum inv_mpu6050_scan { | 189 | enum inv_mpu6050_scan { |