Skip to content

Commit c6abaad

Browse files
committed
Merge tag 'imx-defconfig-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig
i.MX defconfig update for 5.17: - Enable pinctrl and clock drivers for i.MX8 ULP SoC. - A couple of patches from Adam Ford to enable Camera driver support for Beacon EmbeddedWorks i.MX8MM development kit. - Enable drivers for devices found on TQMa8MxML-MBa8Mx board. - Enable RTC_DRV_RV3029C2 driver support for DHCOM devices. * tag 'imx-defconfig-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v6_v7_defconfig: Enable for DHCOM devices required RTC_DRV_RV3029C2 arm64: defconfig: enable drivers for booting i.MX8ULP arm64: defconfig: enable drivers for TQ TQMa8MxML-MBa8Mx arm64: defconfig: Enable OV5640 arm64: defconfig: Enable VIDEO_IMX_MEDIA Link: https://lore.kernel.org/r/20211218071427.26745-6-shawnguo@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 6f6287b + c720e38 commit c6abaad

2 files changed

Lines changed: 12 additions & 0 deletions

File tree

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ CONFIG_RTC_DRV_PCF8523=y
378378
CONFIG_RTC_DRV_PCF8563=y
379379
CONFIG_RTC_DRV_M41T80=y
380380
CONFIG_RTC_DRV_RC5T619=y
381+
CONFIG_RTC_DRV_RV3029C2=y
381382
CONFIG_RTC_DRV_DA9063=y
382383
CONFIG_RTC_DRV_MC13XXX=y
383384
CONFIG_RTC_DRV_MXC=y

arch/arm64/configs/defconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ CONFIG_MICROSEMI_PHY=y
363363
CONFIG_AT803X_PHY=y
364364
CONFIG_REALTEK_PHY=y
365365
CONFIG_ROCKCHIP_PHY=y
366+
CONFIG_DP83867_PHY=y
366367
CONFIG_VITESSE_PHY=y
367368
CONFIG_USB_PEGASUS=m
368369
CONFIG_USB_RTL8150=m
@@ -397,6 +398,7 @@ CONFIG_TOUCHSCREEN_EDT_FT5X06=m
397398
CONFIG_INPUT_MISC=y
398399
CONFIG_INPUT_PM8941_PWRKEY=y
399400
CONFIG_INPUT_PM8XXX_VIBRATOR=m
401+
CONFIG_INPUT_PWM_BEEPER=m
400402
CONFIG_INPUT_PWM_VIBRA=m
401403
CONFIG_INPUT_HISI_POWERKEY=y
402404
# CONFIG_SERIO_SERPORT is not set
@@ -504,6 +506,7 @@ CONFIG_PINCTRL_IMX8MQ=y
504506
CONFIG_PINCTRL_IMX8QM=y
505507
CONFIG_PINCTRL_IMX8QXP=y
506508
CONFIG_PINCTRL_IMX8DXL=y
509+
CONFIG_PINCTRL_IMX8ULP=y
507510
CONFIG_PINCTRL_MSM=y
508511
CONFIG_PINCTRL_IPQ8074=y
509512
CONFIG_PINCTRL_IPQ6018=y
@@ -555,6 +558,7 @@ CONFIG_BATTERY_MAX17042=m
555558
CONFIG_CHARGER_BQ25890=m
556559
CONFIG_CHARGER_BQ25980=m
557560
CONFIG_SENSORS_ARM_SCPI=y
561+
CONFIG_SENSORS_JC42=m
558562
CONFIG_SENSORS_LM90=m
559563
CONFIG_SENSORS_PWM_FAN=m
560564
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
@@ -668,6 +672,7 @@ CONFIG_VIDEO_QCOM_VENUS=m
668672
CONFIG_SDR_PLATFORM_DRIVERS=y
669673
CONFIG_VIDEO_RCAR_DRIF=m
670674
CONFIG_VIDEO_IMX219=m
675+
CONFIG_VIDEO_OV5640=m
671676
CONFIG_VIDEO_OV5645=m
672677
CONFIG_VIDEO_QCOM_CAMSS=m
673678
CONFIG_DRM=m
@@ -792,6 +797,7 @@ CONFIG_SND_SOC_RT5659=m
792797
CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
793798
CONFIG_SND_SOC_SIMPLE_MUX=m
794799
CONFIG_SND_SOC_TAS571X=m
800+
CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
795801
CONFIG_SND_SOC_WCD934X=m
796802
CONFIG_SND_SOC_WM8904=m
797803
CONFIG_SND_SOC_WM8960=m
@@ -907,6 +913,7 @@ CONFIG_RTC_DRV_DS1307=m
907913
CONFIG_RTC_DRV_HYM8563=m
908914
CONFIG_RTC_DRV_MAX77686=y
909915
CONFIG_RTC_DRV_RK808=m
916+
CONFIG_RTC_DRV_PCF85063=m
910917
CONFIG_RTC_DRV_PCF85363=m
911918
CONFIG_RTC_DRV_M41T80=m
912919
CONFIG_RTC_DRV_RX8581=m
@@ -958,6 +965,7 @@ CONFIG_MFD_CROS_EC_DEV=y
958965
CONFIG_STAGING=y
959966
CONFIG_STAGING_MEDIA=y
960967
CONFIG_VIDEO_HANTRO=m
968+
CONFIG_VIDEO_IMX_MEDIA=m
961969
CONFIG_CHROME_PLATFORMS=y
962970
CONFIG_CROS_EC=y
963971
CONFIG_CROS_EC_I2C=y
@@ -979,6 +987,7 @@ CONFIG_CLK_IMX8MN=y
979987
CONFIG_CLK_IMX8MP=y
980988
CONFIG_CLK_IMX8MQ=y
981989
CONFIG_CLK_IMX8QXP=y
990+
CONFIG_CLK_IMX8ULP=y
982991
CONFIG_TI_SCI_CLK=y
983992
CONFIG_COMMON_CLK_QCOM=y
984993
CONFIG_QCOM_A53PLL=y
@@ -1175,6 +1184,8 @@ CONFIG_SLIM_QCOM_NGD_CTRL=m
11751184
CONFIG_MUX_MMIO=y
11761185
CONFIG_INTERCONNECT=y
11771186
CONFIG_INTERCONNECT_IMX=m
1187+
CONFIG_INTERCONNECT_IMX8MM=m
1188+
CONFIG_INTERCONNECT_IMX8MN=m
11781189
CONFIG_INTERCONNECT_IMX8MQ=m
11791190
CONFIG_INTERCONNECT_QCOM=y
11801191
CONFIG_INTERCONNECT_QCOM_MSM8916=m

0 commit comments

Comments
 (0)