diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2017-06-27 10:05:04 +0200 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2017-06-27 10:05:04 +0200 |
| commit | 53eba6f58f791f5b585da6d2fe9316e579db915c (patch) | |
| tree | 817cd158dacc8c1280c83ea19edd44989e2a67bd /target/linux/ipq806x/patches-4.4/015-1-thermal-qcom-tsens-Add-a-skeletal-TSENS-drivers.patch | |
| parent | 761e6087ed6d2c41a51f4bc5b91539857e324ac7 (diff) | |
| download | upstream-53eba6f58f791f5b585da6d2fe9316e579db915c.tar.gz upstream-53eba6f58f791f5b585da6d2fe9316e579db915c.tar.bz2 upstream-53eba6f58f791f5b585da6d2fe9316e579db915c.zip | |
ipq806x: fixup thermal patches
Fix conflict with thermal patches added in
c03d4317a6bc891cb4a5e89cbdd77f37c23aff86.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/ipq806x/patches-4.4/015-1-thermal-qcom-tsens-Add-a-skeletal-TSENS-drivers.patch')
| -rw-r--r-- | target/linux/ipq806x/patches-4.4/015-1-thermal-qcom-tsens-Add-a-skeletal-TSENS-drivers.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/ipq806x/patches-4.4/015-1-thermal-qcom-tsens-Add-a-skeletal-TSENS-drivers.patch b/target/linux/ipq806x/patches-4.4/015-1-thermal-qcom-tsens-Add-a-skeletal-TSENS-drivers.patch index ef7e2f4152..dd941cad70 100644 --- a/target/linux/ipq806x/patches-4.4/015-1-thermal-qcom-tsens-Add-a-skeletal-TSENS-drivers.patch +++ b/target/linux/ipq806x/patches-4.4/015-1-thermal-qcom-tsens-Add-a-skeletal-TSENS-drivers.patch @@ -63,9 +63,9 @@ Signed-off-by: Zhang Rui <rui.zhang@intel.com> + }; --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig -@@ -391,4 +391,9 @@ config QCOM_SPMI_TEMP_ALARM - real time die temperature if an ADC is present or an estimate of the - temperature based upon the over temperature stage value. +@@ -404,4 +404,9 @@ config BCM2835_THERMAL + help + Support for thermal sensors on Broadcom bcm2835 SoCs. +menu "Qualcomm thermal drivers" +depends on (ARCH_QCOM && OF) || COMPILE_TEST @@ -75,10 +75,10 @@ Signed-off-by: Zhang Rui <rui.zhang@intel.com> endif --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile -@@ -48,3 +48,4 @@ obj-$(CONFIG_INTEL_PCH_THERMAL) += intel - obj-$(CONFIG_ST_THERMAL) += st/ +@@ -50,3 +50,4 @@ obj-$(CONFIG_ST_THERMAL) += st/ obj-$(CONFIG_TEGRA_SOCTHERM) += tegra_soctherm.o obj-$(CONFIG_HISI_THERMAL) += hisi_thermal.o + obj-$(CONFIG_BCM2835_THERMAL) += bcm2835_thermal.o +obj-$(CONFIG_QCOM_TSENS) += qcom/ --- /dev/null +++ b/drivers/thermal/qcom/Kconfig |