From 201fa82b3a8e07d617d5288537c16ca3590a841d Mon Sep 17 00:00:00 2001 From: Karabek Date: Sat, 2 Jun 2018 12:52:17 +0200 Subject: [PATCH] Delete 21-sun4i-gpadc-iio-add-split-sun8i.patch replaced with ths-21-sun4i-gpadc-iio-add-split-sun8i.patch --- .../21-sun4i-gpadc-iio-add-split-sun8i.patch | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 patch/kernel/sunxi-dev/safe-need-more-inspection/21-sun4i-gpadc-iio-add-split-sun8i.patch diff --git a/patch/kernel/sunxi-dev/safe-need-more-inspection/21-sun4i-gpadc-iio-add-split-sun8i.patch b/patch/kernel/sunxi-dev/safe-need-more-inspection/21-sun4i-gpadc-iio-add-split-sun8i.patch deleted file mode 100644 index 71192541c3..0000000000 --- a/patch/kernel/sunxi-dev/safe-need-more-inspection/21-sun4i-gpadc-iio-add-split-sun8i.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 -