Commit ec82edb2 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Jonathan Cameron
Browse files

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: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20201204025509.1075506-6-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent e2621acd

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

+1 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * Author: Linus Walleij <linus.walleij@linaro.org>

 */



#include <linux/iio/adc/qcom-vadc-common.h>

#include <linux/iio/iio.h>

#include <linux/iio/sysfs.h>

#include <linux/module.h>
@@ -21,8 +22,6 @@ 
#include <linux/interrupt.h>

#include <linux/regulator/consumer.h>



#include "qcom-vadc-common.h"



/*

 * Definitions for the "user processor" registers lifted from the v3.4

 * Qualcomm tree. Their kernel has two out-of-tree drivers for the ADC:

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

+1 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/completion.h>

#include <linux/delay.h>

#include <linux/err.h>

#include <linux/iio/adc/qcom-vadc-common.h>

#include <linux/iio/iio.h>

#include <linux/interrupt.h>

#include <linux/kernel.h>
@@ -19,7 +20,6 @@ 
#include <linux/slab.h>



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

#include "qcom-vadc-common.h"



#define ADC5_USR_REVISION1			0x0

#define ADC5_USR_STATUS1			0x8

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

+1 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/completion.h>

#include <linux/delay.h>

#include <linux/err.h>

#include <linux/iio/adc/qcom-vadc-common.h>

#include <linux/iio/iio.h>

#include <linux/interrupt.h>

#include <linux/kernel.h>
@@ -20,8 +21,6 @@ 


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



#include "qcom-vadc-common.h"



/* VADC register and bit definitions */

#define VADC_REVISION2				0x1

#define VADC_REVISION2_SUPPORTED_VADC		1

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

+1 −2
Original line number Diff line number Diff line
@@ -3,14 +3,13 @@ 
#include <linux/kernel.h>

#include <linux/bitops.h>

#include <linux/fixp-arith.h>

#include <linux/iio/adc/qcom-vadc-common.h>

#include <linux/math64.h>

#include <linux/log2.h>

#include <linux/err.h>

#include <linux/module.h>

#include <linux/units.h>



#include "qcom-vadc-common.h"



/* Voltage to temperature */

static const struct vadc_map_pt adcmap_100k_104ef_104fb[] = {

	{1758,	-40},

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

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
#ifndef QCOM_VADC_COMMON_H

#define QCOM_VADC_COMMON_H



#include <linux/types.h>



#define VADC_CONV_TIME_MIN_US			2000

#define VADC_CONV_TIME_MAX_US			2100