Merge tag 'iio-for-4.12d' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[karo-tx-linux.git] / include / linux / mfd / sun4i-gpadc.h

diff --git a/include/linux/mfd/sun4i-gpadc.h b/include/linux/mfd/sun4i-gpadc.h
index d7a29f246d647fb6c7be225bc47fb42f2e295c8d..139872c2e0fe0ffe9517d8f13db65efcd5bc42ff 100644 (file)
--- a/include/linux/mfd/sun4i-gpadc.h
+++ b/include/linux/mfd/sun4i-gpadc.h
@@ -28,6 +28,7 @@
 #define SUN4I_GPADC_CTRL1_TP_MODE_EN                   BIT(4)
 #define SUN4I_GPADC_CTRL1_TP_ADC_SELECT                        BIT(3)
 #define SUN4I_GPADC_CTRL1_ADC_CHAN_SELECT(x)           (GENMASK(2, 0) & (x))
+#define SUN4I_GPADC_CTRL1_ADC_CHAN_MASK                        GENMASK(2, 0)
 
 /* TP_CTRL1 bits for sun6i SOCs */
 #define SUN6I_GPADC_CTRL1_TOUCH_PAN_CALI_EN            BIT(7)
@@ -35,6 +36,11 @@
 #define SUN6I_GPADC_CTRL1_TP_MODE_EN                   BIT(5)
 #define SUN6I_GPADC_CTRL1_TP_ADC_SELECT                        BIT(4)
 #define SUN6I_GPADC_CTRL1_ADC_CHAN_SELECT(x)           (GENMASK(3, 0) & BIT(x))
+#define SUN6I_GPADC_CTRL1_ADC_CHAN_MASK                        GENMASK(3, 0)
+
+/* TP_CTRL1 bits for sun8i SoCs */
+#define SUN8I_GPADC_CTRL1_CHOP_TEMP_EN                 BIT(8)
+#define SUN8I_GPADC_CTRL1_GPADC_CALI_EN                        BIT(7)
 
 #define SUN4I_GPADC_CTRL2                              0x08