mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
4eba86820f
Refreshed all patches. Fixes: - CVE-2019-14896 - CVE-2019-14897 Remove upstreamed: - 023-0007-crypto-crypto4xx-Fix-wrong-ppc4xx_trng_probe-ppc4xx_.patch Altered patches: - 102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch - 105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch - 106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch - 108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch - 207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch - 350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch - 356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch - 390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch - 391-MIPS-BCM63XX-do-not-register-uart.patch - 392-MIPS-BCM63XX-remove-leds-and-buttons.patch - 416-BCM63XX-add-a-fixup-for-ath9k-devices.patch - 422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch - Compile-tested on: brcm63xx, cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
82 lines
2.5 KiB
Diff
82 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
|
|
@@ -633,6 +664,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,
|
|
}, {
|
|
},
|
|
};
|