Skip to content

Commit ec82edb

Browse files
lumagjic23
authored andcommitted
iio: adc: move qcom-vadc-common.h to include dir
qcom-vadc-common module will be used by ADC thermal monitoring driver, so move it to global include dir. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Link: https://lore.kernel.org/r/20201204025509.1075506-6-dmitry.baryshkov@linaro.org Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
1 parent e2621ac commit ec82edb

5 files changed

Lines changed: 6 additions & 7 deletions

File tree

drivers/iio/adc/qcom-pm8xxx-xoadc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* Author: Linus Walleij <linus.walleij@linaro.org>
1111
*/
1212

13+
#include <linux/iio/adc/qcom-vadc-common.h>
1314
#include <linux/iio/iio.h>
1415
#include <linux/iio/sysfs.h>
1516
#include <linux/module.h>
@@ -21,8 +22,6 @@
2122
#include <linux/interrupt.h>
2223
#include <linux/regulator/consumer.h>
2324

24-
#include "qcom-vadc-common.h"
25-
2625
/*
2726
* Definitions for the "user processor" registers lifted from the v3.4
2827
* Qualcomm tree. Their kernel has two out-of-tree drivers for the ADC:

drivers/iio/adc/qcom-spmi-adc5.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <linux/completion.h>
88
#include <linux/delay.h>
99
#include <linux/err.h>
10+
#include <linux/iio/adc/qcom-vadc-common.h>
1011
#include <linux/iio/iio.h>
1112
#include <linux/interrupt.h>
1213
#include <linux/kernel.h>
@@ -19,7 +20,6 @@
1920
#include <linux/slab.h>
2021

2122
#include <dt-bindings/iio/qcom,spmi-vadc.h>
22-
#include "qcom-vadc-common.h"
2323

2424
#define ADC5_USR_REVISION1 0x0
2525
#define ADC5_USR_STATUS1 0x8

drivers/iio/adc/qcom-spmi-vadc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <linux/completion.h>
88
#include <linux/delay.h>
99
#include <linux/err.h>
10+
#include <linux/iio/adc/qcom-vadc-common.h>
1011
#include <linux/iio/iio.h>
1112
#include <linux/interrupt.h>
1213
#include <linux/kernel.h>
@@ -20,8 +21,6 @@
2021

2122
#include <dt-bindings/iio/qcom,spmi-vadc.h>
2223

23-
#include "qcom-vadc-common.h"
24-
2524
/* VADC register and bit definitions */
2625
#define VADC_REVISION2 0x1
2726
#define VADC_REVISION2_SUPPORTED_VADC 1

drivers/iio/adc/qcom-vadc-common.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
#include <linux/kernel.h>
44
#include <linux/bitops.h>
55
#include <linux/fixp-arith.h>
6+
#include <linux/iio/adc/qcom-vadc-common.h>
67
#include <linux/math64.h>
78
#include <linux/log2.h>
89
#include <linux/err.h>
910
#include <linux/module.h>
1011
#include <linux/units.h>
1112

12-
#include "qcom-vadc-common.h"
13-
1413
/* Voltage to temperature */
1514
static const struct vadc_map_pt adcmap_100k_104ef_104fb[] = {
1615
{1758, -40},
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
#ifndef QCOM_VADC_COMMON_H
77
#define QCOM_VADC_COMMON_H
88

9+
#include <linux/types.h>
10+
911
#define VADC_CONV_TIME_MIN_US 2000
1012
#define VADC_CONV_TIME_MAX_US 2100
1113

0 commit comments

Comments
 (0)