diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2025-01-15 17:01:24 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2025-01-15 17:01:25 +0300 |
| commit | 029625d16a44e638ea307fe09f4206c94615c2b0 (patch) | |
| tree | 1a18db4da44dbda5c7d3169c620e7d4ba0900bee | |
| parent | 90d96a1227488766332ba23f55e3aa755d13b242 (diff) | |
| parent | 2b21c2306a9006e401c1ee3c694ecd327de4dc16 (diff) | |
| download | linux-029625d16a44e638ea307fe09f4206c94615c2b0.tar.xz | |
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/20250105095139.714590-5-shawnguo2@yeah.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 0beecdde55f5..5bd07f8dc031 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -230,6 +230,7 @@ CONFIG_RN5T618_POWER=m CONFIG_SENSORS_MC13783_ADC=y CONFIG_SENSORS_GPIO_FAN=y CONFIG_SENSORS_IIO_HWMON=y +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LM75=m CONFIG_SENSORS_PWM_FAN=y CONFIG_SENSORS_SY7636A=y diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 5ee6cb7408bd..d2fdef159210 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -902,6 +902,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7703=m CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m CONFIG_DRM_FSL_LDB=m +CONFIG_DRM_ITE_IT6263=m CONFIG_DRM_LONTIUM_LT8912B=m CONFIG_DRM_LONTIUM_LT9611=m CONFIG_DRM_LONTIUM_LT9611UXC=m |