From 37f7d8a33541864e227af73e90db75a3ddb2c628 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 20 May 2019 08:47:57 +0100 Subject: Arm config updates for 5.2rc1 --- kernel-armv7hl-lpae.config | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'kernel-armv7hl-lpae.config') diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 416f9f6b8..43a4426fe 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -316,7 +316,7 @@ CONFIG_ARM_ERRATA_852421=y CONFIG_ARM_ERRATA_852423=y CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m CONFIG_ARM_EXYNOS_CPUIDLE=y -CONFIG_ARM_GIC_PM=m +CONFIG_ARM_GIC_PM=y CONFIG_ARM_GIC_V2M=y CONFIG_ARM_GIC_V3_ITS=y CONFIG_ARM_GIC_V3=y @@ -2387,6 +2387,7 @@ CONFIG_IMA=y CONFIG_IMX2_WDT=m CONFIG_IMX7D_ADC=m # CONFIG_IMX_DMA is not set +CONFIG_IMX_GPCV2_PM_DOMAINS=y CONFIG_IMX_GPCV2=y # CONFIG_IMX_IPUV3_CORE is not set # CONFIG_IMX_IRQSTEER is not set @@ -3314,7 +3315,7 @@ CONFIG_MFD_SM501=m # CONFIG_MFD_SMSC is not set CONFIG_MFD_STM32_LPTIMER=m CONFIG_MFD_STM32_TIMERS=m -CONFIG_MFD_STMFX=m +# CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set CONFIG_MFD_SUN4I_GPADC=m @@ -4406,7 +4407,7 @@ CONFIG_PHYLINK=m # CONFIG_PHY_MAPPHONE_MDM6600 is not set CONFIG_PHY_MESON8B_USB2=m CONFIG_PHY_MESON_G12A_USB2=y -CONFIG_PHY_MESON_G12A_USB3_PCIE=y +CONFIG_PHY_MESON_G12A_USB3_PCIE=m # CONFIG_PHY_MESON_GXL_USB2 is not set CONFIG_PHY_MESON_GXL_USB3=m # CONFIG_PHY_MVEBU_A3700_COMPHY is not set @@ -4488,9 +4489,8 @@ CONFIG_PINCTRL_SUN8I_A83T=y CONFIG_PINCTRL_SUN8I_H3_R=y CONFIG_PINCTRL_SUN8I_H3=y CONFIG_PINCTRL_SUN8I_V3S=y -# CONFIG_PINCTRL_SUN9I_A80 is not set CONFIG_PINCTRL_SUN9I_A80_R=y -# CONFIG_PINCTRL_SUNRISEPOINT is not set +CONFIG_PINCTRL_SUN9I_A80=y # CONFIG_PINCTRL_SX150X is not set CONFIG_PINCTRL=y CONFIG_PINMUX=y @@ -4830,6 +4830,7 @@ CONFIG_REMOTEPROC=m # CONFIG_RENESAS_PHY is not set # CONFIG_RESET_ATTACK_MITIGATION is not set CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_IMX7=y CONFIG_RESET_MESON_AUDIO_ARB=m # CONFIG_RESET_QCOM_AOSS is not set CONFIG_RESET_QCOM_PDC=m @@ -5354,6 +5355,7 @@ CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_NPCM7XX=m CONFIG_SENSORS_NTC_THERMISTOR=m # CONFIG_SENSORS_OCC_P8_I2C is not set +# CONFIG_SENSORS_OCC_P9_SBE is not set CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m @@ -5743,7 +5745,7 @@ CONFIG_SND_SOC_ES8328=m CONFIG_SND_SOC_ES8328_SPI=m CONFIG_SND_SOC_FSL_ASOC_CARD=m CONFIG_SND_SOC_FSL_ASRC=m -CONFIG_SND_SOC_FSL_AUDMIX=m +# CONFIG_SND_SOC_FSL_AUDMIX is not set CONFIG_SND_SOC_FSL_ESAI=m # CONFIG_SND_SOC_FSL_MICFIL is not set CONFIG_SND_SOC_FSL_SAI=m @@ -5756,7 +5758,7 @@ CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMG is not set -CONFIG_SND_SOC_IMX_AUDMIX=m +# CONFIG_SND_SOC_IMX_AUDMIX is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set @@ -6062,6 +6064,7 @@ CONFIG_STM32_EXTI=y CONFIG_STM32_LPTIMER_CNT=m CONFIG_STM32_MDMA=y CONFIG_STM32_THERMAL=m +CONFIG_STM32_TIMER_CNT=m CONFIG_STM32_WATCHDOG=m # CONFIG_STM is not set CONFIG_STMMAC_ETH=m -- cgit