iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iio: adc: move qcom-vadc-common.h to include dir

Browse Source 
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>
This commit is contained in:
Dmitry Baryshkov 2020-12-04 05:54:59 +03:00 committed by Jonathan Cameron
parent e2621acd6d
commit ec82edb258
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/iio/adc/qcom-pm8xxx-xoadc.c
View File

@ -10,6 +10,7 @@
* Author: Linus Walleij <linus.walleij@linaro.org> * Author: Linus Walleij <linus.walleij@linaro.org>
*/ */
#include <linux/iio/adc/qcom-vadc-common.h>
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
#include <linux/iio/sysfs.h> #include <linux/iio/sysfs.h>
#include <linux/module.h> #include <linux/module.h>
@ -21,8 +22,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include "qcom-vadc-common.h"
/* /*
* Definitions for the "user processor" registers lifted from the v3.4 * Definitions for the "user processor" registers lifted from the v3.4
* Qualcomm tree. Their kernel has two out-of-tree drivers for the ADC: * Qualcomm tree. Their kernel has two out-of-tree drivers for the ADC:

2
drivers/iio/adc/qcom-spmi-adc5.c
View File

@ -7,6 +7,7 @@
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/iio/adc/qcom-vadc-common.h>
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/kernel.h> #include <linux/kernel.h>
@ -19,7 +20,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <dt-bindings/iio/qcom,spmi-vadc.h> #include <dt-bindings/iio/qcom,spmi-vadc.h>
#include "qcom-vadc-common.h"
#define ADC5_USR_REVISION1 0x0 #define ADC5_USR_REVISION1 0x0
#define ADC5_USR_STATUS1 0x8 #define ADC5_USR_STATUS1 0x8

3
drivers/iio/adc/qcom-spmi-vadc.c
View File

@ -7,6 +7,7 @@
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/iio/adc/qcom-vadc-common.h>
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/kernel.h> #include <linux/kernel.h>
@ -20,8 +21,6 @@
#include <dt-bindings/iio/qcom,spmi-vadc.h> #include <dt-bindings/iio/qcom,spmi-vadc.h>
#include "qcom-vadc-common.h"
/* VADC register and bit definitions */ /* VADC register and bit definitions */
#define VADC_REVISION2 0x1 #define VADC_REVISION2 0x1
#define VADC_REVISION2_SUPPORTED_VADC 1 #define VADC_REVISION2_SUPPORTED_VADC 1

3
drivers/iio/adc/qcom-vadc-common.c
View File

@ -3,14 +3,13 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/fixp-arith.h> #include <linux/fixp-arith.h>
#include <linux/iio/adc/qcom-vadc-common.h>
#include <linux/math64.h> #include <linux/math64.h>
#include <linux/log2.h> #include <linux/log2.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/units.h> #include <linux/units.h>
#include "qcom-vadc-common.h"
/* Voltage to temperature */ /* Voltage to temperature */
static const struct vadc_map_pt adcmap_100k_104ef_104fb[] = { static const struct vadc_map_pt adcmap_100k_104ef_104fb[] = {
{1758, -40}, {1758, -40},

2
drivers/iio/adc/qcom-vadc-common.h → include/linux/iio/adc/qcom-vadc-common.h
View File

@ -6,6 +6,8 @@
#ifndef QCOM_VADC_COMMON_H #ifndef QCOM_VADC_COMMON_H
#define QCOM_VADC_COMMON_H #define QCOM_VADC_COMMON_H
#include <linux/types.h>
#define VADC_CONV_TIME_MIN_US 2000 #define VADC_CONV_TIME_MIN_US 2000
#define VADC_CONV_TIME_MAX_US 2100 #define VADC_CONV_TIME_MAX_US 2100