summaryrefslogtreecommitdiffstats
path: root/config-armv7-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2016-04-03 23:49:26 +0100
committerPeter Robinson <pbrobinson@gmail.com>2016-04-03 23:49:26 +0100
commit3ca6c4cf4d75d9f0dcb3747f3fd5d28c75daabb8 (patch)
tree902d81d75fb746125b36ebf167b3178c262430fb /config-armv7-generic
parentbdf7d4b7998fff682db6ac6eaae6aba777cd2bb7 (diff)
downloadkernel-3ca6c4cf4d75d9f0dcb3747f3fd5d28c75daabb8.tar.gz
kernel-3ca6c4cf4d75d9f0dcb3747f3fd5d28c75daabb8.tar.xz
kernel-3ca6c4cf4d75d9f0dcb3747f3fd5d28c75daabb8.zip
Some minor ARMv7/aarch64 cleanups2
Diffstat (limited to 'config-armv7-generic')
-rw-r--r--config-armv7-generic26
1 files changed, 2 insertions, 24 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index ba5f41aa1..c7c2d98b9 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -231,6 +231,7 @@ CONFIG_MTD_NAND_SUNXI=m
CONFIG_SERIO_SUN4I_PS2=m
CONFIG_KEYBOARD_SUN4I_LRADC=m
CONFIG_PWM_SUN4I=m
+CONFIG_CAN_SUN4I=m
CONFIG_USB_MUSB_SUNXI=m
CONFIG_CRYPTO_DEV_SUN4I_SS=m
CONFIG_SND_SUN4I_CODEC=m
@@ -286,6 +287,7 @@ CONFIG_MMC_DW_EXYNOS=m
# CONFIG_EXYNOS_IOMMU is not set
CONFIG_PCI_EXYNOS=y
CONFIG_PHY_EXYNOS5_USBDRD=m
+CONFIG_SAMSUNG_USBPHY=m
CONFIG_PHY_SAMSUNG_USB2=m
CONFIG_USB_EHCI_EXYNOS=m
CONFIG_USB_OHCI_EXYNOS=m
@@ -525,29 +527,6 @@ CONFIG_KEYBOARD_MATRIX=m
# CONFIG_GPIO_RCAR is not set
CONFIG_W1_MASTER_GPIO=m
-# SPI
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_ALTERA=m
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-CONFIG_SPI_DESIGNWARE=m
-CONFIG_SPI_LM70_LLP=m
-CONFIG_SPI_OC_TINY=m
-CONFIG_SPI_SC18IS602=m
-CONFIG_SPI_TLE62X0=m
-CONFIG_SPI_XCOMM=m
-# CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_CADENCE is not set
-# CONFIG_SPI_ZYNQMP_GQSPI is not set
-
-CONFIG_NFC_NCI_SPI=y
-
-# i2c
-CONFIG_I2C_MV64XXX=m
-
# HW crypto and rng
# CONFIG_CRYPTO_SHA1_ARM_CE is not set
# CONFIG_CRYPTO_SHA2_ARM_CE is not set
@@ -784,7 +763,6 @@ CONFIG_R8188EU=m
# CONFIG_CAN_TI_HECC is not set
# CONFIG_CAN_FLEXCAN is not set
# CONFIG_CAN_RCAR is not set
-# CONFIG_CAN_MCP251X is not set
# Needs work/investigation
# CONFIG_ARM_KPROBES_TEST is not set