mirror of
https://github.com/armbian/build.git
synced 2025-09-12 09:11:30 +02:00
d1186b8a0e
I have changed the way the patches are generated a bit. Instead of using orange-pi branch from megous tree for 6.6 kernel, I have used the following kernel branches a83t-suspend, af8133j, anx, audio, axp, cam, drm, err, fixes, mbus, modem, opi3, pb, pinetab, pp, ppkb, samuel, speed, tbs-a711, ths These branches were carefully chosen to include only allwinner related patches and remove importing of the rockchip related patches into the allwinner kernel. Following patches are modified to fix patch application failure - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch - patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch - patches.armbian/arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch - patches.armbian/arm64-dts-allwinner-overlay-Add-Overlays-for-sunxi64.patch - patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch Following patches are modified because of kernel api change to fix compilation failure - patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch - patches.armbian/drv-of-Device-Tree-Overlay-ConfigFS-interface.patch
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Icenowy Zheng <icenowy@aosc.io>
|
|
Date: Tue, 10 Sep 2019 12:03:32 +0800
|
|
Subject: iio: adc: axp20x_adc: allow to set TS pin to GPADC mode
|
|
|
|
The TS pin of AXP PMICs can be set to GPADC mode. In this situation, it
|
|
doesn't affect battery charging.
|
|
|
|
Add the code to do the mode setting.
|
|
|
|
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
|
|
---
|
|
drivers/iio/adc/axp20x_adc.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/drivers/iio/adc/axp20x_adc.c b/drivers/iio/adc/axp20x_adc.c
|
|
index 75bda94dbce1..83e228980ad5 100644
|
|
--- a/drivers/iio/adc/axp20x_adc.c
|
|
+++ b/drivers/iio/adc/axp20x_adc.c
|
|
@@ -40,6 +40,7 @@
|
|
#define AXP813_TS_GPIO0_ADC_RATE_HZ(x) AXP20X_ADC_RATE_HZ(x)
|
|
#define AXP813_V_I_ADC_RATE_HZ(x) ((ilog2((x) / 100) << 4) & AXP813_V_I_ADC_RATE_MASK)
|
|
#define AXP813_ADC_RATE_HZ(x) (AXP20X_ADC_RATE_HZ(x) | AXP813_V_I_ADC_RATE_HZ(x))
|
|
+#define AXP20X_TS_FUNCTION_GPADC BIT(2)
|
|
|
|
#define AXP20X_ADC_CHANNEL(_channel, _name, _type, _reg) \
|
|
{ \
|
|
@@ -716,6 +717,11 @@ static int axp20x_probe(struct platform_device *pdev)
|
|
info->data->adc_en2_mask,
|
|
info->data->adc_en2_mask);
|
|
|
|
+ if (of_property_read_bool(pdev->dev.of_node, "x-powers,ts-as-gpadc"))
|
|
+ regmap_update_bits(info->regmap, AXP20X_ADC_RATE,
|
|
+ AXP20X_TS_FUNCTION_GPADC,
|
|
+ AXP20X_TS_FUNCTION_GPADC);
|
|
+
|
|
/* Configure ADCs rate */
|
|
info->data->adc_rate(info, 100);
|
|
|
|
--
|
|
Armbian
|
|
|