a57ce78b37
* Bump to 4.18, removing the obvious, fixing build problems, put some on waiting. * Pin 4.18 to DEV, rollback 4.14 to NEXT, adjust configs, remove one deprecated patch from NEXT and add board-h3-address-some-stability-issues.patch * Adjust few boards in development to new reality, removing it from NEXT for now * Adjust few board configs * Board config adjustement * Adjust few boards configs * Port NeoCore2 and Neo21.1 to 4.14.y * Adjust board config * Adjust board config
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c
|
|
index 81d4c39e414a..41769bc6a429 100644
|
|
--- a/drivers/iio/adc/sun4i-gpadc-iio.c
|
|
+++ b/drivers/iio/adc/sun4i-gpadc-iio.c
|
|
@@ -88,7 +88,7 @@ static const struct gpadc_data sun6i_gpadc_data = {
|
|
static const struct gpadc_data sun8i_a33_gpadc_data = {
|
|
.temp_offset = -1662,
|
|
.temp_scale = 162,
|
|
- .tp_mode_en = SUN8I_GPADC_CTRL1_CHOP_TEMP_EN,
|
|
+ .tp_mode_en = SUN8I_A23_GPADC_CTRL1_CHOP_TEMP_EN,
|
|
};
|
|
|
|
struct sun4i_gpadc_iio {
|
|
diff --git a/include/linux/mfd/sun4i-gpadc.h b/include/linux/mfd/sun4i-gpadc.h
|
|
index 139872c2e0fe..d31d962bb7d8 100644
|
|
--- a/include/linux/mfd/sun4i-gpadc.h
|
|
+++ b/include/linux/mfd/sun4i-gpadc.h
|
|
@@ -38,9 +38,9 @@
|
|
#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)
|
|
+/* TP_CTRL1 bits for sun8i A23/A33 SoCs */
|
|
+#define SUN8I_A23_GPADC_CTRL1_CHOP_TEMP_EN BIT(8)
|
|
+#define SUN8I_A23_GPADC_CTRL1_GPADC_CALI_EN BIT(7)
|
|
|
|
#define SUN4I_GPADC_CTRL2 0x08
|
|
|