Unverified Commit 9f26bc71 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mtk-soc-fixes-for-v6.9' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 14672a9b ab6cd6bb

drivers/soc/mediatek/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/soc/mediatek/mtk-svs.c

+5 −2
Original line number Diff line number Diff line
@@ -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);

			}

		}