ipq806x: 5:15: drop upstream patch

[openwrt/staging/chunkeey.git] / target / linux / ipq806x / patches-5.15 / 104-3-drivers-thermal-tsens-Convert-msm8960-to-reg_field.patch

diff --git a/target/linux/ipq806x/patches-5.15/104-3-drivers-thermal-tsens-Convert-msm8960-to-reg_field.patch b/target/linux/ipq806x/patches-5.15/104-3-drivers-thermal-tsens-Convert-msm8960-to-reg_field.patch
deleted file mode 100644 (file)
index bf37810..0000000
--- a/target/linux/ipq806x/patches-5.15/104-3-drivers-thermal-tsens-Convert-msm8960-to-reg_field.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 6bac2e2fa36c2d7c304768a689d8b73155b90aa2 Mon Sep 17 00:00:00 2001
-From: Ansuel Smith <ansuelsmth@gmail.com>
-Date: Wed, 25 Nov 2020 17:15:51 +0100
-Subject: [PATCH 03/10] drivers: thermal: tsens: Convert msm8960 to reg_field
-
-Convert msm9860 driver to reg_field to use the init_common
-function.
-
-Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
-Acked-by: Thara Gopinath <thara.gopinath@linaro.org>
----
- drivers/thermal/qcom/tsens-8960.c | 80 ++++++++++++++++++++++++++++++-
- 1 file changed, 79 insertions(+), 1 deletion(-)
-
---- a/drivers/thermal/qcom/tsens-8960.c
-+++ b/drivers/thermal/qcom/tsens-8960.c
-@@ -51,11 +51,22 @@
- #define MIN_LIMIT_TH          0x0
- #define MAX_LIMIT_TH          0xff
- 
--#define S0_STATUS_ADDR                0x3628
- #define INT_STATUS_ADDR               0x363c
- #define TRDY_MASK             BIT(7)
- #define TIMEOUT_US            100
- 
-+#define S0_STATUS_OFF         0x3628
-+#define S1_STATUS_OFF         0x362c
-+#define S2_STATUS_OFF         0x3630
-+#define S3_STATUS_OFF         0x3634
-+#define S4_STATUS_OFF         0x3638
-+#define S5_STATUS_OFF         0x3664  /* Sensors 5-10 found on apq8064/msm8960 */
-+#define S6_STATUS_OFF         0x3668
-+#define S7_STATUS_OFF         0x366c
-+#define S8_STATUS_OFF         0x3670
-+#define S9_STATUS_OFF         0x3674
-+#define S10_STATUS_OFF                0x3678
-+
- static int suspend_8960(struct tsens_priv *priv)
- {
-       int ret;
-@@ -269,6 +280,71 @@ static int get_temp_8960(const struct ts
-       return -ETIMEDOUT;
- }
- 
-+static struct tsens_features tsens_8960_feat = {
-+      .ver_major      = VER_0,
-+      .crit_int       = 0,
-+      .adc            = 1,
-+      .srot_split     = 0,
-+      .max_sensors    = 11,
-+};
-+
-+static const struct reg_field tsens_8960_regfields[MAX_REGFIELDS] = {
-+      /* ----- SROT ------ */
-+      /* No VERSION information */
-+
-+      /* CNTL */
-+      [TSENS_EN]     = REG_FIELD(CNTL_ADDR,  0, 0),
-+      [TSENS_SW_RST] = REG_FIELD(CNTL_ADDR,  1, 1),
-+      /* 8960 has 5 sensors, 8660 has 11, we only handle 5 */
-+      [SENSOR_EN]    = REG_FIELD(CNTL_ADDR,  3, 7),
-+
-+      /* ----- TM ------ */
-+      /* INTERRUPT ENABLE */
-+      /* NO INTERRUPT ENABLE */
-+
-+      /* Single UPPER/LOWER TEMPERATURE THRESHOLD for all sensors */
-+      [LOW_THRESH_0]   = REG_FIELD(THRESHOLD_ADDR,  0,  7),
-+      [UP_THRESH_0]    = REG_FIELD(THRESHOLD_ADDR,  8, 15),
-+      /* MIN_THRESH_0 and MAX_THRESH_0 are not present in the regfield
-+       * Recycle CRIT_THRESH_0 and 1 to set the required regs to hardcoded temp
-+       * MIN_THRESH_0 -> CRIT_THRESH_1
-+       * MAX_THRESH_0 -> CRIT_THRESH_0
-+       */
-+      [CRIT_THRESH_1]   = REG_FIELD(THRESHOLD_ADDR, 16, 23),
-+      [CRIT_THRESH_0]   = REG_FIELD(THRESHOLD_ADDR, 24, 31),
-+
-+      /* UPPER/LOWER INTERRUPT [CLEAR/STATUS] */
-+      /* 1 == clear, 0 == normal operation */
-+      [LOW_INT_CLEAR_0]   = REG_FIELD(CNTL_ADDR,  9,  9),
-+      [UP_INT_CLEAR_0]    = REG_FIELD(CNTL_ADDR, 10, 10),
-+
-+      /* NO CRITICAL INTERRUPT SUPPORT on 8960 */
-+
-+      /* Sn_STATUS */
-+      [LAST_TEMP_0]  = REG_FIELD(S0_STATUS_OFF,  0,  7),
-+      [LAST_TEMP_1]  = REG_FIELD(S1_STATUS_OFF,  0,  7),
-+      [LAST_TEMP_2]  = REG_FIELD(S2_STATUS_OFF,  0,  7),
-+      [LAST_TEMP_3]  = REG_FIELD(S3_STATUS_OFF,  0,  7),
-+      [LAST_TEMP_4]  = REG_FIELD(S4_STATUS_OFF,  0,  7),
-+      [LAST_TEMP_5]  = REG_FIELD(S5_STATUS_OFF,  0,  7),
-+      [LAST_TEMP_6]  = REG_FIELD(S6_STATUS_OFF,  0,  7),
-+      [LAST_TEMP_7]  = REG_FIELD(S7_STATUS_OFF,  0,  7),
-+      [LAST_TEMP_8]  = REG_FIELD(S8_STATUS_OFF,  0,  7),
-+      [LAST_TEMP_9]  = REG_FIELD(S9_STATUS_OFF,  0,  7),
-+      [LAST_TEMP_10] = REG_FIELD(S10_STATUS_OFF, 0,  7),
-+
-+      /* No VALID field on 8960 */
-+      /* TSENS_INT_STATUS bits: 1 == threshold violated */
-+      [MIN_STATUS_0] = REG_FIELD(INT_STATUS_ADDR, 0, 0),
-+      [LOWER_STATUS_0] = REG_FIELD(INT_STATUS_ADDR, 1, 1),
-+      [UPPER_STATUS_0] = REG_FIELD(INT_STATUS_ADDR, 2, 2),
-+      /* No CRITICAL field on 8960 */
-+      [MAX_STATUS_0] = REG_FIELD(INT_STATUS_ADDR, 3, 3),
-+
-+      /* TRDY: 1=ready, 0=in progress */
-+      [TRDY] = REG_FIELD(INT_STATUS_ADDR, 7, 7),
-+};
-+
- static const struct tsens_ops ops_8960 = {
-       .init           = init_8960,
-       .calibrate      = calibrate_8960,
-@@ -282,4 +358,6 @@ static const struct tsens_ops ops_8960 =
- struct tsens_plat_data data_8960 = {
-       .num_sensors    = 11,
-       .ops            = &ops_8960,
-+      .feat           = &tsens_8960_feat,
-+      .fields         = tsens_8960_regfields,
- };