mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
150ac0c2af
AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
167 lines
5.2 KiB
Diff
167 lines
5.2 KiB
Diff
From 9bb64076c49cf41aaa252ce7b5aa24b93c322bd5 Mon Sep 17 00:00:00 2001
|
|
From: Philipp Rossak <embed3d@gmail.com>
|
|
Date: Sun, 21 Jan 2018 22:29:55 +0100
|
|
Subject: [PATCH 015/146] iio: adc: sun4i-gpadc-iio: rework: 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 bff06f2798e8..7b12666cdd9e 100644
|
|
--- a/drivers/iio/adc/sun4i-gpadc-iio.c
|
|
+++ b/drivers/iio/adc/sun4i-gpadc-iio.c
|
|
@@ -27,6 +27,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>
|
|
@@ -81,6 +82,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 = {
|
|
@@ -94,6 +96,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 = {
|
|
@@ -107,6 +110,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 = {
|
|
@@ -120,6 +124,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 = {
|
|
@@ -130,6 +135,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 {
|
|
@@ -148,6 +154,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;
|
|
@@ -459,6 +467,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 */
|
|
@@ -481,6 +500,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,
|
|
@@ -602,6 +622,9 @@ static int sun4i_gpadc_probe_dt(struct platform_device *pdev,
|
|
struct resource *mem;
|
|
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)
|
|
@@ -616,6 +639,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 40b4dd9d2405..c251002431bd 100644
|
|
--- a/include/linux/mfd/sun4i-gpadc.h
|
|
+++ b/include/linux/mfd/sun4i-gpadc.h
|
|
@@ -90,6 +90,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.17.1
|
|
|