mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-13 14:24:11 +08:00
MediaTek driver fixes for v6.9
This fixes the MediaTek SVS driver to look for the right thermal zone names, and adds a missing Kconfig dependency for mtk-socinfo. -----BEGIN PGP SIGNATURE----- iJ4EABYKAEYWIQQn3Xxr56ypAcSHzXSaNgTPrZeEeAUCZieJWigcYW5nZWxvZ2lv YWNjaGluby5kZWxyZWdub0Bjb2xsYWJvcmEuY29tAAoJEJo2BM+tl4R43lIBANyL 3BRdXzIgPtg/EOU///UpTwR/5caUuPAKx4ZoumytAP0RGmRgKSV5BUmKDt3EGNNd YA0fCXS1cxCtx0fPXh70Dg== =PD2N -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmYr6CcACgkQYKtH/8kJ UifaSA/9E510l+7gVO547cNnd0fisJc6TEo9BvztsIgj4NDlnYAv/VP+93NSjAit NqNcWXQMWbbAvPkw9yquM3fPT+ssR5bWKds8ZBVv4FLcRMNOkPjM0P97tZPhIUp2 M5qH/nReWf8VZe24rmE2fjI4QVXu+t8AfqWL6ESk4VW+9QI+49nhLGuGYkbPqIca uEbxHRmDOfRHDnMyK0x6MNuOgaxOecwaodRopa1PETVL/Roaf+XWUXM8Bt/vu3nL nRt/EigH6fSQeA/94PgnaB+UQC3svb9+ss5VIgik3B3GzHe1dgzr4mKdi58LHDTA 7Lzf/MuqEClt9V45RdOsaa41PinDNiTnDk5YdP+Eu9X81FImeeGemg/5zwwm1pyr CFJ0GDhMWv3vWd7EbL8ImYzHbLUzAcLCophupjQhMY9pEbBKTiJyOuk11ZYKa47z u8srGrq/MeaIRIbKtTvPY1hozA85dV0BPTpiu3Qcexy8FvZYOMQCaXZDIthWbfyO FfwKdVZyyT/zA3urhl9jLEqfZP8kb0CwaCmRC/KRMLgxUGAWt1cIIdvSSQFfF2Mm MUkQk/W6rk95iKfSyigccqpIzVHTdpi+M7aMH1YNZPDiGPHxywBJwmoFVjzAUTp+ KcLFrfXjvibZdGjKMDgF/PXTkg9j0ugQbyIYlzKtIvr69Jqd1lo= =dBIl -----END PGP SIGNATURE----- Merge tag 'mtk-soc-fixes-for-v6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux into for-next MediaTek driver fixes for v6.9 This fixes the MediaTek SVS driver to look for the right thermal zone names, and adds a missing Kconfig dependency for mtk-socinfo. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
9f26bc71b1
@ -72,6 +72,7 @@ config MTK_SOCINFO
|
||||
tristate "MediaTek SoC Information"
|
||||
default y
|
||||
depends on NVMEM_MTK_EFUSE
|
||||
select SOC_BUS
|
||||
help
|
||||
The MediaTek SoC Information (mtk-socinfo) driver provides
|
||||
information about the SoC to the userspace including the
|
||||
|
@ -1768,6 +1768,7 @@ static int svs_bank_resource_setup(struct svs_platform *svsp)
|
||||
const struct svs_bank_pdata *bdata;
|
||||
struct svs_bank *svsb;
|
||||
struct dev_pm_opp *opp;
|
||||
char tz_name_buf[20];
|
||||
unsigned long freq;
|
||||
int count, ret;
|
||||
u32 idx, i;
|
||||
@ -1819,10 +1820,12 @@ static int svs_bank_resource_setup(struct svs_platform *svsp)
|
||||
}
|
||||
|
||||
if (!IS_ERR_OR_NULL(bdata->tzone_name)) {
|
||||
svsb->tzd = thermal_zone_get_zone_by_name(bdata->tzone_name);
|
||||
snprintf(tz_name_buf, ARRAY_SIZE(tz_name_buf),
|
||||
"%s-thermal", bdata->tzone_name);
|
||||
svsb->tzd = thermal_zone_get_zone_by_name(tz_name_buf);
|
||||
if (IS_ERR(svsb->tzd)) {
|
||||
dev_err(svsb->dev, "cannot get \"%s\" thermal zone\n",
|
||||
bdata->tzone_name);
|
||||
tz_name_buf);
|
||||
return PTR_ERR(svsb->tzd);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user