kernel: Update to 3.8.2.

[ipfire-3.x.git] / kernel / config-armv7hl-omap

diff --git a/kernel/config-armv7hl-omap b/kernel/config-armv7hl-omap
index 7d709db57a7792a7ceea9cac488e8878a5a87945..1f69140647bd7a9bb3cd6beb9d11ae3efa4ec5df 100644 (file)
--- a/kernel/config-armv7hl-omap
+++ b/kernel/config-armv7hl-omap
@@ -1,5 +1,4 @@
 CONFIG_ARCH_HAS_CPUFREQ=y
-CONFIG_NEED_MACH_GPIO_H=y
 
 #
 # IRQ subsystem
@@ -16,6 +15,7 @@ CONFIG_RCU_FANOUT=32
 CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RCU_FANOUT_EXACT is not set
 CONFIG_RCU_FAST_NO_HZ=y
+CONFIG_RCU_NOCB_CPU=y
 
 #
 # Kernel Performance Events And Counters
@@ -229,6 +229,7 @@ CONFIG_REGMAP_I2C=y
 #
 # Bus devices
 #
+CONFIG_OMAP_OCP2SCP=m
 CONFIG_OMAP_INTERCONNECT=y
 CONFIG_MTD=y
 CONFIG_MTD_TESTS=m
@@ -299,6 +300,7 @@ CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_ECC_BCH is not set
 # CONFIG_MTD_SM_COMMON is not set
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_DENALI is not set
 # CONFIG_MTD_NAND_GPIO is not set
 CONFIG_MTD_NAND_OMAP2=y
 # CONFIG_MTD_NAND_OMAP_BCH is not set
@@ -397,23 +399,20 @@ CONFIG_I2C=y
 CONFIG_I2C_OMAP=y
 
 #
-# PPS support
-#
-# CONFIG_PPS is not set
-
-#
-# Enable Device Drivers -> PPS to see the PTP clock options.
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PINCTRL=y
 
 #
 # Pin controllers
 #
-# CONFIG_PINMUX is not set
-# CONFIG_PINCONF is not set
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_PINCTRL_SINGLE is not set
-# CONFIG_PINCTRL_EXYNOS4 is not set
+CONFIG_PINCTRL_SAMSUNG=y
+CONFIG_PINCTRL_EXYNOS=y
+CONFIG_PINCTRL_EXYNOS5440=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 
 #
@@ -453,6 +452,7 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TPS65910 is not set
 # CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS80031 is not set
 CONFIG_TWL4030_CORE=y
 # CONFIG_TWL4030_MADC is not set
 CONFIG_TWL4030_POWER=y
@@ -482,6 +482,7 @@ CONFIG_MFD_TPS65090=y
 # CONFIG_MFD_AAT2870_CORE is not set
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_PALMAS is not set
+# CONFIG_MFD_AS3711 is not set
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR_DUMMY is not set
@@ -496,9 +497,11 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
 # CONFIG_REGULATOR_LP3971 is not set
 # CONFIG_REGULATOR_LP3972 is not set
 CONFIG_REGULATOR_LP872X=y
+# CONFIG_REGULATOR_TPS51632 is not set
 CONFIG_REGULATOR_TPS62360=m
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
@@ -539,12 +542,10 @@ CONFIG_VIDEO_IR_I2C=y
 # Frame buffer hardware drivers
 #
 CONFIG_XEN_FBDEV_FRONTEND=m
-CONFIG_OMAP2_VRAM=y
 CONFIG_OMAP2_VRFB=y
 CONFIG_OMAP2_DSS=y
-CONFIG_OMAP2_VRAM_SIZE=12
-CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y
-# CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set
+# CONFIG_OMAP2_DSS_DEBUG is not set
+# CONFIG_OMAP2_DSS_DEBUGFS is not set
 CONFIG_OMAP2_DSS_DPI=y
 # CONFIG_OMAP2_DSS_RFBI is not set
 CONFIG_OMAP2_DSS_VENC=y
@@ -570,12 +571,13 @@ CONFIG_PANEL_SHARP_LS037V7DW01=y
 #
 # Console display driver support
 #
+# CONFIG_FB_SSD1307 is not set
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SND_EMU10K1_SEQ is not set
 # CONFIG_SND_OMAP_SOC is not set
 
 #
-# USB HID support
+# I2C HID support
 #
 # CONFIG_USB_ARCH_HAS_XHCI is not set
 
@@ -585,6 +587,11 @@ CONFIG_PANEL_SHARP_LS037V7DW01=y
 CONFIG_USB_EHCI_HCD_OMAP=y
 CONFIG_USB_OHCI_HCD_OMAP3=y
 
+#
+# USB Physical Layer drivers
+#
+CONFIG_OMAP_USB2=m
+
 #
 # OTG and related infrastructure
 #
@@ -619,6 +626,11 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 #
 # CONFIG_RTC_DRV_TWL4030 is not set
 
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_OMAP is not set
+
 #
 # DMA Devices
 #
@@ -649,6 +661,13 @@ CONFIG_DRM_OMAP_NUM_CRTCS=1
 # Android
 #
 # CONFIG_OMAP_BANDGAP is not set
+CONFIG_COMMON_CLK=y
+
+#
+# Common Clock Framework
+#
+# CONFIG_COMMON_CLK_DEBUG is not set
+# CONFIG_CLK_TWL6040 is not set
 CONFIG_HWSPINLOCK=m
 
 #
@@ -661,6 +680,7 @@ CONFIG_HWSPINLOCK_OMAP=m
 # Rpmsg drivers (EXPERIMENTAL)
 #
 CONFIG_TI_EMIF=m
+# CONFIG_PWM is not set
 
 #
 # File systems