summaryrefslogtreecommitdiffstats
path: root/config-armv7-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2016-11-28 06:42:47 +0000
committerPeter Robinson <pbrobinson@gmail.com>2016-11-28 06:42:47 +0000
commit89ece1e8cb5d2c009a5adfe181e0beac13f5c3b4 (patch)
treed4dc1e1bc522d578faac63504fabed319e842197 /config-armv7-generic
parent38c76ac35533ae3c8ffd98c03843a278d8a464f4 (diff)
downloadkernel-89ece1e8cb5d2c009a5adfe181e0beac13f5c3b4.tar.gz
kernel-89ece1e8cb5d2c009a5adfe181e0beac13f5c3b4.tar.xz
kernel-89ece1e8cb5d2c009a5adfe181e0beac13f5c3b4.zip
Minor ARM config updates, Enable two 802.15.4 drivers, General config cleanups (NFC: move some x86 specific configs to x86, EDAC generic to generic, some minor seonsor cleanups)
Diffstat (limited to 'config-armv7-generic')
-rw-r--r--config-armv7-generic24
1 files changed, 6 insertions, 18 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index 93dead00e..53576d218 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -21,7 +21,6 @@ CONFIG_ARM_THUMBEE=y
CONFIG_ARM_ASM_UNIFIED=y
CONFIG_ARM_PATCH_IDIV=y
CONFIG_ARM_CPU_TOPOLOGY=y
-CONFIG_ARM_DMA_MEM_BUFFERABLE=y
CONFIG_SWP_EMULATE=y
CONFIG_CACHE_L2X0=y
CONFIG_CACHE_L2X0_PMU=y
@@ -168,10 +167,8 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_ARM_APPENDED_DTB=y
# General vexpress ARM drivers
-CONFIG_SERIO_AMBAKMI=m
CONFIG_SERIAL_AMBA_PL010=y
CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
-
CONFIG_RTC_DRV_PL030=y
CONFIG_AMBA_PL08X=y
CONFIG_SND_ARMAACI=m
@@ -340,6 +337,8 @@ CONFIG_SND_SOC_SNOW=m
CONFIG_SND_SOC_MAX98090=m
CONFIG_SND_SOC_MAX98095=m
CONFIG_SND_SAMSUNG_I2S=m
+CONFIG_SND_SAMSUNG_PCM=m
+CONFIG_SND_SAMSUNG_SPDIF=m
CONFIG_EXYNOS_AUDSS_CLK_CON=m
# CONFIG_EXYNOS_IOMMU_DEBUG is not set
# CONFIG_SAMSUNG_PM_DEBUG is not set
@@ -459,17 +458,11 @@ CONFIG_MFD_TPS65912_SPI=y
# CONFIG_MFD_TPS80031 is not set
# CONFIG_TWL4030_CORE is not set
# CONFIG_TWL6040_CORE is not set
-#
# Pin stuff
# CONFIG_PINCTRL_AMD is not set
# CONFIG_PINCTRL_SAMSUNG is not set
-# CONFIG_PINCTRL_MSM8X74 is not set
# CONFIG_PINCTRL_BCM281XX is not set
-# CONFIG_PINCTRL_APQ8064 is not set
-# CONFIG_PINCTRL_APQ8084 is not set
-# CONFIG_PINCTRL_MSM8960 is not set
-# CONFIG_PINCTRL_MSM8660 is not set
# CONFIG_PINCTRL_MDM9615 is not set
# CONFIG_PINCTRL_MSM8996 is not set
@@ -492,7 +485,6 @@ CONFIG_INPUT_GPIO_BEEPER=m
CONFIG_INPUT_GPIO_TILT_POLLED=m
CONFIG_INPUT_MATRIXKMAP=m
CONFIG_KEYBOARD_MATRIX=m
-# CONFIG_GPIO_RCAR is not set
CONFIG_W1_MASTER_GPIO=m
# HW crypto and rng
@@ -608,15 +600,15 @@ CONFIG_GENERIC_ADC_BATTERY=m
CONFIG_BATTERY_SBS=m
# Sensors
+# non iio
CONFIG_SENSORS_AD7314=m
-CONFIG_SENSORS_ADCXX=m
CONFIG_SENSORS_ADS7871=m
CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_ISL29018=m
-CONFIG_SENSORS_ISL29028=m
-CONFIG_SENSORS_LIS3_SPI=m
CONFIG_SENSORS_LM70=m
CONFIG_SENSORS_MAX1111=m
+# iio
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
CONFIG_MPL115=m
CONFIG_MPL3115=m
CONFIG_SI7005=m
@@ -702,8 +694,6 @@ CONFIG_PWM_CROS_EC=m
CONFIG_STMMAC_PLATFORM=m
CONFIG_DWMAC_GENERIC=m
-# CONFIG_DWMAC_STM32 is not set
-
CONFIG_R8188EU=m
# CONFIG_88EU_AP_MODE is not set
@@ -789,6 +779,4 @@ CONFIG_R8188EU=m
# CONFIG_DMADEVICES_DEBUG is not set
# CONFIG_SERIAL_SAMSUNG_DEBUG is not set
# CONFIG_OMAP2_DSS_DEBUG is not set
-# CONFIG_CRYPTO_DEV_UX500_DEBUG is not set
-# CONFIG_AB8500_DEBUG is not set
# CONFIG_DEBUG_LL is not set