Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1589707 > unrolled thread

[PATCH v2] staging: iio: accel: Move header file content to source file

Started bysimran singhal <singhalsimran0@gmail.com>
First post2017-02-28 20:00 +0100
Last post2017-02-28 20:40 +0100
Articles 6 — 4 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH v2] staging: iio: accel: Move header file content to source  file simran singhal <singhalsimran0@gmail.com> - 2017-02-28 20:00 +0100
    Re: [PATCH v2] staging: iio: accel: Move header file content to  source file Jonathan Cameron <jic23@kernel.org> - 2017-02-28 20:30 +0100
      Re: [PATCH v2] staging: iio: accel: Move header file content to  source file SIMRAN SINGHAL <singhalsimran0@gmail.com> - 2017-02-28 20:40 +0100
        Re: [PATCH v2] staging: iio: accel: Move header file content to  source file Lars-Peter Clausen <lars@metafoo.de> - 2017-02-28 20:40 +0100
          Re: [PATCH v2] staging: iio: accel: Move header file content to  source file SIMRAN SINGHAL <singhalsimran0@gmail.com> - 2017-02-28 22:30 +0100
    Re: [PATCH v2] staging: iio: accel: Move header file content to  source file Jonathan Cameron <jic23@kernel.org> - 2017-02-28 20:40 +0100

#1589707 — [PATCH v2] staging: iio: accel: Move header file content to source file

Fromsimran singhal <singhalsimran0@gmail.com>
Date2017-02-28 20:00 +0100
Subject[PATCH v2] staging: iio: accel: Move header file content to source file
Message-ID<tfVaa-8nb-19@gated-at.bofh.it>
The contents of the header file are used only by this single
source file. Move content into .c and remove .h.

Signed-off-by: simran singhal <singhalsimran0@gmail.com>
---

 v2:
   -Removing ifndef and define

 drivers/staging/iio/accel/adis16201.h      | 144 -----------------------------
 drivers/staging/iio/accel/adis16201_core.c | 142 +++++++++++++++++++++++++++-
 2 files changed, 141 insertions(+), 145 deletions(-)
 delete mode 100644 drivers/staging/iio/accel/adis16201.h

diff --git a/drivers/staging/iio/accel/adis16201.h b/drivers/staging/iio/accel/adis16201.h
deleted file mode 100644
index 64844ad..0000000
--- a/drivers/staging/iio/accel/adis16201.h
+++ /dev/null
@@ -1,144 +0,0 @@
-#ifndef SPI_ADIS16201_H_
-#define SPI_ADIS16201_H_
-
-#define ADIS16201_STARTUP_DELAY	220 /* ms */
-
-/* Flash memory write count */
-#define ADIS16201_FLASH_CNT      0x00
-
-/* Output, power supply */
-#define ADIS16201_SUPPLY_OUT     0x02
-
-/* Output, x-axis accelerometer */
-#define ADIS16201_XACCL_OUT      0x04
-
-/* Output, y-axis accelerometer */
-#define ADIS16201_YACCL_OUT      0x06
-
-/* Output, auxiliary ADC input */
-#define ADIS16201_AUX_ADC        0x08
-
-/* Output, temperature */
-#define ADIS16201_TEMP_OUT       0x0A
-
-/* Output, x-axis inclination */
-#define ADIS16201_XINCL_OUT      0x0C
-
-/* Output, y-axis inclination */
-#define ADIS16201_YINCL_OUT      0x0E
-
-/* Calibration, x-axis acceleration offset */
-#define ADIS16201_XACCL_OFFS     0x10
-
-/* Calibration, y-axis acceleration offset */
-#define ADIS16201_YACCL_OFFS     0x12
-
-/* x-axis acceleration scale factor */
-#define ADIS16201_XACCL_SCALE    0x14
-
-/* y-axis acceleration scale factor */
-#define ADIS16201_YACCL_SCALE    0x16
-
-/* Calibration, x-axis inclination offset */
-#define ADIS16201_XINCL_OFFS     0x18
-
-/* Calibration, y-axis inclination offset */
-#define ADIS16201_YINCL_OFFS     0x1A
-
-/* x-axis inclination scale factor */
-#define ADIS16201_XINCL_SCALE    0x1C
-
-/* y-axis inclination scale factor */
-#define ADIS16201_YINCL_SCALE    0x1E
-
-/* Alarm 1 amplitude threshold */
-#define ADIS16201_ALM_MAG1       0x20
-
-/* Alarm 2 amplitude threshold */
-#define ADIS16201_ALM_MAG2       0x22
-
-/* Alarm 1, sample period */
-#define ADIS16201_ALM_SMPL1      0x24
-
-/* Alarm 2, sample period */
-#define ADIS16201_ALM_SMPL2      0x26
-
-/* Alarm control */
-#define ADIS16201_ALM_CTRL       0x28
-
-/* Auxiliary DAC data */
-#define ADIS16201_AUX_DAC        0x30
-
-/* General-purpose digital input/output control */
-#define ADIS16201_GPIO_CTRL      0x32
-
-/* Miscellaneous control */
-#define ADIS16201_MSC_CTRL       0x34
-
-/* Internal sample period (rate) control */
-#define ADIS16201_SMPL_PRD       0x36
-
-/* Operation, filter configuration */
-#define ADIS16201_AVG_CNT        0x38
-
-/* Operation, sleep mode control */
-#define ADIS16201_SLP_CNT        0x3A
-
-/* Diagnostics, system status register */
-#define ADIS16201_DIAG_STAT      0x3C
-
-/* Operation, system command register */
-#define ADIS16201_GLOB_CMD       0x3E
-
-/* MSC_CTRL */
-
-/* Self-test enable */
-#define ADIS16201_MSC_CTRL_SELF_TEST_EN	        BIT(8)
-
-/* Data-ready enable: 1 = enabled, 0 = disabled */
-#define ADIS16201_MSC_CTRL_DATA_RDY_EN	        BIT(2)
-
-/* Data-ready polarity: 1 = active high, 0 = active low */
-#define ADIS16201_MSC_CTRL_ACTIVE_HIGH	        BIT(1)
-
-/* Data-ready line selection: 1 = DIO1, 0 = DIO0 */
-#define ADIS16201_MSC_CTRL_DATA_RDY_DIO1	BIT(0)
-
-/* DIAG_STAT */
-
-/* Alarm 2 status: 1 = alarm active, 0 = alarm inactive */
-#define ADIS16201_DIAG_STAT_ALARM2        BIT(9)
-
-/* Alarm 1 status: 1 = alarm active, 0 = alarm inactive */
-#define ADIS16201_DIAG_STAT_ALARM1        BIT(8)
-
-/* SPI communications failure */
-#define ADIS16201_DIAG_STAT_SPI_FAIL_BIT   3
-
-/* Flash update failure */
-#define ADIS16201_DIAG_STAT_FLASH_UPT_BIT  2
-
-/* Power supply above 3.625 V */
-#define ADIS16201_DIAG_STAT_POWER_HIGH_BIT 1
-
-/* Power supply below 3.15 V */
-#define ADIS16201_DIAG_STAT_POWER_LOW_BIT  0
-
-/* GLOB_CMD */
-
-#define ADIS16201_GLOB_CMD_SW_RESET	BIT(7)
-#define ADIS16201_GLOB_CMD_FACTORY_CAL	BIT(1)
-
-#define ADIS16201_ERROR_ACTIVE          BIT(14)
-
-enum adis16201_scan {
-	ADIS16201_SCAN_ACC_X,
-	ADIS16201_SCAN_ACC_Y,
-	ADIS16201_SCAN_INCLI_X,
-	ADIS16201_SCAN_INCLI_Y,
-	ADIS16201_SCAN_SUPPLY,
-	ADIS16201_SCAN_AUX_ADC,
-	ADIS16201_SCAN_TEMP,
-};
-
-#endif /* SPI_ADIS16201_H_ */
diff --git a/drivers/staging/iio/accel/adis16201_core.c b/drivers/staging/iio/accel/adis16201_core.c
index 7963d4a..dcf8463 100644
--- a/drivers/staging/iio/accel/adis16201_core.c
+++ b/drivers/staging/iio/accel/adis16201_core.c
@@ -20,7 +20,147 @@
 #include <linux/iio/buffer.h>
 #include <linux/iio/imu/adis.h>
 
