Skip to content

Commit 029625d

Browse files
committed
Merge tag 'imx-defconfig-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/defconfig
i.MX defconfig change for 6.14: - Enable JC42 temperature sensor driver support in imx_v6_v7_defconfig (Alexander Stein) - Enable ITE IT6263 LVDS to HDMI converter driver support in arm64 defconfig (Liu Ying) * tag 'imx-defconfig-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: defconfig: Enable ITE IT6263 driver ARM: imx_v6_v7_defconfig: enable JC42 for TQMa7x Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 90d96a1 + 2b21c23 commit 029625d

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ CONFIG_RN5T618_POWER=m
230230
CONFIG_SENSORS_MC13783_ADC=y
231231
CONFIG_SENSORS_GPIO_FAN=y
232232
CONFIG_SENSORS_IIO_HWMON=y
233+
CONFIG_SENSORS_JC42=m
233234
CONFIG_SENSORS_LM75=m
234235
CONFIG_SENSORS_PWM_FAN=y
235236
CONFIG_SENSORS_SY7636A=y

arch/arm64/configs/defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -902,6 +902,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7703=m
902902
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
903903
CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
904904
CONFIG_DRM_FSL_LDB=m
905+
CONFIG_DRM_ITE_IT6263=m
905906
CONFIG_DRM_LONTIUM_LT8912B=m
906907
CONFIG_DRM_LONTIUM_LT9611=m
907908
CONFIG_DRM_LONTIUM_LT9611UXC=m

0 commit comments

Comments
 (0)