64b53247c4
Refresh patches. Remove upstreamed patch: generic/pending/181-net-usb-add-lte-modem-wistron-neweb-d18q1.patch Update patches that no longer applies: generic/hack/901-debloat_sock_diag.patch Compile-tested on: x86/64. Runtime-tested on: x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
81 lines
2.5 KiB
Diff
81 lines
2.5 KiB
Diff
From b93889b200a963acde20e559dbf51886ad6b6229 Mon Sep 17 00:00:00 2001
|
|
From: Sean Wang <sean.wang@mediatek.com>
|
|
Date: Tue, 16 Jan 2018 23:50:48 +0800
|
|
Subject: [PATCH 200/224] thermal: mediatek: add support for MT7622 SoC
|
|
|
|
MT7622 SoC has built-in thermal controller with one sensing point, the
|
|
patch just is to extend the functionality of the existing logic.
|
|
|
|
Changes v1 -> v2: rebase to 4.16-rc1
|
|
|
|
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
|
|
Signed-off-by: Shunli Wang <shunli.wang@mediatek.com>
|
|
---
|
|
drivers/thermal/mtk_thermal.c | 35 +++++++++++++++++++++++++++++++++++
|
|
1 file changed, 35 insertions(+)
|
|
|
|
--- a/drivers/thermal/mtk_thermal.c
|
|
+++ b/drivers/thermal/mtk_thermal.c
|
|
@@ -153,6 +153,12 @@
|
|
/* The number of sensing points per bank */
|
|
#define MT2712_NUM_SENSORS_PER_ZONE 4
|
|
|
|
+#define MT7622_TEMP_AUXADC_CHANNEL 11
|
|
+#define MT7622_NUM_SENSORS 1
|
|
+#define MT7622_NUM_ZONES 1
|
|
+#define MT7622_NUM_SENSORS_PER_ZONE 1
|
|
+#define MT7622_TS1 0
|
|
+
|
|
struct mtk_thermal;
|
|
|
|
struct thermal_bank_cfg {
|
|
@@ -242,6 +248,12 @@ static const int mt2712_adcpnp[MT2712_NU
|
|
|
|
static const int mt2712_mux_values[MT2712_NUM_SENSORS] = { 0, 1, 2, 3 };
|
|
|
|
+/* MT7622 thermal sensor data */
|
|
+static const int mt7622_bank_data[MT7622_NUM_SENSORS] = { MT7622_TS1, };
|
|
+static const int mt7622_msr[MT7622_NUM_SENSORS_PER_ZONE] = { TEMP_MSR0, };
|
|
+static const int mt7622_adcpnp[MT7622_NUM_SENSORS_PER_ZONE] = { TEMP_ADCPNP0, };
|
|
+static const int mt7622_mux_values[MT7622_NUM_SENSORS] = { 0, };
|
|
+
|
|
/**
|
|
* The MT8173 thermal controller has four banks. Each bank can read up to
|
|
* four temperature sensors simultaneously. The MT8173 has a total of 5
|
|
@@ -329,6 +341,25 @@ static const struct mtk_thermal_data mt2
|
|
.sensor_mux_values = mt2712_mux_values,
|
|
};
|
|
|
|
+/*
|
|
+ * MT7622 have only one sensing point which uses AUXADC Channel 11 for raw data
|
|
+ * access.
|
|
+ */
|
|
+static const struct mtk_thermal_data mt7622_thermal_data = {
|
|
+ .auxadc_channel = MT7622_TEMP_AUXADC_CHANNEL,
|
|
+ .num_banks = MT7622_NUM_ZONES,
|
|
+ .num_sensors = MT7622_NUM_SENSORS,
|
|
+ .bank_data = {
|
|
+ {
|
|
+ .num_sensors = 1,
|
|
+ .sensors = mt7622_bank_data,
|
|
+ },
|
|
+ },
|
|
+ .msr = mt7622_msr,
|
|
+ .adcpnp = mt7622_adcpnp,
|
|
+ .sensor_mux_values = mt7622_mux_values,
|
|
+};
|
|
+
|
|
/**
|
|
* raw_to_mcelsius - convert a raw ADC value to mcelsius
|
|
* @mt: The thermal controller
|
|
@@ -631,6 +662,10 @@ static const struct of_device_id mtk_the
|
|
{
|
|
.compatible = "mediatek,mt2712-thermal",
|
|
.data = (void *)&mt2712_thermal_data,
|
|
+ },
|
|
+ {
|
|
+ .compatible = "mediatek,mt7622-thermal",
|
|
+ .data = (void *)&mt7622_thermal_data,
|
|
}, {
|
|
},
|
|
};
|