-#include "adis16201.h"
+#define ADIS16201_STARTUP_DELAY	220 /* ms */
+
+/* Flash memory write count */
+#define ADIS16201_FLASH_CNT      0x00
+
+/* Output, power supply */
+#define ADIS16201_SUPPLY_OUT     0x02
+
+/* Output, x-axis accelerometer */
+#define ADIS16201_XACCL_OUT      0x04
+
+/* Output, y-axis accelerometer */
+#define ADIS16201_YACCL_OUT      0x06
+
+/* Output, auxiliary ADC input */
+#define ADIS16201_AUX_ADC        0x08
+
+/* Output, temperature */
+#define ADIS16201_TEMP_OUT       0x0A
+
+/* Output, x-axis inclination */
+#define ADIS16201_XINCL_OUT      0x0C
+
+/* Output, y-axis inclination */
+#define ADIS16201_YINCL_OUT      0x0E
+
+/* Calibration, x-axis acceleration offset */
+#define ADIS16201_XACCL_OFFS     0x10
+
+/* Calibration, y-axis acceleration offset */
+#define ADIS16201_YACCL_OFFS     0x12
+
+/* x-axis acceleration scale factor */
+#define ADIS16201_XACCL_SCALE    0x14
+
+/* y-axis acceleration scale factor */
+#define ADIS16201_YACCL_SCALE    0x16
+
+/* Calibration, x-axis inclination offset */
+#define ADIS16201_XINCL_OFFS     0x18
+
+/* Calibration, y-axis inclination offset */
+#define ADIS16201_YINCL_OFFS     0x1A
+
+/* x-axis inclination scale factor */
+#define ADIS16201_XINCL_SCALE    0x1C
+
+/* y-axis inclination scale factor */
+#define ADIS16201_YINCL_SCALE    0x1E
+
+/* Alarm 1 amplitude threshold */
+#define ADIS16201_ALM_MAG1       0x20
+
+/* Alarm 2 amplitude threshold */
+#define ADIS16201_ALM_MAG2       0x22
+
+/* Alarm 1, sample period */
+#define ADIS16201_ALM_SMPL1      0x24
+
+/* Alarm 2, sample period */
+#define ADIS16201_ALM_SMPL2      0x26
+
+/* Alarm control */
+#define ADIS16201_ALM_CTRL       0x28
+
+/* Auxiliary DAC data */
+#define ADIS16201_AUX_DAC        0x30
+
+/* General-purpose digital input/output control */
+#define ADIS16201_GPIO_CTRL      0x32
+
+/* Miscellaneous control */
+#define ADIS16201_MSC_CTRL       0x34
+
+/* Internal sample period (rate) control */
+#define ADIS16201_SMPL_PRD       0x36
+
+/* Operation, filter configuration */
+#define ADIS16201_AVG_CNT        0x38
+
+/* Operation, sleep mode control */
+#define ADIS16201_SLP_CNT        0x3A
+
+/* Diagnostics, system status register */
+#define ADIS16201_DIAG_STAT      0x3C
+
+/* Operation, system command register */
+#define ADIS16201_GLOB_CMD       0x3E
+
+/* MSC_CTRL */
+
+/* Self-test enable */
+#define ADIS16201_MSC_CTRL_SELF_TEST_EN	        BIT(8)
+
+/* Data-ready enable: 1 = enabled, 0 = disabled */
+#define ADIS16201_MSC_CTRL_DATA_RDY_EN	        BIT(2)
+
+/* Data-ready polarity: 1 = active high, 0 = active low */
+#define ADIS16201_MSC_CTRL_ACTIVE_HIGH	        BIT(1)
+
+/* Data-ready line selection: 1 = DIO1, 0 = DIO0 */
+#define ADIS16201_MSC_CTRL_DATA_RDY_DIO1	BIT(0)
+
+/* DIAG_STAT */
+
+/* Alarm 2 status: 1 = alarm active, 0 = alarm inactive */
+#define ADIS16201_DIAG_STAT_ALARM2        BIT(9)
+
+/* Alarm 1 status: 1 = alarm active, 0 = alarm inactive */
+#define ADIS16201_DIAG_STAT_ALARM1        BIT(8)
+
+/* SPI communications failure */
+#define ADIS16201_DIAG_STAT_SPI_FAIL_BIT   3
+
+/* Flash update failure */
+#define ADIS16201_DIAG_STAT_FLASH_UPT_BIT  2
+
+/* Power supply above 3.625 V */
+#define ADIS16201_DIAG_STAT_POWER_HIGH_BIT 1
+
+/* Power supply below 3.15 V */
+#define ADIS16201_DIAG_STAT_POWER_LOW_BIT  0
+
+/* GLOB_CMD */
+
+#define ADIS16201_GLOB_CMD_SW_RESET	BIT(7)
+#define ADIS16201_GLOB_CMD_FACTORY_CAL	BIT(1)
+
+#define ADIS16201_ERROR_ACTIVE          BIT(14)
+
+enum adis16201_scan {
+	ADIS16201_SCAN_ACC_X,
+	ADIS16201_SCAN_ACC_Y,
+	ADIS16201_SCAN_INCLI_X,
+	ADIS16201_SCAN_INCLI_Y,
+	ADIS16201_SCAN_SUPPLY,
+	ADIS16201_SCAN_AUX_ADC,
+	ADIS16201_SCAN_TEMP,
+};
+
+#endif /* SPI_ADIS16201_H_ */
 
 static const u8 adis16201_addresses[] = {
 	[ADIS16201_SCAN_ACC_X] = ADIS16201_XACCL_OFFS,
-- 
2.7.4

[toc] | [next] | [standalone]

#1589716 — Re: [PATCH v2] staging: iio: accel: Move header file content to source file

FromJonathan Cameron <jic23@kernel.org>
Date2017-02-28 20:30 +0100
SubjectRe: [PATCH v2] staging: iio: accel: Move header file content to source file
Message-ID<tfVDb-lh-3@gated-at.bofh.it>
In reply to#1589707
On 28/02/17 19:17, Jonathan Cameron wrote:
> On 28/02/17 18:51, simran singhal wrote:
>> The contents of the header file are used only by this single
>> source file. Move content into .c and remove .h.
>>
>> Signed-off-by: simran singhal <singhalsimran0@gmail.com>
> Applied to the togreg branch of iio.git and pushed out as testing
> for the autobuilders to play with it.
> 
> Thanks,
> 
> Jonathan

One quick note:

The title should include the name of the driver being modified
as this is probably the bit interested people are most likely
to pick up on in a long list of patches.

I fixed this up.  Thanks,

Jonathan
>> ---
>>
>>  v2:
>>    -Removing ifndef and define
>>
>>  drivers/staging/iio/accel/adis16201.h      | 144 -----------------------------
>>  drivers/staging/iio/accel/adis16201_core.c | 142 +++++++++++++++++++++++++++-
>>  2 files changed, 141 insertions(+), 145 deletions(-)
>>  delete mode 100644 drivers/staging/iio/accel/adis16201.h
>>
>> diff --git a/drivers/staging/iio/accel/adis16201.h b/drivers/staging/iio/accel/adis16201.h
>> deleted file mode 100644
>> index 64844ad..0000000
>> --- a/drivers/staging/iio/accel/adis16201.h
>> +++ /dev/null
>> @@ -1,144 +0,0 @@
>> -#ifndef SPI_ADIS16201_H_
>> -#define SPI_ADIS16201_H_
>> -
>> -#define ADIS16201_STARTUP_DELAY	220 /* ms */
>> -
>> -/* Flash memory write count */
>> -#define ADIS16201_FLASH_CNT      0x00
>> -
>> -/* Output, power supply */
>> -#define ADIS16201_SUPPLY_OUT     0x02
>> -
>> -/* Output, x-axis accelerometer */
>> -#define ADIS16201_XACCL_OUT      0x04
>> -
>> -/* Output, y-axis accelerometer */
>> -#define ADIS16201_YACCL_OUT      0x06
>> -
>> -/* Output, auxiliary ADC input */
>> -#define ADIS16201_AUX_ADC        0x08
>> -
>> -/* Output, temperature */
>> -#define ADIS16201_TEMP_OUT       0x0A
>> -
>> -/* Output, x-axis inclination */
>> -#define ADIS16201_XINCL_OUT      0x0C
>> -
>> -/* Output, y-axis inclination */
>> -#define ADIS16201_YINCL_OUT      0x0E
>> -
>> -/* Calibration, x-axis acceleration offset */
>> -#define ADIS16201_XACCL_OFFS     0x10
>> -
>> -/* Calibration, y-axis acceleration offset */
>> -#define ADIS16201_YACCL_OFFS     0x12
>> -
>> -/* x-axis acceleration scale factor */
>> -#define ADIS16201_XACCL_SCALE    0x14
>> -
>> -/* y-axis acceleration scale factor */
>> -#define ADIS16201_YACCL_SCALE    0x16
>> -
>> -/* Calibration, x-axis inclination offset */
>> -#define ADIS16201_XINCL_OFFS     0x18
>> -
>> -/* Calibration, y-axis inclination offset */
>> -#define ADIS16201_YINCL_OFFS     0x1A
>> -
>> -/* x-axis inclination scale factor */
>> -#define ADIS16201_XINCL_SCALE    0x1C
>> -
>> -/* y-axis inclination scale factor */
>> -#define ADIS16201_YINCL_SCALE    0x1E
>> -
>> -/* Alarm 1 amplitude threshold */
>> -#define ADIS16201_ALM_MAG1       0x20
>> -
>> -/* Alarm 2 amplitude threshold */
>> -#define ADIS16201_ALM_MAG2       0x22
>> -
>> -/* Alarm 1, sample period */
>> -#define ADIS16201_ALM_SMPL1      0x24
>> -
>> -/* Alarm 2, sample period */
>> -#define ADIS16201_ALM_SMPL2      0x26
>> -
>> -/* Alarm control */
>> -#define ADIS16201_ALM_CTRL       0x28
>> -
>> -/* Auxiliary DAC data */
>> -#define ADIS16201_AUX_DAC        0x30
>> -
>> -/* General-purpose digital input/output control */
>> -#define ADIS16201_GPIO_CTRL      0x32
>> -
>> -/* Miscellaneous control */
>> -#define ADIS16201_MSC_CTRL       0x34
>> -
>> -/* Internal sample period (rate) control */
>> -#define ADIS16201_SMPL_PRD       0x36
>> -
>> -/* Operation, filter configuration */
>> -#define ADIS16201_AVG_CNT        0x38
>> -
>> -/* Operation, sleep mode control */
>> -#define ADIS16201_SLP_CNT        0x3A
>> -
>> -/* Diagnostics, system status register */
>> -#define ADIS16201_DIAG_STAT      0x3C
>> -
>> -/* Operation, system command register */
>> -#define ADIS16201_GLOB_CMD       0x3E
>> -
>> -/* MSC_CTRL */
>> -
>> -/* Self-test enable */
>> -#define ADIS16201_MSC_CTRL_SELF_TEST_EN	        BIT(8)
>> -
>> -/* Data-ready enable: 1 = enabled, 0 = disabled */
>> -#define ADIS16201_MSC_CTRL_DATA_RDY_EN	        BIT(2)
>> -
>> -/* Data-ready polarity: 1 = active high, 0 = active low */
>> -#define ADIS16201_MSC_CTRL_ACTIVE_HIGH	        BIT(1)
>> -
>> -/* Data-ready line selection: 1 = DIO1, 0 = DIO0 */
>> -#define ADIS16201_MSC_CTRL_DATA_RDY_DIO1	BIT(0)
>> -
>> -/* DIAG_STAT */
>> -
>> -/* Alarm 2 status: 1 = alarm active, 0 = alarm inactive */
>> -#define ADIS16201_DIAG_STAT_ALARM2        BIT(9)
>> -
>> -/* Alarm 1 status: 1 = alarm active, 0 = alarm inactive */
>> -#define ADIS16201_DIAG_STAT_ALARM1        BIT(8)
>> -
>> -/* SPI communications failure */
>> -#define ADIS16201_DIAG_STAT_SPI_FAIL_BIT   3
>> -
>> -/* Flash update failure */
>> -#define ADIS16201_DIAG_STAT_FLASH_UPT_BIT  2
>> -
>> -/* Power supply above 3.625 V */
>> -#define ADIS16201_DIAG_STAT_POWER_HIGH_BIT 1
>> -
>> -/* Power supply below 3.15 V */
>> -#define ADIS16201_DIAG_STAT_POWER_LOW_BIT  0
>> -
>> -/* GLOB_CMD */
>> -
>> -#define ADIS16201_GLOB_CMD_SW_RESET	BIT(7)
>> -#define ADIS16201_GLOB_CMD_FACTORY_CAL	BIT(1)
>> -
>> -#define ADIS16201_ERROR_ACTIVE          BIT(14)
>> -
>> -enum adis16201_scan {
>> -	ADIS16201_SCAN_ACC_X,
>> -	ADIS16201_SCAN_ACC_Y,
>> -	ADIS16201_SCAN_INCLI_X,
>> -	ADIS16201_SCAN_INCLI_Y,
>> -	ADIS16201_SCAN_SUPPLY,
>> -	ADIS16201_SCAN_AUX_ADC,
>> -	ADIS16201_SCAN_TEMP,
>> -};
>> -
>> -#endif /* SPI_ADIS16201_H_ */
>> diff --git a/drivers/staging/iio/accel/adis16201_core.c b/drivers/staging/iio/accel/adis16201_core.c
>> index 7963d4a..dcf8463 100644
>> --- a/drivers/staging/iio/accel/adis16201_core.c
>> +++ b/drivers/staging/iio/accel/adis16201_core.c
>> @@ -20,7 +20,147 @@
>>  #include <linux/iio/buffer.h>
>>  #include <linux/iio/imu/adis.h>
>>  
>> -#include "adis16201.h"
>> +#define ADIS16201_STARTUP_DELAY	220 /* ms */
>> +
>> +/* Flash memory write count */
>> +#define ADIS16201_FLASH_CNT      0x00
>> +
>> +/* Output, power supply */
>> +#define ADIS16201_SUPPLY_OUT     0x02
>> +
>> +/* Output, x-axis accelerometer */
>> +#define ADIS16201_XACCL_OUT      0x04
>> +
>> +/* Output, y-axis accelerometer */
>> +#define ADIS16201_YACCL_OUT      0x06
>> +
>> +/* Output, auxiliary ADC input */
>> +#define ADIS16201_AUX_ADC        0x08
>> +
>> +/* Output, temperature */
>> +#define ADIS16201_TEMP_OUT       0x0A
>> +
>> +/* Output, x-axis inclination */
>> +#define ADIS16201_XINCL_OUT      0x0C
>> +
>> +/* Output, y-axis inclination */
>> +#define ADIS16201_YINCL_OUT      0x0E
>> +
>> +/* Calibration, x-axis acceleration offset */
>> +#define ADIS16201_XACCL_OFFS     0x10
>> +
>> +/* Calibration, y-axis acceleration offset */
>> +#define ADIS16201_YACCL_OFFS     0x12
>> +
>> +/* x-axis acceleration scale factor */
>> +#define ADIS16201_XACCL_SCALE    0x14
>> +
>> +/* y-axis acceleration scale factor */
>> +#define ADIS16201_YACCL_SCALE    0x16
>> +
>> +/* Calibration, x-axis inclination offset */
>> +#define ADIS16201_XINCL_OFFS     0x18
>> +
>> +/* Calibration, y-axis inclination offset */
>> +#define ADIS16201_YINCL_OFFS     0x1A
>> +
>> +/* x-axis inclination scale factor */
>> +#define ADIS16201_XINCL_SCALE    0x1C
>> +
>> +/* y-axis inclination scale factor */
>> +#define ADIS16201_YINCL_SCALE    0x1E
>> +
>> +/* Alarm 1 amplitude threshold */
>> +#define ADIS16201_ALM_MAG1       0x20
>> +
>> +/* Alarm 2 amplitude threshold */
>> +#define ADIS16201_ALM_MAG2       0x22
>> +
>> +/* Alarm 1, sample period */
>> +#define ADIS16201_ALM_SMPL1      0x24
>> +
>> +/* Alarm 2, sample period */
>> +#define ADIS16201_ALM_SMPL2      0x26
>> +
>> +/* Alarm control */
>> +#define ADIS16201_ALM_CTRL       0x28
>> +
>> +/* Auxiliary DAC data */
>> +#define ADIS16201_AUX_DAC        0x30
>> +
>> +/* General-purpose digital input/output control */
>> +#define ADIS16201_GPIO_CTRL      0x32
>> +
>> +/* Miscellaneous control */
>> +#define ADIS16201_MSC_CTRL       0x34
>> +
>> +/* Internal sample period (rate) control */
>> +#define ADIS16201_SMPL_PRD       0x36
>> +
>> +/* Operation, filter configuration */
>> +#define ADIS16201_AVG_CNT        0x38
>> +
>> +/* Operation, sleep mode control */
>> +#define ADIS16201_SLP_CNT        0x3A
>> +
>> +/* Diagnostics, system status register */
>> +#define ADIS16201_DIAG_STAT      0x3C
>> +
>> +/* Operation, system command register */
>> +#define ADIS16201_GLOB_CMD       0x3E
>> +
>> +/* MSC_CTRL */
>> +
>> +/* Self-test enable */
>> +#define ADIS16201_MSC_CTRL_SELF_TEST_EN	        BIT(8)
>> +
>> +/* Data-ready enable: 1 = enabled, 0 = disabled */
>> +#define ADIS16201_MSC_CTRL_DATA_RDY_EN	        BIT(2)
>> +
>> +/* Data-ready polarity: 1 = active high, 0 = active low */
>> +#define ADIS16201_MSC_CTRL_ACTIVE_HIGH	        BIT(1)
>> +
>> +/* Data-ready line selection: 1 = DIO1, 0 = DIO0 */
>> +#define ADIS16201_MSC_CTRL_DATA_RDY_DIO1	BIT(0)
>> +
>> +/* DIAG_STAT */
>> +
>> +/* Alarm 2 status: 1 = alarm active, 0 = alarm inactive */
>> +#define ADIS16201_DIAG_STAT_ALARM2        BIT(9)
>> +
>> +/* Alarm 1 status: 1 = alarm active, 0 = alarm inactive */
>> +#define ADIS16201_DIAG_STAT_ALARM1        BIT(8)
>> +
>> +/* SPI communications failure */
>> +#define ADIS16201_DIAG_STAT_SPI_FAIL_BIT   3
>> +
>> +/* Flash update failure */
>> +#define ADIS16201_DIAG_STAT_FLASH_UPT_BIT  2
>> +
>> +/* Power supply above 3.625 V */
>> +#define ADIS16201_DIAG_STAT_POWER_HIGH_BIT 1
>> +
>> +/* Power supply below 3.15 V */
>> +#define ADIS16201_DIAG_STAT_POWER_LOW_BIT  0
>> +
>> +/* GLOB_CMD */
>> +
>> +#define ADIS16201_GLOB_CMD_SW_RESET	BIT(7)
>> +#define ADIS16201_GLOB_CMD_FACTORY_CAL	BIT(1)
>> +
>> +#define ADIS16201_ERROR_ACTIVE          BIT(14)
>> +
>> +enum adis16201_scan {
>> +	ADIS16201_SCAN_ACC_X,
>> +	ADIS16201_SCAN_ACC_Y,
>> +	ADIS16201_SCAN_INCLI_X,
>> +	ADIS16201_SCAN_INCLI_Y,
>> +	ADIS16201_SCAN_SUPPLY,
>> +	ADIS16201_SCAN_AUX_ADC,
>> +	ADIS16201_SCAN_TEMP,
>> +};
>> +
>> +#endif /* SPI_ADIS16201_H_ */
>>  
>>  static const u8 adis16201_addresses[] = {
>>  	[ADIS16201_SCAN_ACC_X] = ADIS16201_XACCL_OFFS,
>>
>

[toc] | [prev] | [next] | [standalone]

#1589721 — Re: [PATCH v2] staging: iio: accel: Move header file content to source file

FromSIMRAN SINGHAL <singhalsimran0@gmail.com>
Date2017-02-28 20:40 +0100
SubjectRe: [PATCH v2] staging: iio: accel: Move header file content to source file
Message-ID<tfVMR-oA-9@gated-at.bofh.it>
In reply to#1589716
On Wed, Mar 1, 2017 at 12:53 AM, Jonathan Cameron <jic23@kernel.org> wrote:
> On 28/02/17 19:17, Jonathan Cameron wrote:
>> On 28/02/17 18:51, simran singhal wrote:
>>> The contents of the header file are used only by this single
>>> source file. Move content into .c and remove .h.
>>>
>>> Signed-off-by: simran singhal <singhalsimran0@gmail.com>
>> Applied to the togreg branch of iio.git and pushed out as testing
>> for the autobuilders to play with it.
>>
>> Thanks,
>>
>> Jonathan
>
> One quick note:
>
> The title should include the name of the driver being modified
> as this is probably the bit interested people are most likely
> to pick up on in a long list of patches.
>
> I fixed this up.  Thanks,
>
> Jonathan

I have included the name of driver being modified.
Due to want me to include the name of file i.e adis16201_core.c

>>> ---
>>>
>>>  v2:
>>>    -Removing ifndef and define
>>>
>>>  drivers/staging/iio/accel/adis16201.h      | 144 -----------------------------
>>>  drivers/staging/iio/accel/adis16201_core.c | 142 +++++++++++++++++++++++++++-
>>>  2 files changed, 141 insertions(+), 145 deletions(-)
>>>  delete mode 100644 drivers/staging/iio/accel/adis16201.h
>>>
>>> diff --git a/drivers/staging/iio/accel/adis16201.h b/drivers/staging/iio/accel/adis16201.h
>>> deleted file mode 100644
>>> index 64844ad..0000000
>>> --- a/drivers/staging/iio/accel/adis16201.h
>>> +++ /dev/null
>>> @@ -1,144 +0,0 @@
>>> -#ifndef SPI_ADIS16201_H_
>>> -#define SPI_ADIS16201_H_
>>> -
>>> -#define ADIS16201_STARTUP_DELAY     220 /* ms */
>>> -
>>> -/* Flash memory write count */
>>> -#define ADIS16201_FLASH_CNT      0x00
>>> -
>>> -/* Output, power supply */
>>> -#define ADIS16201_SUPPLY_OUT     0x02
>>> -
>>> -/* Output, x-axis accelerometer */
>>> -#define ADIS16201_XACCL_OUT      0x04
>>> -
>>> -/* Output, y-axis accelerometer */
>>> -#define ADIS16201_YACCL_OUT      0x06
>>> -
>>> -/* Output, auxiliary ADC input */
>>> -#define ADIS16201_AUX_ADC        0x08
>>> -
>>> -/* Output, temperature */
>>> -#define ADIS16201_TEMP_OUT       0x0A
>>> -
>>> -/* Output, x-axis inclination */
>>> -#define ADIS16201_XINCL_OUT      0x0C
>>> -
>>> -/* Output, y-axis inclination */
>>> -#define ADIS16201_YINCL_OUT      0x0E
>>> -
>>> -/* Calibration, x-axis acceleration offset */
>>> -#define ADIS16201_XACCL_OFFS     0x10
>>> -
>>> -/* Calibration, y-axis acceleration offset */
>>> -#define ADIS16201_YACCL_OFFS     0x12
>>> -
>>> -/* x-axis acceleration scale factor */
>>> -#define ADIS16201_XACCL_SCALE    0x14
>>> -
>>> -/* y-axis acceleration scale factor */
>>> -#define ADIS16201_YACCL_SCALE    0x16
>>> -
>>> -/* Calibration, x-axis inclination offset */
>>> -#define ADIS16201_XINCL_OFFS     0x18
>>> -
>>> -/* Calibration, y-axis inclination offset */
>>> -#define ADIS16201_YINCL_OFFS     0x1A
>>> -
>>> -/* x-axis inclination scale factor */
>>> -#define ADIS16201_XINCL_SCALE    0x1C
>>> -
>>> -/* y-axis inclination scale factor */
>>> -#define ADIS16201_YINCL_SCALE    0x1E
>>> -
>>> -/* Alarm 1 amplitude threshold */
>>> -#define ADIS16201_ALM_MAG1       0x20
>>> -
>>> -/* Alarm 2 amplitude threshold */
>>> -#define ADIS16201_ALM_MAG2       0x22
>>> -
>>> -/* Alarm 1, sample period */
>>> -#define ADIS16201_ALM_SMPL1      0x24
>>> -
>>> -/* Alarm 2, sample period */
>>> -#define ADIS16201_ALM_SMPL2      0x26
>>> -
>>> -/* Alarm control */
>>> -#define ADIS16201_ALM_CTRL       0x28
>>> -
>>> -/* Auxiliary DAC data */
>>> -#define ADIS16201_AUX_DAC        0x30
>>> -
>>> -/* General-purpose digital input/output control */
>>> -#define ADIS16201_GPIO_CTRL      0x32
>>> -
>>> -/* Miscellaneous control */
>>> -#define ADIS16201_MSC_CTRL       0x34
>>> -
>>> -/* Internal sample period (rate) control */
>>> -#define ADIS16201_SMPL_PRD       0x36
>>> -
>>> -/* Operation, filter configuration */
>>> -#define ADIS16201_AVG_CNT        0x38
>>> -
>>> -/* Operation, sleep mode control */
>>> -#define ADIS16201_SLP_CNT        0x3A
>>> -
>>> -/* Diagnostics, system status register */
>>> -#define ADIS16201_DIAG_STAT      0x3C
>>> -
>>> -/* Operation, system command register */
>>> -#define ADIS16201_GLOB_CMD       0x3E
>>> -
>>> -/* MSC_CTRL */
>>> -
>>> -/* Self-test enable */
>>> -#define ADIS16201_MSC_CTRL_SELF_TEST_EN             BIT(8)
>>> -
>>> -/* Data-ready enable: 1 = enabled, 0 = disabled */
>>> -#define ADIS16201_MSC_CTRL_DATA_RDY_EN              BIT(2)
>>> -
>>> -/* Data-ready polarity: 1 = active high, 0 = active low */
>>> -#define ADIS16201_MSC_CTRL_ACTIVE_HIGH              BIT(1)
>>> -
>>> -/* Data-ready line selection: 1 = DIO1, 0 = DIO0 */
>>> -#define ADIS16201_MSC_CTRL_DATA_RDY_DIO1    BIT(0)
>>> -
>>> -/* DIAG_STAT */
>>> -
>>> -/* Alarm 2 status: 1 = alarm active, 0 = alarm inactive */
>>> -#define ADIS16201_DIAG_STAT_ALARM2        BIT(9)
>>> -
>>> -/* Alarm 1 status: 1 = alarm active, 0 = alarm inactive */
>>> -#define ADIS16201_DIAG_STAT_ALARM1        BIT(8)
>>> -
>>> -/* SPI communications failure */
>>> -#define ADIS16201_DIAG_STAT_SPI_FAIL_BIT   3
>>> -
>>> -/* Flash update failure */
>>> -#define ADIS16201_DIAG_STAT_FLASH_UPT_BIT  2
>>> -
>>> -/* Power supply above 3.625 V */
>>> -#define ADIS16201_DIAG_STAT_POWER_HIGH_BIT 1
>>> -
>>> -/* Power supply below 3.15 V */
>>> -#define ADIS16201_DIAG_STAT_POWER_LOW_BIT  0
>>> -
>>> -/* GLOB_CMD */
>>> -
>>> -#define ADIS16201_GLOB_CMD_SW_RESET BIT(7)
>>> -#define ADIS16201_GLOB_CMD_FACTORY_CAL      BIT(1)
>>> -
>>> -#define ADIS16201_ERROR_ACTIVE          BIT(14)
>>> -
>>> -enum adis16201_scan {
>>> -    ADIS16201_SCAN_ACC_X,
>>> -    ADIS16201_SCAN_ACC_Y,
>>> -    ADIS16201_SCAN_INCLI_X,
>>> -    ADIS16201_SCAN_INCLI_Y,
>>> -    ADIS16201_SCAN_SUPPLY,
>>> -    ADIS16201_SCAN_AUX_ADC,
>>> -    ADIS16201_SCAN_TEMP,
>>> -};
>>> -
>>> -#endif /* SPI_ADIS16201_H_ */
>>> diff --git a/drivers/staging/iio/accel/adis16201_core.c b/drivers/staging/iio/accel/adis16201_core.c
>>> index 7963d4a..dcf8463 100644
>>> --- a/drivers/staging/iio/accel/adis16201_core.c
>>> +++ b/drivers/staging/iio/accel/adis16201_core.c
>>> @@ -20,7 +20,147 @@
>>>  #include <linux/iio/buffer.h>
>>>  #include <linux/iio/imu/adis.h>
>>>
>>> -#include "adis16201.h"
>>> +#define ADIS16201_STARTUP_DELAY     220 /* ms */
>>> +
>>> +/* Flash memory write count */
>>> +#define ADIS16201_FLASH_CNT      0x00
>>> +
>>> +/* Output, power supply */
>>> +#define ADIS16201_SUPPLY_OUT     0x02
>>> +
>>> +/* Output, x-axis accelerometer */
>>> +#define ADIS16201_XACCL_OUT      0x04
>>> +
>>> +/* Output, y-axis accelerometer */
>>> +#define ADIS16201_YACCL_OUT      0x06
>>> +
>>> +/* Output, auxiliary ADC input */
>>> +#define ADIS16201_AUX_ADC        0x08
>>> +
>>> +/* Output, temperature */
>>> +#define ADIS16201_TEMP_OUT       0x0A
>>> +
>>> +/* Output, x-axis inclination */
>>> +#define ADIS16201_XINCL_OUT      0x0C
>>> +
>>> +/* Output, y-axis inclination */
>>> +#define ADIS16201_YINCL_OUT      0x0E
>>> +
>>> +/* Calibration, x-axis acceleration offset */
>>> +#define ADIS16201_XACCL_OFFS     0x10
>>> +
>>> +/* Calibration, y-axis acceleration offset */
>>> +#define ADIS16201_YACCL_OFFS     0x12
>>> +
>>> +/* x-axis acceleration scale factor */
>>> +#define ADIS16201_XACCL_SCALE    0x14
>>> +
>>> +/* y-axis acceleration scale factor */
>>> +#define ADIS16201_YACCL_SCALE    0x16
>>> +
>>> +/* Calibration, x-axis inclination offset */
>>> +#define ADIS16201_XINCL_OFFS     0x18
>>> +
>>> +/* Calibration, y-axis inclination offset */
>>> +#define ADIS16201_YINCL_OFFS     0x1A
>>> +
>>> +/* x-axis inclination scale factor */
>>> +#define ADIS16201_XINCL_SCALE    0x1C
>>> +
>>> +/* y-axis inclination scale factor */
>>> +#define ADIS16201_YINCL_SCALE    0x1E
>>> +
>>> +/* Alarm 1 amplitude threshold */
>>> +#define ADIS16201_ALM_MAG1       0x20
>>> +
>>> +/* Alarm 2 amplitude threshold */
>>> +#define ADIS16201_ALM_MAG2       0x22
>>> +
>>> +/* Alarm 1, sample period */
>>> +#define ADIS16201_ALM_SMPL1      0x24
>>> +
>>> +/* Alarm 2, sample period */
>>> +#define ADIS16201_ALM_SMPL2      0x26
>>> +
>>> +/* Alarm control */
>>> +#define ADIS16201_ALM_CTRL       0x28
>>> +
>>> +/* Auxiliary DAC data */
>>> +#define ADIS16201_AUX_DAC        0x30
>>> +
>>> +/* General-purpose digital input/output control */
>>> +#define ADIS16201_GPIO_CTRL      0x32
>>> +
>>> +/* Miscellaneous control */
>>> +#define ADIS16201_MSC_CTRL       0x34
>>> +
>>> +/* Internal sample period (rate) control */
>>> +#define ADIS16201_SMPL_PRD       0x36
>>> +
>>> +/* Operation, filter configuration */
>>> +#define ADIS16201_AVG_CNT        0x38
>>> +
>>> +/* Operation, sleep mode control */
>>> +#define ADIS16201_SLP_CNT        0x3A
>>> +
>>> +/* Diagnostics, system status register */
>>> +#define ADIS16201_DIAG_STAT      0x3C
>>> +
>>> +/* Operation, system command register */
>>> +#define ADIS16201_GLOB_CMD       0x3E
>>> +
>>> +/* MSC_CTRL */
>>> +
>>> +/* Self-test enable */
>>> +#define ADIS16201_MSC_CTRL_SELF_TEST_EN             BIT(8)
>>> +
>>> +/* Data-ready enable: 1 = enabled, 0 = disabled */
>>> +#define ADIS16201_MSC_CTRL_DATA_RDY_EN              BIT(2)
>>> +
>>> +/* Data-ready polarity: 1 = active high, 0 = active low */
>>> +#define ADIS16201_MSC_CTRL_ACTIVE_HIGH              BIT(1)
>>> +
>>> +/* Data-ready line selection: 1 = DIO1, 0 = DIO0 */
>>> +#define ADIS16201_MSC_CTRL_DATA_RDY_DIO1    BIT(0)
>>> +
>>> +/* DIAG_STAT */
>>> +
>>> +/* Alarm 2 status: 1 = alarm active, 0 = alarm inactive */
>>> +#define ADIS16201_DIAG_STAT_ALARM2        BIT(9)
>>> +
>>> +/* Alarm 1 status: 1 = alarm active, 0 = alarm inactive */
>>> +#define ADIS16201_DIAG_STAT_ALARM1        BIT(8)
>>> +
>>> +/* SPI communications failure */
>>> +#define ADIS16201_DIAG_STAT_SPI_FAIL_BIT   3
>>> +
>>> +/* Flash update failure */
>>> +#define ADIS16201_DIAG_STAT_FLASH_UPT_BIT  2
>>> +
>>> +/* Power supply above 3.625 V */
>>> +#define ADIS16201_DIAG_STAT_POWER_HIGH_BIT 1
>>> +
>>> +/* Power supply below 3.15 V */
>>> +#define ADIS16201_DIAG_STAT_POWER_LOW_BIT  0
>>> +
>>> +/* GLOB_CMD */
>>> +
>>> +#define ADIS16201_GLOB_CMD_SW_RESET BIT(7)
>>> +#define ADIS16201_GLOB_CMD_FACTORY_CAL      BIT(1)
>>> +
>>> +#define ADIS16201_ERROR_ACTIVE          BIT(14)
>>> +
>>> +enum adis16201_scan {
>>> +    ADIS16201_SCAN_ACC_X,
>>> +    ADIS16201_SCAN_ACC_Y,
>>> +    ADIS16201_SCAN_INCLI_X,
>>> +    ADIS16201_SCAN_INCLI_Y,
>>> +    ADIS16201_SCAN_SUPPLY,
>>> +    ADIS16201_SCAN_AUX_ADC,
>>> +    ADIS16201_SCAN_TEMP,
>>> +};
>>> +
>>> +#endif /* SPI_ADIS16201_H_ */
>>>
>>>  static const u8 adis16201_addresses[] = {
>>>      [ADIS16201_SCAN_ACC_X] = ADIS16201_XACCL_OFFS,
>>>
>>
>

[toc] | [prev] | [next] | [standalone]

#1589725 — Re: [PATCH v2] staging: iio: accel: Move header file content to source file

FromLars-Peter Clausen <lars@metafoo.de>
Date2017-02-28 20:40 +0100
SubjectRe: [PATCH v2] staging: iio: accel: Move header file content to source file
Message-ID<tfVMS-oA-11@gated-at.bofh.it>
In reply to#1589721
On 02/28/2017 08:32 PM, SIMRAN SINGHAL wrote:
> On Wed, Mar 1, 2017 at 12:53 AM, Jonathan Cameron <jic23@kernel.org> wrote:
>> On 28/02/17 19:17, Jonathan Cameron wrote:
>>> On 28/02/17 18:51, simran singhal wrote:
>>>> The contents of the header file are used only by this single
>>>> source file. Move content into .c and remove .h.
>>>>
>>>> Signed-off-by: simran singhal <singhalsimran0@gmail.com>
>>> Applied to the togreg branch of iio.git and pushed out as testing
>>> for the autobuilders to play with it.
>>>
>>> Thanks,
>>>
>>> Jonathan
>>
>> One quick note:
>>
>> The title should include the name of the driver being modified
>> as this is probably the bit interested people are most likely
>> to pick up on in a long list of patches.
>>
>> I fixed this up.  Thanks,
>>
>> Jonathan
> 
> I have included the name of driver being modified.
> Due to want me to include the name of file i.e adis16201_core.c

Not the full filename, but the partnumber. E.g.

	'staging: iio: adis16201: ...'

[toc] | [prev] | [next] | [standalone]

#1589797 — Re: [PATCH v2] staging: iio: accel: Move header file content to source file

FromSIMRAN SINGHAL <singhalsimran0@gmail.com>
Date2017-02-28 22:30 +0100
SubjectRe: [PATCH v2] staging: iio: accel: Move header file content to source file
Message-ID<tfXvj-1v9-11@gated-at.bofh.it>
In reply to#1589725
On Wed, Mar 1, 2017 at 1:04 AM, Lars-Peter Clausen <lars@metafoo.de> wrote:
> On 02/28/2017 08:32 PM, SIMRAN SINGHAL wrote:
>> On Wed, Mar 1, 2017 at 12:53 AM, Jonathan Cameron <jic23@kernel.org> wrote:
>>> On 28/02/17 19:17, Jonathan Cameron wrote:
>>>> On 28/02/17 18:51, simran singhal wrote:
>>>>> The contents of the header file are used only by this single
>>>>> source file. Move content into .c and remove .h.
>>>>>
>>>>> Signed-off-by: simran singhal <singhalsimran0@gmail.com>
>>>> Applied to the togreg branch of iio.git and pushed out as testing
>>>> for the autobuilders to play with it.
>>>>
>>>> Thanks,
>>>>
>>>> Jonathan
>>>
>>> One quick note:
>>>
>>> The title should include the name of the driver being modified
>>> as this is probably the bit interested people are most likely
>>> to pick up on in a long list of patches.
>>>
>>> I fixed this up.  Thanks,
>>>
>>> Jonathan
>>
>> I have included the name of driver being modified.
>> Due to want me to include the name of file i.e adis16201_core.c
>
> Not the full filename, but the partnumber. E.g.
>
>         'staging: iio: adis16201: ...'
>

Lars-Peter, I got it.

Jonathan, I got my mistake should I send v3.

[toc] | [prev] | [next] | [standalone]

#1589726 — Re: [PATCH v2] staging: iio: accel: Move header file content to source file

FromJonathan Cameron <jic23@kernel.org>
Date2017-02-28 20:40 +0100
SubjectRe: [PATCH v2] staging: iio: accel: Move header file content to source file
Message-ID<tfVDb-lh-5@gated-at.bofh.it>
In reply to#1589707
On 28/02/17 18:51, simran singhal wrote:
> The contents of the header file are used only by this single
> source file. Move content into .c and remove .h.
> 
> Signed-off-by: simran singhal <singhalsimran0@gmail.com>
Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.

Thanks,

Jonathan
> ---
> 
>  v2:
>    -Removing ifndef and define
> 
>  drivers/staging/iio/accel/adis16201.h      | 144 -----------------------------
>  drivers/staging/iio/accel/adis16201_core.c | 142 +++++++++++++++++++++++++++-
>  2 files changed, 141 insertions(+), 145 deletions(-)
>  delete mode 100644 drivers/staging/iio/accel/adis16201.h
> 
> diff --git a/drivers/staging/iio/accel/adis16201.h b/drivers/staging/iio/accel/adis16201.h
> deleted file mode 100644
> index 64844ad..0000000
> --- a/drivers/staging/iio/accel/adis16201.h
> +++ /dev/null
> @@ -1,144 +0,0 @@
> -#ifndef SPI_ADIS16201_H_
> -#define SPI_ADIS16201_H_
> -
> -#define ADIS16201_STARTUP_DELAY	220 /* ms */
> -
> -/* Flash memory write count */
> -#define ADIS16201_FLASH_CNT      0x00
> -
> -/* Output, power supply */
> -#define ADIS16201_SUPPLY_OUT     0x02
> -
> -/* Output, x-axis accelerometer */
> -#define ADIS16201_XACCL_OUT      0x04
> -
> -/* Output, y-axis accelerometer */
> -#define ADIS16201_YACCL_OUT      0x06
> -
> -/* Output, auxiliary ADC input */
> -#define ADIS16201_AUX_ADC        0x08
> -
> -/* Output, temperature */
> -#define ADIS16201_TEMP_OUT       0x0A
> -
> -/* Output, x-axis inclination */
> -#define ADIS16201_XINCL_OUT      0x0C
> -
> -/* Output, y-axis inclination */
> -#define ADIS16201_YINCL_OUT      0x0E
> -
> -/* Calibration, x-axis acceleration offset */
> -#define ADIS16201_XACCL_OFFS     0x10
> -
> -/* Calibration, y-axis acceleration offset */
> -#define ADIS16201_YACCL_OFFS     0x12
> -
> -/* x-axis acceleration scale factor */
> -#define ADIS16201_XACCL_SCALE    0x14
> -
> -/* y-axis acceleration scale factor */
> -#define ADIS16201_YACCL_SCALE    0x16
> -
> -/* Calibration, x-axis inclination offset */
> -#define ADIS16201_XINCL_OFFS     0x18
> -
> -/* Calibration, y-axis inclination offset */
> -#define ADIS16201_YINCL_OFFS     0x1A
> -
> -/* x-axis inclination scale factor */
> -#define ADIS16201_XINCL_SCALE    0x1C
> -
> -/* y-axis inclination scale factor */
> -#define ADIS16201_YINCL_SCALE    0x1E
> -
> -/* Alarm 1 amplitude threshold */
> -#define ADIS16201_ALM_MAG1       0x20
> -
> -/* Alarm 2 amplitude threshold */
> -#define ADIS16201_ALM_MAG2       0x22
> -
> -/* Alarm 1, sample period */
> -#define ADIS16201_ALM_SMPL1      0x24
> -
> -/* Alarm 2, sample period */
> -#define ADIS16201_ALM_SMPL2      0x26
> -
> -/* Alarm control */
> -#define ADIS16201_ALM_CTRL       0x28
> -
> -/* Auxiliary DAC data */
> -#define ADIS16201_AUX_DAC        0x30
> -
> -/* General-purpose digital input/output control */
> -#define ADIS16201_GPIO_CTRL      0x32
> -
> -/* Miscellaneous control */
> -#define ADIS16201_MSC_CTRL       0x34
> -
> -/* Internal sample period (rate) control */
> -#define ADIS16201_SMPL_PRD       0x36
> -
> -/* Operation, filter configuration */
> -#define ADIS16201_AVG_CNT        0x38
> -
> -/* Operation, sleep mode control */
> -#define ADIS16201_SLP_CNT        0x3A
> -
> -/* Diagnostics, system status register */
> -#define ADIS16201_DIAG_STAT      0x3C
> -
> -/* Operation, system command register */
> -#define ADIS16201_GLOB_CMD       0x3E
> -
> -/* MSC_CTRL */
> -
> -/* Self-test enable */
> -#define ADIS16201_MSC_CTRL_SELF_TEST_EN	        BIT(8)
> -
> -/* Data-ready enable: 1 = enabled, 0 = disabled */
> -#define ADIS16201_MSC_CTRL_DATA_RDY_EN	        BIT(2)
> -
> -/* Data-ready polarity: 1 = active high, 0 = active low */
> -#define ADIS16201_MSC_CTRL_ACTIVE_HIGH	        BIT(1)
> -
> -/* Data-ready line selection: 1 = DIO1, 0 = DIO0 */
> -#define ADIS16201_MSC_CTRL_DATA_RDY_DIO1	BIT(0)
> -
> -/* DIAG_STAT */
> -
> -/* Alarm 2 status: 1 = alarm active, 0 = alarm inactive */
> -#define ADIS16201_DIAG_STAT_ALARM2        BIT(9)
> -
> -/* Alarm 1 status: 1 = alarm active, 0 = alarm inactive */
> -#define ADIS16201_DIAG_STAT_ALARM1        BIT(8)
> -
> -/* SPI communications failure */
> -#define ADIS16201_DIAG_STAT_SPI_FAIL_BIT   3
> -
> -/* Flash update failure */
> -#define ADIS16201_DIAG_STAT_FLASH_UPT_BIT  2
> -
> -/* Power supply above 3.625 V */
> -#define ADIS16201_DIAG_STAT_POWER_HIGH_BIT 1
> -
> -/* Power supply below 3.15 V */
> -#define ADIS16201_DIAG_STAT_POWER_LOW_BIT  0
> -
> -/* GLOB_CMD */
> -
> -#define ADIS16201_GLOB_CMD_SW_RESET	BIT(7)
> -#define ADIS16201_GLOB_CMD_FACTORY_CAL	BIT(1)
> -
> -#define ADIS16201_ERROR_ACTIVE          BIT(14)
> -
> -enum adis16201_scan {
> -	ADIS16201_SCAN_ACC_X,
> -	ADIS16201_SCAN_ACC_Y,
> -	ADIS16201_SCAN_INCLI_X,
> -	ADIS16201_SCAN_INCLI_Y,
> -	ADIS16201_SCAN_SUPPLY,
> -	ADIS16201_SCAN_AUX_ADC,
> -	ADIS16201_SCAN_TEMP,
> -};
> -
> -#endif /* SPI_ADIS16201_H_ */
> diff --git a/drivers/staging/iio/accel/adis16201_core.c b/drivers/staging/iio/accel/adis16201_core.c
> index 7963d4a..dcf8463 100644
> --- a/drivers/staging/iio/accel/adis16201_core.c
> +++ b/drivers/staging/iio/accel/adis16201_core.c
> @@ -20,7 +20,147 @@
>  #include <linux/iio/buffer.h>
>  #include <linux/iio/imu/adis.h>
>  
> -#include "adis16201.h"
> +#define ADIS16201_STARTUP_DELAY	220 /* ms */
> +
> +/* Flash memory write count */
> +#define ADIS16201_FLASH_CNT      0x00
> +
> +/* Output, power supply */
> +#define ADIS16201_SUPPLY_OUT     0x02
> +
> +/* Output, x-axis accelerometer */
> +#define ADIS16201_XACCL_OUT      0x04
> +
> +/* Output, y-axis accelerometer */
> +#define ADIS16201_YACCL_OUT      0x06
> +
> +/* Output, auxiliary ADC input */
> +#define ADIS16201_AUX_ADC        0x08
> +
> +/* Output, temperature */
> +#define ADIS16201_TEMP_OUT       0x0A
> +
> +/* Output, x-axis inclination */
> +#define ADIS16201_XINCL_OUT      0x0C
> +
> +/* Output, y-axis inclination */
> +#define ADIS16201_YINCL_OUT      0x0E
> +
> +/* Calibration, x-axis acceleration offset */
> +#define ADIS16201_XACCL_OFFS     0x10
> +
> +/* Calibration, y-axis acceleration offset */
> +#define ADIS16201_YACCL_OFFS     0x12
> +
> +/* x-axis acceleration scale factor */
> +#define ADIS16201_XACCL_SCALE    0x14
> +
> +/* y-axis acceleration scale factor */
> +#define ADIS16201_YACCL_SCALE    0x16
> +
> +/* Calibration, x-axis inclination offset */
> +#define ADIS16201_XINCL_OFFS     0x18
> +
> +/* Calibration, y-axis inclination offset */
> +#define ADIS16201_YINCL_OFFS     0x1A
> +
> +/* x-axis inclination scale factor */
> +#define ADIS16201_XINCL_SCALE    0x1C
> +
> +/* y-axis inclination scale factor */
> +#define ADIS16201_YINCL_SCALE    0x1E
> +
> +/* Alarm 1 amplitude threshold */
> +#define ADIS16201_ALM_MAG1       0x20
> +
> +/* Alarm 2 amplitude threshold */
> +#define ADIS16201_ALM_MAG2       0x22
> +
> +/* Alarm 1, sample period */
> +#define ADIS16201_ALM_SMPL1      0x24
> +
> +/* Alarm 2, sample period */
> +#define ADIS16201_ALM_SMPL2      0x26
> +
> +/* Alarm control */
> +#define ADIS16201_ALM_CTRL       0x28
> +
> +/* Auxiliary DAC data */
> +#define ADIS16201_AUX_DAC        0x30
> +
> +/* General-purpose digital input/output control */
> +#define ADIS16201_GPIO_CTRL      0x32
> +
> +/* Miscellaneous control */
> +#define ADIS16201_MSC_CTRL       0x34
> +
> +/* Internal sample period (rate) control */
> +#define ADIS16201_SMPL_PRD       0x36
> +
> +/* Operation, filter configuration */
> +#define ADIS16201_AVG_CNT        0x38
> +
> +/* Operation, sleep mode control */
> +#define ADIS16201_SLP_CNT        0x3A
> +
> +/* Diagnostics, system status register */
> +#define ADIS16201_DIAG_STAT      0x3C
> +
> +/* Operation, system command register */
> +#define ADIS16201_GLOB_CMD       0x3E
> +
> +/* MSC_CTRL */
> +
> +/* Self-test enable */
> +#define ADIS16201_MSC_CTRL_SELF_TEST_EN	        BIT(8)
> +
> +/* Data-ready enable: 1 = enabled, 0 = disabled */
> +#define ADIS16201_MSC_CTRL_DATA_RDY_EN	        BIT(2)
> +
> +/* Data-ready polarity: 1 = active high, 0 = active low */
> +#define ADIS16201_MSC_CTRL_ACTIVE_HIGH	        BIT(1)
> +
> +/* Data-ready line selection: 1 = DIO1, 0 = DIO0 */
> +#define ADIS16201_MSC_CTRL_DATA_RDY_DIO1	BIT(0)
> +
> +/* DIAG_STAT */
> +
> +/* Alarm 2 status: 1 = alarm active, 0 = alarm inactive */
> +#define ADIS16201_DIAG_STAT_ALARM2        BIT(9)
> +
> +/* Alarm 1 status: 1 = alarm active, 0 = alarm inactive */
> +#define ADIS16201_DIAG_STAT_ALARM1        BIT(8)
> +
> +/* SPI communications failure */
> +#define ADIS16201_DIAG_STAT_SPI_FAIL_BIT   3
> +
> +/* Flash update failure */
> +#define ADIS16201_DIAG_STAT_FLASH_UPT_BIT  2
> +
> +/* Power supply above 3.625 V */
> +#define ADIS16201_DIAG_STAT_POWER_HIGH_BIT 1
> +
> +/* Power supply below 3.15 V */
> +#define ADIS16201_DIAG_STAT_POWER_LOW_BIT  0
> +
> +/* GLOB_CMD */
> +
> +#define ADIS16201_GLOB_CMD_SW_RESET	BIT(7)
> +#define ADIS16201_GLOB_CMD_FACTORY_CAL	BIT(1)
> +
> +#define ADIS16201_ERROR_ACTIVE          BIT(14)
> +
> +enum adis16201_scan {
> +	ADIS16201_SCAN_ACC_X,
> +	ADIS16201_SCAN_ACC_Y,
> +	ADIS16201_SCAN_INCLI_X,
> +	ADIS16201_SCAN_INCLI_Y,
> +	ADIS16201_SCAN_SUPPLY,
> +	ADIS16201_SCAN_AUX_ADC,
> +	ADIS16201_SCAN_TEMP,
> +};
> +
> +#endif /* SPI_ADIS16201_H_ */
>  
>  static const u8 adis16201_addresses[] = {
>  	[ADIS16201_SCAN_ACC_X] = ADIS16201_XACCL_OFFS,
>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web