summaryrefslogtreecommitdiffstats
path: root/kernel-armv7hl.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-05-20 08:47:57 +0100
committerPeter Robinson <pbrobinson@gmail.com>2019-05-20 08:47:57 +0100
commit37f7d8a33541864e227af73e90db75a3ddb2c628 (patch)
tree960550ad0d80f5bedeb68155e9fab3ed7e8c0563 /kernel-armv7hl.config
parent58561782e9352f5d440e0f19744dc75a7a27af20 (diff)
downloadkernel-37f7d8a33541864e227af73e90db75a3ddb2c628.tar.gz
kernel-37f7d8a33541864e227af73e90db75a3ddb2c628.tar.xz
kernel-37f7d8a33541864e227af73e90db75a3ddb2c628.zip
Arm config updates for 5.2rc1
Diffstat (limited to 'kernel-armv7hl.config')
-rw-r--r--kernel-armv7hl.config16
1 files changed, 9 insertions, 7 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 5cc5b8dc2..581eee733 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -325,7 +325,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
@@ -3426,7 +3426,7 @@ CONFIG_MFD_SM501=m
CONFIG_MFD_SPMI_PMIC=m
CONFIG_MFD_STM32_LPTIMER=m
CONFIG_MFD_STM32_TIMERS=m
-CONFIG_MFD_STMFX=m
+# CONFIG_MFD_STMFX is not set
CONFIG_MFD_STMPE=y
# CONFIG_MFD_STPMIC1 is not set
CONFIG_MFD_SUN4I_GPADC=m
@@ -4571,7 +4571,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_MIPHY28LP=m
@@ -4670,9 +4670,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_PINCTRL_ZYNQ=y
@@ -5065,6 +5064,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
@@ -5604,6 +5604,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
@@ -6012,7 +6013,7 @@ CONFIG_SND_SOC_ES8328_SPI=m
CONFIG_SND_SOC_EUKREA_TLV320=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
@@ -6026,7 +6027,7 @@ CONFIG_SND_SOC_HDAC_HDMI=m
CONFIG_SND_SOC_HDMI_CODEC=m
CONFIG_SND_SOC_I2C_AND_SPI=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=m
CONFIG_SND_SOC_IMX_ES8328=m
CONFIG_SND_SOC_IMX_MC13783=m
@@ -6384,6 +6385,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