Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: iio: adis16203: Move header file content to source file.

The contents of the header file are used only by this single source
file. Moved content into adis16203_core.c file and removed adis16203.h
file. Arranged #include files in alphabetical order.

Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

authored by

Varsha Rao and committed by
Jonathan Cameron
a8baa3c0 34683472

+129 -134
-125
drivers/staging/iio/accel/adis16203.h
··· 1 - #ifndef SPI_ADIS16203_H_ 2 - #define SPI_ADIS16203_H_ 3 - 4 - #define ADIS16203_STARTUP_DELAY 220 /* ms */ 5 - 6 - /* Flash memory write count */ 7 - #define ADIS16203_FLASH_CNT 0x00 8 - 9 - /* Output, power supply */ 10 - #define ADIS16203_SUPPLY_OUT 0x02 11 - 12 - /* Output, auxiliary ADC input */ 13 - #define ADIS16203_AUX_ADC 0x08 14 - 15 - /* Output, temperature */ 16 - #define ADIS16203_TEMP_OUT 0x0A 17 - 18 - /* Output, x-axis inclination */ 19 - #define ADIS16203_XINCL_OUT 0x0C 20 - 21 - /* Output, y-axis inclination */ 22 - #define ADIS16203_YINCL_OUT 0x0E 23 - 24 - /* Incline null calibration */ 25 - #define ADIS16203_INCL_NULL 0x18 26 - 27 - /* Alarm 1 amplitude threshold */ 28 - #define ADIS16203_ALM_MAG1 0x20 29 - 30 - /* Alarm 2 amplitude threshold */ 31 - #define ADIS16203_ALM_MAG2 0x22 32 - 33 - /* Alarm 1, sample period */ 34 - #define ADIS16203_ALM_SMPL1 0x24 35 - 36 - /* Alarm 2, sample period */ 37 - #define ADIS16203_ALM_SMPL2 0x26 38 - 39 - /* Alarm control */ 40 - #define ADIS16203_ALM_CTRL 0x28 41 - 42 - /* Auxiliary DAC data */ 43 - #define ADIS16203_AUX_DAC 0x30 44 - 45 - /* General-purpose digital input/output control */ 46 - #define ADIS16203_GPIO_CTRL 0x32 47 - 48 - /* Miscellaneous control */ 49 - #define ADIS16203_MSC_CTRL 0x34 50 - 51 - /* Internal sample period (rate) control */ 52 - #define ADIS16203_SMPL_PRD 0x36 53 - 54 - /* Operation, filter configuration */ 55 - #define ADIS16203_AVG_CNT 0x38 56 - 57 - /* Operation, sleep mode control */ 58 - #define ADIS16203_SLP_CNT 0x3A 59 - 60 - /* Diagnostics, system status register */ 61 - #define ADIS16203_DIAG_STAT 0x3C 62 - 63 - /* Operation, system command register */ 64 - #define ADIS16203_GLOB_CMD 0x3E 65 - 66 - /* MSC_CTRL */ 67 - 68 - /* Self-test at power-on: 1 = disabled, 0 = enabled */ 69 - #define ADIS16203_MSC_CTRL_PWRUP_SELF_TEST BIT(10) 70 - 71 - /* Reverses rotation of both inclination outputs */ 72 - #define ADIS16203_MSC_CTRL_REVERSE_ROT_EN BIT(9) 73 - 74 - /* Self-test enable */ 75 - #define ADIS16203_MSC_CTRL_SELF_TEST_EN BIT(8) 76 - 77 - /* Data-ready enable: 1 = enabled, 0 = disabled */ 78 - #define ADIS16203_MSC_CTRL_DATA_RDY_EN BIT(2) 79 - 80 - /* Data-ready polarity: 1 = active high, 0 = active low */ 81 - #define ADIS16203_MSC_CTRL_ACTIVE_HIGH BIT(1) 82 - 83 - /* Data-ready line selection: 1 = DIO1, 0 = DIO0 */ 84 - #define ADIS16203_MSC_CTRL_DATA_RDY_DIO1 BIT(0) 85 - 86 - /* DIAG_STAT */ 87 - 88 - /* Alarm 2 status: 1 = alarm active, 0 = alarm inactive */ 89 - #define ADIS16203_DIAG_STAT_ALARM2 BIT(9) 90 - 91 - /* Alarm 1 status: 1 = alarm active, 0 = alarm inactive */ 92 - #define ADIS16203_DIAG_STAT_ALARM1 BIT(8) 93 - 94 - /* Self-test diagnostic error flag */ 95 - #define ADIS16203_DIAG_STAT_SELFTEST_FAIL_BIT 5 96 - 97 - /* SPI communications failure */ 98 - #define ADIS16203_DIAG_STAT_SPI_FAIL_BIT 3 99 - 100 - /* Flash update failure */ 101 - #define ADIS16203_DIAG_STAT_FLASH_UPT_BIT 2 102 - 103 - /* Power supply above 3.625 V */ 104 - #define ADIS16203_DIAG_STAT_POWER_HIGH_BIT 1 105 - 106 - /* Power supply below 3.15 V */ 107 - #define ADIS16203_DIAG_STAT_POWER_LOW_BIT 0 108 - 109 - /* GLOB_CMD */ 110 - 111 - #define ADIS16203_GLOB_CMD_SW_RESET BIT(7) 112 - #define ADIS16203_GLOB_CMD_CLEAR_STAT BIT(4) 113 - #define ADIS16203_GLOB_CMD_FACTORY_CAL BIT(1) 114 - 115 - #define ADIS16203_ERROR_ACTIVE BIT(14) 116 - 117 - enum adis16203_scan { 118 - ADIS16203_SCAN_INCLI_X, 119 - ADIS16203_SCAN_INCLI_Y, 120 - ADIS16203_SCAN_SUPPLY, 121 - ADIS16203_SCAN_AUX_ADC, 122 - ADIS16203_SCAN_TEMP, 123 - }; 124 - 125 - #endif /* SPI_ADIS16203_H_ */
+129 -9
drivers/staging/iio/accel/adis16203_core.c
··· 7 7 */ 8 8 9 9 #include <linux/delay.h> 10 - #include <linux/mutex.h> 11 10 #include <linux/device.h> 12 - #include <linux/kernel.h> 13 - #include <linux/spi/spi.h> 14 - #include <linux/slab.h> 15 - #include <linux/sysfs.h> 16 - #include <linux/module.h> 17 11 18 - #include <linux/iio/iio.h> 19 - #include <linux/iio/sysfs.h> 20 12 #include <linux/iio/buffer.h> 13 + #include <linux/iio/iio.h> 21 14 #include <linux/iio/imu/adis.h> 15 + #include <linux/iio/sysfs.h> 22 16 23 - #include "adis16203.h" 17 + #include <linux/kernel.h> 18 + #include <linux/module.h> 19 + #include <linux/mutex.h> 20 + #include <linux/slab.h> 21 + #include <linux/spi/spi.h> 22 + #include <linux/sysfs.h> 23 + 24 + #define ADIS16203_STARTUP_DELAY 220 /* ms */ 25 + 26 + /* Flash memory write count */ 27 + #define ADIS16203_FLASH_CNT 0x00 28 + 29 + /* Output, power supply */ 30 + #define ADIS16203_SUPPLY_OUT 0x02 31 + 32 + /* Output, auxiliary ADC input */ 33 + #define ADIS16203_AUX_ADC 0x08 34 + 35 + /* Output, temperature */ 36 + #define ADIS16203_TEMP_OUT 0x0A 37 + 38 + /* Output, x-axis inclination */ 39 + #define ADIS16203_XINCL_OUT 0x0C 40 + 41 + /* Output, y-axis inclination */ 42 + #define ADIS16203_YINCL_OUT 0x0E 43 + 44 + /* Incline null calibration */ 45 + #define ADIS16203_INCL_NULL 0x18 46 + 47 + /* Alarm 1 amplitude threshold */ 48 + #define ADIS16203_ALM_MAG1 0x20 49 + 50 + /* Alarm 2 amplitude threshold */ 51 + #define ADIS16203_ALM_MAG2 0x22 52 + 53 + /* Alarm 1, sample period */ 54 + #define ADIS16203_ALM_SMPL1 0x24 55 + 56 + /* Alarm 2, sample period */ 57 + #define ADIS16203_ALM_SMPL2 0x26 58 + 59 + /* Alarm control */ 60 + #define ADIS16203_ALM_CTRL 0x28 61 + 62 + /* Auxiliary DAC data */ 63 + #define ADIS16203_AUX_DAC 0x30 64 + 65 + /* General-purpose digital input/output control */ 66 + #define ADIS16203_GPIO_CTRL 0x32 67 + 68 + /* Miscellaneous control */ 69 + #define ADIS16203_MSC_CTRL 0x34 70 + 71 + /* Internal sample period (rate) control */ 72 + #define ADIS16203_SMPL_PRD 0x36 73 + 74 + /* Operation, filter configuration */ 75 + #define ADIS16203_AVG_CNT 0x38 76 + 77 + /* Operation, sleep mode control */ 78 + #define ADIS16203_SLP_CNT 0x3A 79 + 80 + /* Diagnostics, system status register */ 81 + #define ADIS16203_DIAG_STAT 0x3C 82 + 83 + /* Operation, system command register */ 84 + #define ADIS16203_GLOB_CMD 0x3E 85 + 86 + /* MSC_CTRL */ 87 + 88 + /* Self-test at power-on: 1 = disabled, 0 = enabled */ 89 + #define ADIS16203_MSC_CTRL_PWRUP_SELF_TEST BIT(10) 90 + 91 + /* Reverses rotation of both inclination outputs */ 92 + #define ADIS16203_MSC_CTRL_REVERSE_ROT_EN BIT(9) 93 + 94 + /* Self-test enable */ 95 + #define ADIS16203_MSC_CTRL_SELF_TEST_EN BIT(8) 96 + 97 + /* Data-ready enable: 1 = enabled, 0 = disabled */ 98 + #define ADIS16203_MSC_CTRL_DATA_RDY_EN BIT(2) 99 + 100 + /* Data-ready polarity: 1 = active high, 0 = active low */ 101 + #define ADIS16203_MSC_CTRL_ACTIVE_HIGH BIT(1) 102 + 103 + /* Data-ready line selection: 1 = DIO1, 0 = DIO0 */ 104 + #define ADIS16203_MSC_CTRL_DATA_RDY_DIO1 BIT(0) 105 + 106 + /* DIAG_STAT */ 107 + 108 + /* Alarm 2 status: 1 = alarm active, 0 = alarm inactive */ 109 + #define ADIS16203_DIAG_STAT_ALARM2 BIT(9) 110 + 111 + /* Alarm 1 status: 1 = alarm active, 0 = alarm inactive */ 112 + #define ADIS16203_DIAG_STAT_ALARM1 BIT(8) 113 + 114 + /* Self-test diagnostic error flag */ 115 + #define ADIS16203_DIAG_STAT_SELFTEST_FAIL_BIT 5 116 + 117 + /* SPI communications failure */ 118 + #define ADIS16203_DIAG_STAT_SPI_FAIL_BIT 3 119 + 120 + /* Flash update failure */ 121 + #define ADIS16203_DIAG_STAT_FLASH_UPT_BIT 2 122 + 123 + /* Power supply above 3.625 V */ 124 + #define ADIS16203_DIAG_STAT_POWER_HIGH_BIT 1 125 + 126 + /* Power supply below 3.15 V */ 127 + #define ADIS16203_DIAG_STAT_POWER_LOW_BIT 0 128 + 129 + /* GLOB_CMD */ 130 + 131 + #define ADIS16203_GLOB_CMD_SW_RESET BIT(7) 132 + #define ADIS16203_GLOB_CMD_CLEAR_STAT BIT(4) 133 + #define ADIS16203_GLOB_CMD_FACTORY_CAL BIT(1) 134 + 135 + #define ADIS16203_ERROR_ACTIVE BIT(14) 136 + 137 + enum adis16203_scan { 138 + ADIS16203_SCAN_INCLI_X, 139 + ADIS16203_SCAN_INCLI_Y, 140 + ADIS16203_SCAN_SUPPLY, 141 + ADIS16203_SCAN_AUX_ADC, 142 + ADIS16203_SCAN_TEMP, 143 + }; 24 144 25 145 #define DRIVER_NAME "adis16203" 26 146