summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-01-04 10:02:12 +0000
committerPeter Robinson <pbrobinson@gmail.com>2019-01-04 10:02:25 +0000
commitba9d1a17f242bf3cc89588eac4074949f2da4ae0 (patch)
tree465fdd74822077bf66394c707c38d09347cafb54 /kernel-s390x.config
parentf90c11ff1be432b7f60d8bd04511e3e0ee0274eb (diff)
downloadkernel-ba9d1a17f242bf3cc89588eac4074949f2da4ae0.tar.gz
kernel-ba9d1a17f242bf3cc89588eac4074949f2da4ae0.tar.xz
kernel-ba9d1a17f242bf3cc89588eac4074949f2da4ae0.zip
First pass at updates for Arm plaforms, also some IoT updates (mostly a few IIO drivers), a few cleanups of old/dupe config opts
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config32
1 files changed, 9 insertions, 23 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 971795aeb..218992e48 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -634,7 +634,6 @@ CONFIG_CAN_SOFTING=m
# CONFIG_CAN_UCAN is not set
CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
-# CONFIG_CAN_XILINXCAN is not set
CONFIG_CAPI_AVM=y
# CONFIG_CAPI_TRACE is not set
CONFIG_CARDBUS=y
@@ -1604,7 +1603,7 @@ CONFIG_GPIOLIB_FASTPATH_LIMIT=512
CONFIG_GPIO_PCI_IDIO_16=m
# CONFIG_GPIO_PISOSR is not set
# CONFIG_GPIO_RDC321X is not set
-CONFIG_GPIO_SAMA5D2_PIOBU=m
+# CONFIG_GPIO_SAMA5D2_PIOBU is not set
# CONFIG_GPIO_SCH311X is not set
# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_TPIC2810 is not set
@@ -1951,7 +1950,7 @@ CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
CONFIG_IIO_ST_GYRO_3AXIS=m
CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
-# CONFIG_IIO_ST_LSM6DSX is not set
+CONFIG_IIO_ST_LSM6DSX=m
CONFIG_IIO_ST_MAGN_3AXIS=m
# CONFIG_IIO_ST_PRESS is not set
CONFIG_IIO_SW_DEVICE=m
@@ -2949,7 +2948,7 @@ CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI_AM654=m
+# CONFIG_MMC_SDHCI_AM654 is not set
CONFIG_MMC_SDHCI_CADENCE=m
# CONFIG_MMC_SDHCI_F_SDH30 is not set
CONFIG_MMC_SDHCI=m
@@ -3815,7 +3814,7 @@ CONFIG_PFAULT=y
CONFIG_PHY_CADENCE_DP=m
CONFIG_PHY_CADENCE_SIERRA=m
# CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHY_FSL_IMX8MQ_USB=m
+# CONFIG_PHY_FSL_IMX8MQ_USB is not set
CONFIG_PHYLIB=y
CONFIG_PHYLINK=m
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
@@ -3983,7 +3982,6 @@ CONFIG_QLGE=m
# CONFIG_QNX6FS_FS is not set
CONFIG_QSEMI_PHY=m
CONFIG_QTNFMAC_PCIE=m
-CONFIG_QTNFMAC_PEARL_PCIE=m
CONFIG_QUOTACTL=y
# CONFIG_QUOTA_DEBUG is not set
CONFIG_QUOTA_NETLINK_INTERFACE=y
@@ -4474,8 +4472,6 @@ CONFIG_SCTP_COOKIE_HMAC_SHA1=y
CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
# CONFIG_SD_ADC_MODULATOR is not set
CONFIG_SDIO_UART=m
-# CONFIG_SDM_GPUCC_845 is not set
-# CONFIG_SDM_LPASSCC_845 is not set
CONFIG_SECCOMP=y
CONFIG_SECONDARY_TRUSTED_KEYRING=y
CONFIG_SECTION_MISMATCH_WARN_ONLY=y
@@ -4885,14 +4881,6 @@ CONFIG_SND=m
CONFIG_SND_MAESTRO3_INPUT=y
CONFIG_SND_MAESTRO3=m
CONFIG_SND_MAX_CARDS=32
-# CONFIG_SND_MESON_AXG_FRDDR is not set
-# CONFIG_SND_MESON_AXG_PDM is not set
-# CONFIG_SND_MESON_AXG_SOUND_CARD is not set
-# CONFIG_SND_MESON_AXG_SPDIFIN is not set
-# CONFIG_SND_MESON_AXG_SPDIFOUT is not set
-# CONFIG_SND_MESON_AXG_TDMIN is not set
-# CONFIG_SND_MESON_AXG_TDMOUT is not set
-# CONFIG_SND_MESON_AXG_TODDR is not set
CONFIG_SND_MIA=m
CONFIG_SND_MIXART=m
CONFIG_SND_MIXER_OSS=m
@@ -4929,7 +4917,7 @@ CONFIG_SND_SOC_ADAU1761_SPI=m
CONFIG_SND_SOC_ADAU7002=m
# CONFIG_SND_SOC_AK4104 is not set
# CONFIG_SND_SOC_AK4118 is not set
-CONFIG_SND_SOC_AK4458=m
+# CONFIG_SND_SOC_AK4458 is not set
# CONFIG_SND_SOC_AK4554 is not set
# CONFIG_SND_SOC_AK4613 is not set
# CONFIG_SND_SOC_AK4642 is not set
@@ -5009,8 +4997,10 @@ CONFIG_SND_SOC_PCM3060_SPI=m
# CONFIG_SND_SOC_PCM3168A_SPI is not set
# CONFIG_SND_SOC_PCM512x_I2C is not set
# CONFIG_SND_SOC_PCM512x_SPI is not set
+CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_RT5616 is not set
# CONFIG_SND_SOC_RT5631 is not set
+CONFIG_SND_SOC_RT5660=m
# CONFIG_SND_SOC_SGTL5000 is not set
CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
@@ -5330,7 +5320,7 @@ CONFIG_THRUSTMASTER_FF=y
# CONFIG_TI_ADC084S021 is not set
# CONFIG_TI_ADC108S102 is not set
# CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC128S052 is not set
+CONFIG_TI_ADC128S052=m
# CONFIG_TI_ADC161S626 is not set
CONFIG_TI_ADS1015=m
# CONFIG_TI_ADS7950 is not set
@@ -5339,13 +5329,12 @@ CONFIG_TI_ADS1015=m
# CONFIG_TI_CPSW_ALE is not set
# CONFIG_TI_DAC082S085 is not set
# CONFIG_TI_DAC5571 is not set
-# CONFIG_TI_DAC7311 is not set
+CONFIG_TI_DAC7311=m
CONFIG_TIFM_7XX1=m
# CONFIG_TIFM_CORE is not set
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
# CONFIG_TIMB_DMA is not set
-# CONFIG_TINYDRM_HX8357D is not set
CONFIG_TIPC_DIAG=m
CONFIG_TIPC=m
# CONFIG_TIPC_MEDIA_IB is not set
@@ -5410,7 +5399,6 @@ CONFIG_TOUCHSCREEN_MMS114=m
CONFIG_TOUCHSCREEN_MTOUCH=m
CONFIG_TOUCHSCREEN_PENMOUNT=m
CONFIG_TOUCHSCREEN_PIXCIR=m
-# CONFIG_TOUCHSCREEN_RASPBERRYPI_FW is not set
CONFIG_TOUCHSCREEN_RM_TS=m
# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
# CONFIG_TOUCHSCREEN_S6SY761 is not set
@@ -5935,7 +5923,6 @@ CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_HEXIUM_ORION=m
-# CONFIG_VIDEO_IPU3_IMGU is not set
# CONFIG_VIDEO_IVTV_ALSA is not set
# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
CONFIG_VIDEO_IVTV=m
@@ -5949,7 +5936,6 @@ CONFIG_VIDEO_NOON010PC30=m
CONFIG_VIDEO_PVRUSB2_DVB=y
CONFIG_VIDEO_PVRUSB2=m
CONFIG_VIDEO_PVRUSB2_SYSFS=y
-# CONFIG_VIDEO_ROCKCHIP_VPU is not set
CONFIG_VIDEO_SAA6588=m
CONFIG_VIDEO_SAA7134_ALSA=m
CONFIG_VIDEO_SAA7134_DVB=m