kernel: Update to 3.5.1.

[ipfire-3.x.git] / kernel / config-arm-generic

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 874bcc645e98f60040c1a08d02190c9862e5764e..f51241e6a9338210aff706fa57a4de621a2e6259 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -1,12 +1,10 @@
 CONFIG_ARM=y
 CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-# CONFIG_ARCH_USES_GETTIMEOFFSET is not set
-CONFIG_KTIME_SCALAR=y
-CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_NEED_MACH_IO_H=y
 
 #
 # General setup
@@ -16,8 +14,10 @@ CONFIG_BROKEN_ON_SMP=y
 #
 # IRQ subsystem
 #
+CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_IRQ_DOMAIN=y
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
+CONFIG_KTIME_SCALAR=y
 
 #
 # RCU Subsystem
@@ -59,8 +59,6 @@ CONFIG_ARCH_VERSATILE=y
 # CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_DOVE is not set
 # CONFIG_ARCH_KIRKWOOD is not set
@@ -102,6 +100,7 @@ CONFIG_MACH_VERSATILE_AB=y
 CONFIG_MACH_VERSATILE_DT=y
 CONFIG_PLAT_VERSATILE_CLCD=y
 CONFIG_PLAT_VERSATILE_FPGA_IRQ=y
+CONFIG_PLAT_VERSATILE_FPGA_IRQ_NR=4
 CONFIG_PLAT_VERSATILE_LEDS=y
 CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y
 CONFIG_PLAT_VERSATILE=y
@@ -238,7 +237,6 @@ CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_DEVICE=y
-CONFIG_OF_GPIO=y
 CONFIG_OF_I2C=m
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=y
@@ -288,6 +286,12 @@ CONFIG_SMSC911X=m
 # CONFIG_SMSC911X_ARCH_HOOKS is not set
 # CONFIG_SUNGEM is not set
 
+#
+# MII PHY device drivers
+#
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
+
 #
 # ISDN feature submodules
 #
@@ -307,6 +311,7 @@ CONFIG_SERIO_AMBAKMI=m
 # Serial drivers
 #
 # CONFIG_SERIAL_8250_DW is not set
+# CONFIG_SERIAL_8250_EM is not set
 
 #
 # Non-8250 serial port support
@@ -315,6 +320,7 @@ CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=m
 # CONFIG_HVC_DCC is not set
+CONFIG_HW_RANDOM_ATMEL=m
 
 #
 # PC SMBus host controller drivers
@@ -331,9 +337,16 @@ CONFIG_I2C_SIS630=m
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 CONFIG_I2C_VERSATILE=m
 
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
+CONFIG_OF_GPIO=y
+
 #
 # Memory mapped GPIO drivers:
 #
+# CONFIG_GPIO_EM is not set
 # CONFIG_GPIO_PL061 is not set
 
 #
@@ -405,6 +418,7 @@ CONFIG_SND_ARMAACI=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ALL_CODECS is not set
+CONFIG_SND_SIMPLE_CARD=m
 
 #
 # OTG and related infrastructure