Skip to content

Commit fe46e55

Browse files
committed
Merge tag 'imx-defconfig-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/defconfig
i.MX defconfig updates for 6.4: - Enable i.MX93 ADC driver in arm64 defconfig. - Enable BD71815 PMIC and TDA998X HDMI bridge driver in imx_v6_v7_defconfig. - Enable a few drivers support needed by Tarragon boards in imx_v6_v7_defconfig. - Build IMX_SDMA driver as module in imx_v4_v5_defconfig. * tag 'imx-defconfig-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v4_v5_defconfig: Build CONFIG_IMX_SDMA as module ARM: imx_v6_v7_defconfig: Enable Tarragon peripheral drivers ARM: imx_v6_v7_defconfig: Select CONFIG_DRM_I2C_NXP_TDA998X arm64: defconfig: Enable i.MX93 ADC support ARM: imx_v6_v7_defconfig: Enable rohm,bd71815 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents d04a06e + b4b992e commit fe46e55

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

arch/arm/configs/imx_v4_v5_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ CONFIG_RTC_DRV_MC13XXX=y
160160
CONFIG_RTC_DRV_MXC=y
161161
CONFIG_DMADEVICES=y
162162
CONFIG_IMX_DMA=y
163-
CONFIG_IMX_SDMA=y
163+
CONFIG_IMX_SDMA=m
164164
# CONFIG_IOMMU_SUPPORT is not set
165165
CONFIG_IIO=y
166166
CONFIG_FSL_MX25_ADC=y

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ CONFIG_CS89x0_PLATFORM=y
128128
# CONFIG_NET_VENDOR_MICREL is not set
129129
# CONFIG_NET_VENDOR_MICROCHIP is not set
130130
# CONFIG_NET_VENDOR_NATSEMI is not set
131+
CONFIG_QCA7000_SPI=m
131132
# CONFIG_NET_VENDOR_SEEQ is not set
132133
CONFIG_SMC91X=y
133134
CONFIG_SMC911X=y
@@ -213,8 +214,12 @@ CONFIG_GPIO_SIOX=m
213214
CONFIG_GPIO_MAX732X=y
214215
CONFIG_GPIO_PCA953X=y
215216
CONFIG_GPIO_PCF857X=y
217+
CONFIG_GPIO_BD71815=y
216218
CONFIG_GPIO_STMPE=y
217219
CONFIG_GPIO_74X164=y
220+
CONFIG_W1=m
221+
CONFIG_W1_MASTER_DS2482=m
222+
CONFIG_W1_SLAVE_THERM=m
218223
CONFIG_POWER_RESET=y
219224
CONFIG_POWER_RESET_SYSCON=y
220225
CONFIG_POWER_RESET_SYSCON_POWEROFF=y
@@ -223,6 +228,7 @@ CONFIG_RN5T618_POWER=m
223228
CONFIG_SENSORS_MC13783_ADC=y
224229
CONFIG_SENSORS_GPIO_FAN=y
225230
CONFIG_SENSORS_IIO_HWMON=y
231+
CONFIG_SENSORS_PWM_FAN=y
226232
CONFIG_SENSORS_SY7636A=y
227233
CONFIG_THERMAL_STATISTICS=y
228234
CONFIG_THERMAL_WRITABLE_TRIPS=y
@@ -242,8 +248,10 @@ CONFIG_MFD_MC13XXX_I2C=y
242248
CONFIG_MFD_SY7636A=y
243249
CONFIG_MFD_RN5T618=y
244250
CONFIG_MFD_STMPE=y
251+
CONFIG_MFD_ROHM_BD71828=y
245252
CONFIG_REGULATOR_FIXED_VOLTAGE=y
246253
CONFIG_REGULATOR_ANATOP=y
254+
CONFIG_REGULATOR_BD71815=y
247255
CONFIG_REGULATOR_DA9052=y
248256
CONFIG_REGULATOR_DA9062=y
249257
CONFIG_REGULATOR_DA9063=y
@@ -271,6 +279,7 @@ CONFIG_VIDEO_OV5645=m
271279
CONFIG_VIDEO_ADV7180=m
272280
CONFIG_IMX_IPUV3_CORE=y
273281
CONFIG_DRM=y
282+
CONFIG_DRM_I2C_NXP_TDA998X=y
274283
CONFIG_DRM_MSM=y
275284
CONFIG_DRM_PANEL_LVDS=y
276285
CONFIG_DRM_PANEL_SIMPLE=y
@@ -380,6 +389,7 @@ CONFIG_RTC_DRV_ISL1208=y
380389
CONFIG_RTC_DRV_PCF8523=y
381390
CONFIG_RTC_DRV_PCF8563=y
382391
CONFIG_RTC_DRV_M41T80=y
392+
CONFIG_RTC_DRV_BD70528=y
383393
CONFIG_RTC_DRV_RC5T619=y
384394
CONFIG_RTC_DRV_RV3029C2=y
385395
CONFIG_RTC_DRV_DA9063=y
@@ -396,13 +406,15 @@ CONFIG_STAGING=y
396406
CONFIG_STAGING_MEDIA=y
397407
CONFIG_VIDEO_IMX_MEDIA=y
398408
CONFIG_COMMON_CLK_PWM=y
409+
CONFIG_COMMON_CLK_BD718XX=y
399410
CONFIG_CLK_IMX8MM=y
400411
CONFIG_CLK_IMX8MN=y
401412
CONFIG_CLK_IMX8MP=y
402413
CONFIG_CLK_IMX8MQ=y
403414
CONFIG_SOC_IMX8M=y
404415
CONFIG_EXTCON_USB_GPIO=y
405416
CONFIG_IIO=y
417+
CONFIG_IIO_ST_ACCEL_3AXIS=m
406418
CONFIG_MMA8452=y
407419
CONFIG_IMX7D_ADC=y
408420
CONFIG_RN5T618_ADC=y

arch/arm64/configs/defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,6 +1284,7 @@ CONFIG_EXTCON_USBC_CROS_EC=y
12841284
CONFIG_RENESAS_RPCIF=m
12851285
CONFIG_IIO=y
12861286
CONFIG_EXYNOS_ADC=y
1287+
CONFIG_IMX93_ADC=m
12871288
CONFIG_MAX9611=m
12881289
CONFIG_MEDIATEK_MT6577_AUXADC=m
12891290
CONFIG_QCOM_SPMI_VADC=m

0 commit comments

Comments
 (0)