167 lines
5.2 KiB
Diff
167 lines
5.2 KiB
Diff
From 52adc77f5a22c9e51f9e62b2866909a9bfb14d9f Mon Sep 17 00:00:00 2001
|
|
From: Philipp Rossak <embed3d@gmail.com>
|
|
Date: Sun, 21 Jan 2018 22:29:55 +0100
|
|
Subject: [PATCH 034/101] drv:iio:adc:sun4i-gpadc-iio: support nvmem
|
|
calibration data
|
|
|
|
This patch reworks the driver to support nvmem calibration cells.
|
|
The driver checks if the nvmem calibration is supported and reads out
|
|
the nvmem. At the beginning of the startup process the calibration data
|
|
is written to the related registers.
|
|
|
|
Signed-off-by: Philipp Rossak <embed3d@gmail.com>
|
|
---
|
|
drivers/iio/adc/sun4i-gpadc-iio.c | 52 +++++++++++++++++++++++++++++++
|
|
include/linux/mfd/sun4i-gpadc.h | 2 ++
|
|
2 files changed, 54 insertions(+)
|
|
|
|
diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c
|
|
index 0208130e1..65827d1f3 100644
|
|
--- a/drivers/iio/adc/sun4i-gpadc-iio.c
|
|
+++ b/drivers/iio/adc/sun4i-gpadc-iio.c
|
|
@@ -24,6 +24,7 @@
|
|
#include <linux/interrupt.h>
|
|
#include <linux/io.h>
|
|
#include <linux/module.h>
|
|
+#include <linux/nvmem-consumer.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/platform_device.h>
|
|
@@ -78,6 +79,7 @@ struct gpadc_data {
|
|
bool has_bus_rst;
|
|
bool has_mod_clk;
|
|
int sensor_count;
|
|
+ bool supports_nvmem;
|
|
};
|
|
|
|
static const struct gpadc_data sun4i_gpadc_data = {
|
|
@@ -91,6 +93,7 @@ static const struct gpadc_data sun4i_gpadc_data = {
|
|
.sample_start = sun4i_gpadc_sample_start,
|
|
.sample_end = sun4i_gpadc_sample_end,
|
|
.sensor_count = 1,
|
|
+ .supports_nvmem = false,
|
|
};
|
|
|
|
static const struct gpadc_data sun5i_gpadc_data = {
|
|
@@ -104,6 +107,7 @@ static const struct gpadc_data sun5i_gpadc_data = {
|
|
.sample_start = sun4i_gpadc_sample_start,
|
|
.sample_end = sun4i_gpadc_sample_end,
|
|
.sensor_count = 1,
|
|
+ .supports_nvmem = false,
|
|
};
|
|
|
|
static const struct gpadc_data sun6i_gpadc_data = {
|
|
@@ -117,6 +121,7 @@ static const struct gpadc_data sun6i_gpadc_data = {
|
|
.sample_start = sun4i_gpadc_sample_start,
|
|
.sample_end = sun4i_gpadc_sample_end,
|
|
.sensor_count = 1,
|
|
+ .supports_nvmem = false,
|
|
};
|
|
|
|
static const struct gpadc_data sun8i_a33_gpadc_data = {
|
|
@@ -127,6 +132,7 @@ static const struct gpadc_data sun8i_a33_gpadc_data = {
|
|
.sample_start = sun4i_gpadc_sample_start,
|
|
.sample_end = sun4i_gpadc_sample_end,
|
|
.sensor_count = 1,
|
|
+ .supports_nvmem = false,
|
|
};
|
|
|
|
struct sun4i_gpadc_iio {
|
|
@@ -145,6 +151,8 @@ struct sun4i_gpadc_iio {
|
|
struct clk *mod_clk;
|
|
struct reset_control *reset;
|
|
int sensor_id;
|
|
+ u32 calibration_data[2];
|
|
+ bool has_calibration_data[2];
|
|
/* prevents concurrent reads of temperature and ADC */
|
|
struct mutex mutex;
|
|
struct thermal_zone_device *tzd;
|
|
@@ -456,6 +464,17 @@ static int sun4i_gpadc_runtime_suspend(struct device *dev)
|
|
return info->data->sample_end(info);
|
|
}
|
|
|
|
+static void sunxi_calibrate(struct sun4i_gpadc_iio *info)
|
|
+{
|
|
+ if (info->has_calibration_data[0])
|
|
+ regmap_write(info->regmap, SUNXI_THS_CDATA_0_1,
|
|
+ info->calibration_data[0]);
|
|
+
|
|
+ if (info->has_calibration_data[1])
|
|
+ regmap_write(info->regmap, SUNXI_THS_CDATA_2_3,
|
|
+ info->calibration_data[1]);
|
|
+}
|
|
+
|
|
static int sun4i_gpadc_sample_start(struct sun4i_gpadc_iio *info)
|
|
{
|
|
/* clkin = 6MHz */
|
|
@@ -478,6 +497,7 @@ static int sun4i_gpadc_sample_start(struct sun4i_gpadc_iio *info)
|
|
static int sunxi_ths_sample_start(struct sun4i_gpadc_iio *info)
|
|
{
|
|
u32 value;
|
|
+ sunxi_calibrate(info);
|
|
|
|
if (info->data->ctrl0_map)
|
|
regmap_write(info->regmap, SUNXI_THS_CTRL0,
|
|
@@ -596,6 +616,9 @@ static int sun4i_gpadc_probe_dt(struct platform_device *pdev,
|
|
struct sun4i_gpadc_iio *info = iio_priv(indio_dev);
|
|
void __iomem *base;
|
|
int ret;
|
|
+ struct nvmem_cell *cell;
|
|
+ ssize_t cell_size;
|
|
+ u64 *cell_data;
|
|
|
|
info->data = of_device_get_match_data(&pdev->dev);
|
|
if (!info->data)
|
|
@@ -609,6 +632,35 @@ static int sun4i_gpadc_probe_dt(struct platform_device *pdev,
|
|
if (IS_ERR(base))
|
|
return PTR_ERR(base);
|
|
|
|
+ info->has_calibration_data[0] = false;
|
|
+ info->has_calibration_data[1] = false;
|
|
+
|
|
+ if (!info->data->supports_nvmem)
|
|
+ goto no_nvmem;
|
|
+
|
|
+ cell = devm_nvmem_cell_get(&pdev->dev, "calibration");
|
|
+ if (IS_ERR(cell)) {
|
|
+ if (PTR_ERR(cell) == -EPROBE_DEFER)
|
|
+ return PTR_ERR(cell);
|
|
+ } else {
|
|
+ cell_data = (u64 *)nvmem_cell_read(cell, &cell_size);
|
|
+ devm_nvmem_cell_put(&pdev->dev, cell);
|
|
+ if (cell_size <= 4) {
|
|
+ info->has_calibration_data[0] = true;
|
|
+ info->calibration_data[0] = be32_to_cpu(cell_data[0] &
|
|
+ GENMASK(31, 0));
|
|
+ } else if (cell_size <= 8) {
|
|
+ info->has_calibration_data[0] = true;
|
|
+ info->calibration_data[0] = be32_to_cpu(cell_data[0] &
|
|
+ GENMASK(31, 0));
|
|
+ info->has_calibration_data[1] = true;
|
|
+ info->calibration_data[1] = be32_to_cpu(
|
|
+ (cell_data[0] >> 32) & GENMASK(31, 0));
|
|
+ }
|
|
+ }
|
|
+
|
|
+no_nvmem:
|
|
+
|
|
info->regmap = devm_regmap_init_mmio(&pdev->dev, base,
|
|
&sun4i_gpadc_regmap_config);
|
|
if (IS_ERR(info->regmap)) {
|
|
diff --git a/include/linux/mfd/sun4i-gpadc.h b/include/linux/mfd/sun4i-gpadc.h
|
|
index 4b4415bf4..1439422b0 100644
|
|
--- a/include/linux/mfd/sun4i-gpadc.h
|
|
+++ b/include/linux/mfd/sun4i-gpadc.h
|
|
@@ -87,6 +87,8 @@
|
|
#define SUNXI_THS_CTRL0 0x00
|
|
#define SUNXI_THS_CTRL2 0x40
|
|
#define SUNXI_THS_FILTER 0x70
|
|
+#define SUNXI_THS_CDATA_0_1 0x74
|
|
+#define SUNXI_THS_CDATA_2_3 0x78
|
|
#define SUNXI_THS_TDATA0 0x80
|
|
#define SUNXI_THS_TDATA1 0x84
|
|
#define SUNXI_THS_TDATA2 0x88
|
|
--
|
|
2.31.1
|
|
|