Fairly stable and suspending configuration. Still uses way too much power though.

Change-Id: If5ce9de490a82a09c20283bd3ff0661c19671923

4 files changed, 338 insertions, 726 deletions

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 4d45679361b..4ab826d64f6 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -14,18 +14,17 @@
 	compatible = "ti,omap3430", "ti,omap3";
 	interrupt-parent = <&intc>;
 
-	aliases { /*
+	aliases {
 		serial0 = &uart1;
 		serial1 = &uart2;
 		serial2 = &uart3;
-               */
 	};
 
-	 cpus { 
-	 	cpu@0 {
+	cpus {
+		cpu@0 {
 			compatible = "arm,cortex-a8";
-	 	};
-	 };
+		};
+	};
 
 	pmu {
 		compatible = "arm,cortex-a8-pmu";
@@ -44,14 +43,14 @@
 			ti,hwmods = "mpu";
 		};
 
-	    iva {
-          compatible = "ti,iva2.2";
-          ti,hwmods = "iva";
-          
-          dsp {
-            compatible = "ti,omap3-c64";
-          };
-        }; 
+		iva {
+			compatible = "ti,iva2.2";
+			ti,hwmods = "iva";
+
+			dsp {
+				compatible = "ti,omap3-c64";
+			};
+		};
 	};
 
 	/*
@@ -112,7 +111,7 @@
 			pinctrl-single,register-width = <16>;
 			pinctrl-single,function-mask = <0x7f1f>;
 			#gpio-range-cells = <3>;
-        };
+		};
 
 		gpio1: gpio@48310000 {
 			compatible = "ti,omap3-gpio";
@@ -124,31 +123,24 @@
 			#gpio-cells = <2>;
 			interrupt-controller;
 			#interrupt-cells = <2>;
-         };
-
-        /* disabling this one makes suspend work */
-        /* but it also causes the touch to NOT work */
-
-         gpio2: gpio@49050000 {
-		 	compatible = "ti,omap3-gpio";
-		 	reg = <0x49050000 0x200>;
-		 	interrupts = <30>;
-		 	ti,hwmods = "gpio2";
-		 	gpio-controller;
-            #gpio-cells = <2>;
-		 	interrupt-controller;
-             #interrupt-cells = <2>;
-		 	/* for gpio 32 33 there is no pnctrl controller defined */
-             /* gpio-ranges = <&omap3_pmx_core 2 0x25 10>, */
-             /*               <&omap3_pmx_core 12 0x37 8>, */
-             /*               <&omap3_pmx_core 20 0x40 8>, */
-		     /*               <&omap3_pmx_core 28 0x4B 3>, */
-             /*               <&omap3_pmx_core 31 0x4f 1>; */
-          };
+		};
 
-        /* Removing this one disables touch,
-         * suspend works.
-         */
+		gpio2: gpio@49050000 {
+			compatible = "ti,omap3-gpio";
+			reg = <0x49050000 0x200>;
+			interrupts = <30>;
+			ti,hwmods = "gpio2";
+			gpio-controller;
+			#gpio-cells = <2>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
+			/* for gpio 32 33 there is no pnctrl controller defined */
+			gpio-ranges = <&omap3_pmx_core 2 0x25 10>,
+					<&omap3_pmx_core 12 0x37 8>,
+					<&omap3_pmx_core 20 0x40 8>,
+					<&omap3_pmx_core 28 0x4B 3>,
+					<&omap3_pmx_core 31 0x4f 1>;
+		};
 
 		gpio3: gpio@49052000 {
 			compatible = "ti,omap3-gpio";
@@ -159,34 +151,26 @@
 			#gpio-cells = <2>;
 			interrupt-controller;
 			#interrupt-cells = <2>;
-			/* gpio-ranges = <&omap3_pmx_core 0 0x50 32>; */
-         };
-
-        /* Removing this one disables _both_ touch 
-         * and suspend. 
-         */
+			gpio-ranges = <&omap3_pmx_core 0 0x50 32>;
+		};
 
-         gpio4: gpio@49054000 {
-            compatible = "ti,omap3-gpio";
+		gpio4: gpio@49054000 {
+			compatible = "ti,omap3-gpio";
 			reg = <0x49054000 0x200>;
 			interrupts = <32>;
 			ti,hwmods = "gpio4";
 			gpio-controller;
 			#gpio-cells = <2>;
 			interrupt-controller;
-            #interrupt-cells = <2>;
+			#interrupt-cells = <2>;
 			/*
-			* gpio 127 in wkup mux, which we can not use (see
+			* gpio 127 in wkup mux, whcih we can not use (see
 			* sorce code for comment)
 			*/
-            /* gpio-ranges = <&omap3_pmx_core 0 0x70 16>,  */
-            /*               <&omap3_pmx_core 16 0x82 14>, */
-            /*               <&omap3_pmx_core 30 0x81 1>; */
-        };
-
-        /* Removing this one causes touch to work but suspend to 
-         * crash.... 
-         */
+			gpio-ranges = <&omap3_pmx_core 0 0x70 16>,
+					<&omap3_pmx_core 16 0x82 14>,
+					<&omap3_pmx_core 30 0x81 1>;
+		};
 
 		gpio5: gpio@49056000 {
 			compatible = "ti,omap3-gpio";
@@ -196,18 +180,14 @@
 			gpio-controller;
 			#gpio-cells = <2>;
 			interrupt-controller;
-            #interrupt-cells = <2>;
+			#interrupt-cells = <2>;
 			/*
-             * gpio 128 129 in wkup mux, whcih we can not use (see
-             * sorce code for comment)
-             */
-            /* gpio-ranges = <&omap3_pmx_core 2 0x94 20>; */
+			* gpio 128 129 in wkup mux, whcih we can not use (see
+			* sorce code for comment)
+			*/
+			gpio-ranges = <&omap3_pmx_core 2 0x94 30>;
 		};
 
-        /* Removing this one causes touch to work but suspend to 
-         * crash.... 
-         */       
-
 		gpio6: gpio@49058000 {
 			compatible = "ti,omap3-gpio";
 			reg = <0x49058000 0x200>;
@@ -216,37 +196,36 @@
 			gpio-controller;
 			#gpio-cells = <2>;
 			interrupt-controller;
-            #interrupt-cells = <2>;
+			#interrupt-cells = <2>;
 			/* for gpio 187 there is no pnctrl controller defined */
-            /* gpio-ranges = <&omap3_pmx_core 0 0xb2 7>, */
-            /*               <&omap3_pmx_core 7 0x80 1>, */
-            /*               <&omap3_pmx_core 8 0xc7 1>, */
-            /*               <&omap3_pmx_core 9 0xc0 1>, */
-            /*               <&omap3_pmx_core 10 0xcb 13>, */
-            /*               <&omap3_pmx_core 23 0xc8 3>, */
-            /*               <&omap3_pmx_core 26 0xd9 1>,  */
-            /*               <&omap3_pmx_core 28 0xc1 4>; */
-         };
-
-        /*  uart1: serial@4806a000 { */
-		/* 	compatible = "ti,omap3-uart"; */
-		/* 	ti,hwmods = "uart1"; */
-		/* 	clock-frequency = <48000000>; */
-		/* }; */
+			gpio-ranges = <&omap3_pmx_core 0 0xb2 7>,
+					<&omap3_pmx_core 7 0x80 1>,
+					<&omap3_pmx_core 8 0xc7 1>,
+					<&omap3_pmx_core 9 0xc0 1>,
+					<&omap3_pmx_core 10 0xcb 13>,
+					<&omap3_pmx_core 23 0xc8 3>,
+					<&omap3_pmx_core 26 0xd9 1>,
+					<&omap3_pmx_core 28 0xc1 4>;
+		};
 
-		/* uart2: serial@4806c000 { */
-		/* 	compatible = "ti,omap3-uart"; */
-		/* 	ti,hwmods = "uart2"; */
-		/* 	clock-frequency = <48000000>; */
-		/* }; */
+		uart1: serial@4806a000 {
+			compatible = "ti,omap3-uart";
+			ti,hwmods = "uart1";
+			clock-frequency = <48000000>;
+		};
 
-		/* uart3: serial@49020000 { */
-		/* 	compatible = "ti,omap3-uart"; */
-		/* 	ti,hwmods = "uart3"; */
-		/* 	clock-frequency = <48000000>; */
-        /*  }; */
+		uart2: serial@4806c000 {
+			compatible = "ti,omap3-uart";
+			ti,hwmods = "uart2";
+			clock-frequency = <48000000>;
+		};
 
-        /*         
+		uart3: serial@49020000 {
+			compatible = "ti,omap3-uart";
+			ti,hwmods = "uart3";
+			clock-frequency = <48000000>;
+		};
+/*
 		i2c1: i2c@48070000 {
 			compatible = "ti,omap3-i2c";
 			#address-cells = <1>;
@@ -266,8 +245,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			ti,hwmods = "i2c3";
-         }; */
-        
+		};
 		mcspi1: spi@48098000 {
 			compatible = "ti,omap2-mcspi";
 			#address-cells = <1>;
@@ -320,7 +298,8 @@
 			ti,spi-num-cs = <1>;
 			dmas = <&sdma 70>, <&sdma 71>;
 			dma-names = "tx0", "rx0";
-        };             
+		};
+*/
 
 		mmc1: mmc@4809c000 {
 			compatible = "ti,omap3-hsmmc";
@@ -342,7 +321,7 @@
 			ti,hwmods = "mmc3";
 			dmas = <&sdma 77>, <&sdma 78>;
 			dma-names = "tx", "rx";
-         };
+		};
 
 		wdt2: wdt@48314000 {
 			compatible = "ti,omap3-wdt";
@@ -352,11 +331,11 @@
 		mcbsp1: mcbsp@48074000 {
 			compatible = "ti,omap3-mcbsp";
 			reg = <0x48074000 0xff>;
-            reg-names = "mpu";
-            interrupts = <16>, /* OCP compliant interrupt */
-                         <59>, /* TX interrupt */
-                         <60>; /* RX interrupt */
-            interrupt-names = "common", "tx", "rx";
+			reg-names = "mpu";
+			interrupts = <16>, /* OCP compliant interrupt */
+				     <59>, /* TX interrupt */
+				     <60>; /* RX interrupt */
+			interrupt-names = "common", "tx", "rx";
 			ti,buffer-size = <128>;
 			ti,hwmods = "mcbsp1";
 			dmas = <&sdma 31>,
@@ -369,11 +348,11 @@
 			reg = <0x49022000 0xff>,
 			      <0x49028000 0xff>;
 			reg-names = "mpu", "sidetone";
-            interrupts = <17>, /* OCP compliant interrupt */
-                         <62>, /* TX interrupt */
-                         <63>, /* RX interrupt */
-                         <4>;   /* Sidetone */
-            interrupt-names = "common", "tx", "rx", "sidetone";
+			interrupts = <17>, /* OCP compliant interrupt */
+				     <62>, /* TX interrupt */
+				     <63>, /* RX interrupt */
+				     <4>;  /* Sidetone */
+			interrupt-names = "common", "tx", "rx", "sidetone";
 			ti,buffer-size = <1280>;
 			ti,hwmods = "mcbsp2", "mcbsp2_sidetone";
 			dmas = <&sdma 33>,
@@ -386,11 +365,11 @@
 			reg = <0x49024000 0xff>,
 			      <0x4902a000 0xff>;
 			reg-names = "mpu", "sidetone";
-            interrupts = <22>, /* OCP compliant interrupt */
-                         <89>, /* TX interrupt */
-                         <90>, /* RX interrupt */
-                         <5>;   /* Sidetone */
-            interrupt-names = "common", "tx", "rx", "sidetone";
+			interrupts = <22>, /* OCP compliant interrupt */
+				     <89>, /* TX interrupt */
+				     <90>, /* RX interrupt */
+				     <5>;  /* Sidetone */
+			interrupt-names = "common", "tx", "rx", "sidetone";
 			ti,buffer-size = <128>;
 			ti,hwmods = "mcbsp3", "mcbsp3_sidetone";
 			dmas = <&sdma 17>,
@@ -402,10 +381,10 @@
 			compatible = "ti,omap3-mcbsp";
 			reg = <0x49026000 0xff>;
 			reg-names = "mpu";
-            interrupts = <23>, /* OCP compliant interrupt */
-                         <54>, /* TX interrupt */
-                         <55>; /* RX interrupt */
-            interrupt-names = "common", "tx", "rx";
+			interrupts = <23>, /* OCP compliant interrupt */
+				     <54>, /* TX interrupt */
+				     <55>; /* RX interrupt */
+			interrupt-names = "common", "tx", "rx";
 			ti,buffer-size = <128>;
 			ti,hwmods = "mcbsp4";
 			dmas = <&sdma 19>,
@@ -417,16 +396,16 @@
 			compatible = "ti,omap3-mcbsp";
 			reg = <0x48096000 0xff>;
 			reg-names = "mpu";
-            interrupts = <27>, /* OCP compliant interrupt */
-                         <81>, /* TX interrupt */
-                         <82>; /* RX interrupt */
-            interrupt-names = "common", "tx", "rx";
+			interrupts = <27>, /* OCP compliant interrupt */
+				     <81>, /* TX interrupt */
+				     <82>; /* RX interrupt */
+			interrupt-names = "common", "tx", "rx";
 			ti,buffer-size = <128>;
 			ti,hwmods = "mcbsp5";
 			dmas = <&sdma 21>,
 			       <&sdma 22>;
 			dma-names = "tx", "rx";
-         };
+		};
 
 		timer1: timer@48318000 {
 			compatible = "ti,omap3430-timer";
@@ -522,13 +501,13 @@
 			ti,timer-alwon;
 			ti,timer-secure;
 		};
-        
-        /* usbhstll: usbhstll@48062000 { */
-        /*     compatible = "ti,usbhs-tll"; */
-		/*  	reg = <0x48062000 0x1000>;  */
-		/*  	interrupts = <78>;  */
-		/*  	ti,hwmods = "usb_tll_hs"; */
-        /* }; */
+
+		usbhstll: usbhstll@48062000 {
+			compatible = "ti,usbhs-tll";
+			reg = <0x48062000 0x1000>;
+			interrupts = <78>;
+			ti,hwmods = "usb_tll_hs";
+		};
 
 		usbhshost: usbhshost@48064000 {
 			compatible = "ti,usbhs-host";
@@ -538,24 +517,20 @@
 			#size-cells = <1>;
 			ranges;
 
-			/* usbhsohci: ohci@48064400 { */
-			/* 	compatible = "ti,ohci-omap3", "usb-ohci"; */
-			/* 	reg = <0x48064400 0x400>; */
-			/* 	interrupt-parent = <&intc>; */
-			/* 	interrupts = <76>; */
-			/* }; */
-
-			/* usbhsehci: ehci@48064800 { */
-			/* 	compatible = "ti,ehci-omap", "usb-ehci"; */
-			/* 	reg = <0x48064800 0x400>; */
-			/* 	interrupt-parent = <&intc>; */
-			/* 	interrupts = <77>; */
-			/* }; */
-         };
+			usbhsohci: ohci@48064400 {
+				compatible = "ti,ohci-omap3", "usb-ohci";
+				reg = <0x48064400 0x400>;
+				interrupt-parent = <&intc>;
+				interrupts = <76>;
+			};
 
-        /* GPMC needs to be initialized here, or everything 
-         * falls apart.
-         */
+			usbhsehci: ehci@48064800 {
+				compatible = "ti,ehci-omap", "usb-ehci";
+				reg = <0x48064800 0x400>;
+				interrupt-parent = <&intc>;
+				interrupts = <77>;
+			};
+		};
 
 		gpmc: gpmc@6e000000 {
 			compatible = "ti,omap3430-gpmc";
@@ -566,9 +541,8 @@
 			gpmc,num-waitpins = <4>;
 			#address-cells = <2>;
 			#size-cells = <1>;
-         };
+		};
 
-        /*
 		usb_otg_hs: usb_otg_hs@480ab000 {
 			compatible = "ti,omap3-musb";
 			reg = <0x480ab000 0x1000>;
@@ -578,11 +552,11 @@
 			multipoint = <1>;
 			num-eps = <16>;
 			ram-bits = <12>;
-         };*/
+		};
 
 		glbl_prm: glbl_prm@48307250 {
-                       /*
-			* disabled by default. because two required
+			/*
+			* disabled by default. becasue two required
 			* values should be defined in board file
 			*/
 			status = "disabled";
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts
index 13a34e53ac7..76f170126be 100644
--- a/arch/arm/boot/dts/omap3_h1.dts
+++ b/arch/arm/boot/dts/omap3_h1.dts
@@ -31,6 +31,29 @@
 			reset-voltage = <1275000>;
 		};
 	};
+
+	pad-wkup {
+		/* on omap, the irqs are calculated as follows:
+		 * for the 96 intc IRQs
+		 *   irq = 16 + irq_offset (from TRM sec 12.3.2)
+		 * for a gpio IRQ (banks numbered 1 to 6
+		 *   irq = 16 + 96 + (gpio_bank - 1) * 32
+		 */
+		compatible = "ti,pad-wkup";
+
+		/* Map the pad offset (off) to an interrupt (IRQ).    */
+		/* if handle is 1, an irq will be generated based on  */
+		/* the pad wkup bit.  If 0, the pad will be used only */
+		/* for reporting, assumingly because the domain will  */
+		/* be in a state during suspend to generate the IRQ   */
+		/* directly.                                          */
+		/* generic_handle_irq() will be called for multiple   */
+		/* wakeup sources, but only the first in the order    */
+		/* listed below will be reported as the wakeup reason */
+		/*                                                    */
+		/*             off  IRQ handle                        */
+		ti,pad_irq = <0x16e  90 1>; /* uart3 - serial rx      */
+	};
 };
 
 &vc {
@@ -55,3 +78,125 @@
 	offmodesetup_time = <3500>;
 	clksetup_time = <1000>;
 };
+
+&omap3_pmx_core {
+	pinctrl-names = "default";
+	pinctrl-0 = <
+		&board_pins
+	>;
+
+	board_pins: pinmux_board_pins {
+		pinctrl-single,pins = <
+			0x0a4 0x000	/* DSS_PCLK, MODE0 | OUTPUT */
+			0x0a6 0x000	/* DSS_HSYNC, MODE0 | OUTPUT */
+			0x0a8 0x000	/* DSS_VSYNC, MODE0 | OUTPUT */
+			0x0ac 0x000	/* DSS_DATA0, MODE0 | OUTPUT */
+			0x0ae 0x000	/* DSS_DATA1, MODE0 | OUTPUT */
+			0x0b0 0x000	/* DSS_DATA2, MODE0 | OUTPUT */
+			0x0b2 0x000	/* DSS_DATA3, MODE0 | OUTPUT */
+			0x0b4 0x000	/* DSS_DATA4, MODE0 | OUTPUT */
+			0x0b6 0x000	/* DSS_DATA5, MODE0 | OUTPUT */
+			0x0b8 0x000	/* DSS_DATA6, MODE0 | OUTPUT */
+			0x0ba 0x000	/* DSS_DATA7, MODE0 | OUTPUT */
+			0x0bc 0x000	/* DSS_DATA8, MODE0 | OUTPUT */
+			0x0be 0x000	/* DSS_DATA9, MODE0 | OUTPUT */
+			0x0c0 0x000	/* DSS_DATA10, MODE0 | OUTPUT */
+			0x0c2 0x000	/* DSS_DATA11, MODE0 | OUTPUT */
+			0x0c4 0x000	/* DSS_DATA12, MODE0 | OUTPUT */
+			0x0c6 0x000	/* DSS_DATA13, MODE0 | OUTPUT */
+			0x0c8 0x000	/* DSS_DATA14, MODE0 | OUTPUT */
+			0x0ca 0x000	/* DSS_DATA15, MODE0 | OUTPUT */
+			0x0cc 0x000	/* DSS_DATA16, MODE0 | OUTPUT */
+			0x0ce 0x000	/* DSS_DATA17, MODE0 | OUTPUT */
+
+			0x198 0x000	/* MCSPI1_CLK, MODE0 | OUTNPUT */
+			0x19a 0x000	/* MCSPI1_SIMO, MODE0 | OUTPUT */
+			0x19c 0x118	/* MCSPI1_SOMI, MODE0 | INPUT_PULLUP */
+			0x1a0 0x000	/* MCSPI1_CS1, MODE0 | OUTPUT */
+
+			/* touch reset */
+			0x0f2 0x11c	/* CAM_D6, MODE4 | INPUT_PULLUP */
+
+			0x5ba 0x004	/* ETK_D7, MODE4 | OUTPUT */
+
+			0x1b0 0x100	/* SYS_NIRQ, MODE0 | INPUT */
+
+			0x0dc 0x004	/* CAM_HS, MODE4 | OUTPUT */
+		>;
+	};
+
+	uart3_pins: pinmux_uart3_pins {
+		pinctrl-single,pins = <
+			/* uart3 */
+			0x16e 0x4118 	/* UART3_RX, MODEO | INPUT_PULLUP | OFFWAKEUP*/
+			0x170 0x000 	/* UART3_TX, MODE0 | OUTPUT */
+		>;
+	};
+};
+
+&omap3_pmx_wkup{
+	pinctrl-names = "default";
+	pinctrl-0 = <&wkup_pins>;
+
+	wkup_pins: pinmux_wakeup_pins {
+		pinctrl-single,pins = <
+			0x006 0x008     /* SYS_CLKREQ, MODE0 | PULLDOWN */
+			0x018 0x000     /* SYS_OFF_MODE, MODE0 */
+			0x01a 0x10c     /* SYS_CLKOUT1, MODE4 | INPUT_PULLDOWN */
+		>;
+	};
+};
+
+/* leave gpio bank interface clocks on during suspend
+ * to avoid race condition in gpio_irq_handler */
+&gpio1 {
+	ti,no_idle_on_suspend;
+};
+
+&gpio2 {
+	ti,no_idle_on_suspend;
+};
+
+&gpio3 {
+	ti,no_idle_on_suspend;
+};
+
+&gpio4 {
+	ti,no_idle_on_suspend;
+};
+
+&gpio5 {
+	ti,no_idle_on_suspend;
+};
+
+&gpio6 {
+	ti,no_idle_on_suspend;
+};
+
+/* external */
+&mmc1 {
+	status = "disabled";
+};
+
+&mmc2 {
+	status = "disabled";
+};
+
+&mmc3 {
+	status = "disabled";
+};
+
+&uart1 {
+	status = "disabled";
+};
+
+&uart2 {
+	status = "disabled";
+};
+
+&uart3 {
+	pinctrl-0 = <&uart3_pins>;
+	pinctrl-names = "default";
+	autosuspend-delay = <3000>;
+	wakeup-capable;
+};
diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig
index 7f07b5d5c44..c986f2d7423 100644
--- a/arch/arm/configs/omap3_h1_defconfig
+++ b/arch/arm/configs/omap3_h1_defconfig
@@ -39,10 +39,11 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_FHANDLE is not set
 # CONFIG_AUDIT is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
@@ -84,17 +85,19 @@ CONFIG_BSD_PROCESS_ACCT=y
 #
 # RCU Subsystem
 #
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_TINY_PREEMPT_RCU=y
+CONFIG_TREE_PREEMPT_RCU=y
+# CONFIG_TINY_PREEMPT_RCU is not set
 CONFIG_PREEMPT_RCU=y
-# CONFIG_RCU_STALL_COMMON is not set
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT_LEAF=16
+# CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_TREE_RCU_TRACE is not set
-CONFIG_RCU_BOOST=y
-CONFIG_RCU_BOOST_PRIO=1
-CONFIG_RCU_BOOST_DELAY=500
+# CONFIG_RCU_BOOST is not set
+# CONFIG_RCU_NOCB_CPU is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=18
+CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_CGROUPS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 # CONFIG_NAMESPACES is not set
@@ -117,7 +120,7 @@ CONFIG_HAVE_UID16=y
 CONFIG_HOTPLUG=y
 CONFIG_PANIC_TIMEOUT=1
 CONFIG_EXPERT=y
-CONFIG_UID16=y
+# CONFIG_UID16 is not set
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
@@ -139,10 +142,9 @@ CONFIG_PERF_USE_VMALLOC=y
 #
 # Kernel Performance Events And Counters
 #
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_COMPAT_BRK=y
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_VM_EVENT_COUNTERS is not set
+# CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
@@ -161,11 +163,9 @@ CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_MODULES_USE_ELF_REL=y
@@ -207,10 +207,10 @@ CONFIG_IOSCHED_NOOP=y
 # CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_IOSCHED_ROW=y
 CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_ROW=y
+# CONFIG_DEFAULT_ROW is not set
 # CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="row"
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_FREEZER=y
 
@@ -271,7 +271,6 @@ CONFIG_ARCH_MULTI_V6_V7=y
 # CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_BCM is not set
 # CONFIG_GPIO_PCA953X is not set
-# CONFIG_KEYBOARD_GPIO_POLLED is not set
 # CONFIG_ARCH_HIGHBANK is not set
 # CONFIG_ARCH_MXC is not set
 
@@ -303,7 +302,7 @@ CONFIG_SOC_HAS_OMAP2_SDRC=y
 CONFIG_ARCH_OMAP3=y
 # CONFIG_ARCH_OMAP4 is not set
 # CONFIG_SOC_OMAP5 is not set
-# CONFIG_SOC_OMAP3430 is not set
+CONFIG_SOC_OMAP3430=y
 # CONFIG_SOC_TI81XX is not set
 # CONFIG_SOC_AM33XX is not set
 CONFIG_OMAP_PACKAGE_CBP=y
@@ -403,12 +402,12 @@ CONFIG_ARM_ERRATA_430973=y
 #
 # Kernel Features
 #
-CONFIG_HAVE_ARM_ARCH_TIMER=y
+# CONFIG_HAVE_ARM_ARCH_TIMER is not set
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_2G is not set
 # CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_ARM_PSCI=y
+# CONFIG_ARM_PSCI is not set
 CONFIG_ARCH_NR_GPIO=256
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
@@ -424,7 +423,6 @@ CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 CONFIG_HAVE_ARCH_PFN_VALID=y
 # CONFIG_HIGHMEM is not set
-CONFIG_HW_PERF_EVENTS=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_HAVE_MEMBLOCK=y
@@ -436,13 +434,14 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ZONE_DMA_FLAG=0
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_CROSS_MEMORY_ATTACH is not set
 CONFIG_NEED_PER_CPU_KM=y
 # CONFIG_CLEANCACHE is not set
+# CONFIG_FRONTSWAP is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
-CONFIG_SECCOMP=y
+# CONFIG_SECCOMP is not set
 # CONFIG_CC_STACKPROTECTOR is not set
 # CONFIG_XEN is not set
 # CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART is not set
@@ -561,261 +560,44 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 # CONFIG_PACKET_DIAG is not set
 CONFIG_UNIX=y
-# CONFIG_UNIX_DIAG is not set
+CONFIG_UNIX_DIAG=y
 CONFIG_XFRM=y
 CONFIG_XFRM_ALGO=y
 CONFIG_XFRM_USER=y
 # CONFIG_XFRM_SUB_POLICY is not set
 CONFIG_XFRM_MIGRATE=y
 # CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=y
 CONFIG_NET_KEY=y
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_ROUTE_MULTIPATH is not set
-# CONFIG_IP_ROUTE_VERBOSE is not set
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE_DEMUX is not set
-CONFIG_NET_IP_TUNNEL=y
-# CONFIG_IP_MROUTE is not set
+# CONFIG_NET_IP_TUNNEL is not set
 # CONFIG_ARPD is not set
 # CONFIG_SYN_COOKIES is not set
-# CONFIG_NET_IPVTI is not set
 # CONFIG_INET_AH is not set
-CONFIG_INET_ESP=y
+# CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET_TUNNEL=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_LRO is not set
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=y
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
-CONFIG_IPV6_MIP6=y
-CONFIG_INET6_XFRM_TUNNEL=y
-CONFIG_INET6_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_BEET=y
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-CONFIG_IPV6_SIT=y
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=y
-# CONFIG_IPV6_GRE is not set
-CONFIG_IPV6_MULTIPLE_TABLES=y
-# CONFIG_IPV6_SUBTREES is not set
-# CONFIG_IPV6_MROUTE is not set
-CONFIG_ANDROID_PARANOID_NETWORK=y
-CONFIG_NET_ACTIVITY_STATS=y
-CONFIG_NETWORK_SECMARK=y
+# CONFIG_IPV6 is not set
+# CONFIG_ANDROID_PARANOID_NETWORK is not set
+# CONFIG_NET_ACTIVITY_STATS is not set
+# CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_NETLINK=y
-# CONFIG_NETFILTER_NETLINK_ACCT is not set
-CONFIG_NETFILTER_NETLINK_QUEUE=y
-CONFIG_NETFILTER_NETLINK_LOG=y
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_SECMARK is not set
-CONFIG_NF_CONNTRACK_PROCFS=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-# CONFIG_NF_CONNTRACK_TIMEOUT is not set
-# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=y
-CONFIG_NF_CONNTRACK_FTP=y
-CONFIG_NF_CONNTRACK_H323=y
-CONFIG_NF_CONNTRACK_IRC=y
-CONFIG_NF_CONNTRACK_BROADCAST=y
-CONFIG_NF_CONNTRACK_NETBIOS_NS=y
-# CONFIG_NF_CONNTRACK_SNMP is not set
-CONFIG_NF_CONNTRACK_PPTP=y
-CONFIG_NF_CONNTRACK_SANE=y
-# CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_TFTP=y
-CONFIG_NF_CT_NETLINK=y
-# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
-CONFIG_NF_NAT=y
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=y
-CONFIG_NF_NAT_PROTO_UDPLITE=y
-CONFIG_NF_NAT_PROTO_SCTP=y
-CONFIG_NF_NAT_AMANDA=y
-CONFIG_NF_NAT_FTP=y
-CONFIG_NF_NAT_IRC=y
-# CONFIG_NF_NAT_SIP is not set
-CONFIG_NF_NAT_TFTP=y
-CONFIG_NETFILTER_TPROXY=y
-CONFIG_NETFILTER_XTABLES=y
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=y
-CONFIG_NETFILTER_XT_CONNMARK=y
-
-#
-# Xtables targets
-#
-# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
-# CONFIG_NETFILTER_XT_TARGET_CT is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_HL is not set
-# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
-# CONFIG_NETFILTER_XT_TARGET_LOG is not set
-CONFIG_NETFILTER_XT_TARGET_MARK=y
-CONFIG_NETFILTER_XT_TARGET_NETMAP=y
-CONFIG_NETFILTER_XT_TARGET_NFLOG=y
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=y
-# CONFIG_NETFILTER_XT_TARGET_TEE is not set
-CONFIG_NETFILTER_XT_TARGET_TPROXY=y
-CONFIG_NETFILTER_XT_TARGET_TRACE=y
-# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-
-#
-# Xtables matches
-#
-# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_BPF is not set
-# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-CONFIG_NETFILTER_XT_MATCH_COMMENT=y
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-# CONFIG_NETFILTER_XT_MATCH_CPU is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-CONFIG_NETFILTER_XT_MATCH_ECN=y
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_HELPER=y
-CONFIG_NETFILTER_XT_MATCH_HL=y
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
-CONFIG_NETFILTER_XT_MATCH_LENGTH=y
-CONFIG_NETFILTER_XT_MATCH_LIMIT=y
-CONFIG_NETFILTER_XT_MATCH_MAC=y
-CONFIG_NETFILTER_XT_MATCH_MARK=y
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
-# CONFIG_NETFILTER_XT_MATCH_OSF is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-CONFIG_NETFILTER_XT_MATCH_POLICY=y
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
-CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-CONFIG_NETFILTER_XT_MATCH_SOCKET=y
-CONFIG_NETFILTER_XT_MATCH_STATE=y
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
-CONFIG_NETFILTER_XT_MATCH_STRING=y
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-CONFIG_NETFILTER_XT_MATCH_TIME=y
-CONFIG_NETFILTER_XT_MATCH_U32=y
-# CONFIG_IP_SET is not set
-# CONFIG_IP_VS is not set
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=y
-CONFIG_NF_CONNTRACK_IPV4=y
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_MATCH_AH=y
-CONFIG_IP_NF_MATCH_ECN=y
-# CONFIG_IP_NF_MATCH_RPFILTER is not set
-CONFIG_IP_NF_MATCH_TTL=y
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_IP_NF_TARGET_REJECT_SKERR=y
-# CONFIG_IP_NF_TARGET_ULOG is not set
-CONFIG_NF_NAT_IPV4=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
-CONFIG_IP_NF_TARGET_NETMAP=y
-CONFIG_IP_NF_TARGET_REDIRECT=y
-CONFIG_NF_NAT_PROTO_GRE=y
-CONFIG_NF_NAT_PPTP=y
-CONFIG_NF_NAT_H323=y
-CONFIG_IP_NF_MANGLE=y
-# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-CONFIG_IP_NF_RAW=y
-CONFIG_IP_NF_ARPTABLES=y
-CONFIG_IP_NF_ARPFILTER=y
-CONFIG_IP_NF_ARP_MANGLE=y
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV6=y
-CONFIG_NF_CONNTRACK_IPV6=y
-CONFIG_IP6_NF_IPTABLES=y
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_RPFILTER is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
-CONFIG_IP6_NF_FILTER=y
-CONFIG_IP6_NF_TARGET_REJECT=y
-CONFIG_IP6_NF_TARGET_REJECT_SKERR=y
-CONFIG_IP6_NF_MANGLE=y
-CONFIG_IP6_NF_RAW=y
-CONFIG_NF_NAT_IPV6=y
-CONFIG_IP6_NF_TARGET_MASQUERADE=y
-# CONFIG_IP6_NF_TARGET_NPT is not set
+# CONFIG_NETFILTER is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -833,66 +615,7 @@ CONFIG_HAVE_NET_DSA=y
 # CONFIG_LAPB is not set
 # CONFIG_PHONET is not set
 # CONFIG_IEEE802154 is not set
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-# CONFIG_NET_SCH_CBQ is not set
-CONFIG_NET_SCH_HTB=y
-# CONFIG_NET_SCH_HFSC is not set
-# CONFIG_NET_SCH_PRIO is not set
-# CONFIG_NET_SCH_MULTIQ is not set
-# CONFIG_NET_SCH_RED is not set
-# CONFIG_NET_SCH_SFB is not set
-# CONFIG_NET_SCH_SFQ is not set
-# CONFIG_NET_SCH_TEQL is not set
-# CONFIG_NET_SCH_TBF is not set
-# CONFIG_NET_SCH_GRED is not set
-# CONFIG_NET_SCH_DSMARK is not set
-# CONFIG_NET_SCH_NETEM is not set
-# CONFIG_NET_SCH_DRR is not set
-# CONFIG_NET_SCH_MQPRIO is not set
-# CONFIG_NET_SCH_CHOKE is not set
-# CONFIG_NET_SCH_QFQ is not set
-# CONFIG_NET_SCH_CODEL is not set
-# CONFIG_NET_SCH_FQ_CODEL is not set
-# CONFIG_NET_SCH_INGRESS is not set
-# CONFIG_NET_SCH_PLUG is not set
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-# CONFIG_NET_CLS_BASIC is not set
-# CONFIG_NET_CLS_TCINDEX is not set
-# CONFIG_NET_CLS_ROUTE4 is not set
-# CONFIG_NET_CLS_FW is not set
-CONFIG_NET_CLS_U32=y
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-# CONFIG_NET_CLS_RSVP is not set
-# CONFIG_NET_CLS_RSVP6 is not set
-# CONFIG_NET_CLS_FLOW is not set
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-# CONFIG_NET_EMATCH_CMP is not set
-# CONFIG_NET_EMATCH_NBYTE is not set
-CONFIG_NET_EMATCH_U32=y
-# CONFIG_NET_EMATCH_META is not set
-# CONFIG_NET_EMATCH_TEXT is not set
-CONFIG_NET_CLS_ACT=y
-# CONFIG_NET_ACT_POLICE is not set
-# CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_MIRRED is not set
-# CONFIG_NET_ACT_IPT is not set
-# CONFIG_NET_ACT_NAT is not set
-# CONFIG_NET_ACT_PEDIT is not set
-# CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_ACT_SKBEDIT is not set
-# CONFIG_NET_ACT_CSUM is not set
-# CONFIG_NET_CLS_IND is not set
-CONFIG_NET_SCH_FIFO=y
+# CONFIG_NET_SCHED is not set
 # CONFIG_DCB is not set
 # CONFIG_BATMAN_ADV is not set
 # CONFIG_OPENVSWITCH is not set
@@ -933,7 +656,6 @@ CONFIG_BT_HCIUART_H4=y
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_BT_MRVL is not set
 # CONFIG_AF_RXRPC is not set
-CONFIG_FIB_RULES=y
 # CONFIG_WIRELESS is not set
 # CONFIG_WIMAX is not set
 CONFIG_RFKILL=y
@@ -971,7 +693,6 @@ CONFIG_FW_LOADER_USER_HELPER=y
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
-CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
@@ -1004,6 +725,7 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_SWAP is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -1150,6 +872,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BQ5105X_CTRL is not set
 # CONFIG_BQ5105X_DETECT is not set
 CONFIG_WAKEUP_SOURCE_NOTIFY=y
+# CONFIG_ALS_WHILE_CHARGING is not set
 # CONFIG_C2PORT is not set
 
 #
@@ -1190,7 +913,6 @@ CONFIG_NET_CORE=y
 # CONFIG_DUMMY is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_MII is not set
-CONFIG_IFB=y
 # CONFIG_NET_TEAM is not set
 # CONFIG_MACVLAN is not set
 # CONFIG_VXLAN is not set
@@ -1255,7 +977,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
 # CONFIG_INPUT_POLLDEV is not set
 # CONFIG_INPUT_SPARSEKMAP is not set
-CONFIG_INPUT_MATRIXKMAP=y
+# CONFIG_INPUT_MATRIXKMAP is not set
 
 #
 # Userland interfaces
@@ -1272,39 +994,8 @@ CONFIG_INPUT_KEYRESET=y
 #
 # Input Device Drivers
 #
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ADP5589 is not set
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_QT2160 is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_TCA8418 is not set
-# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_MPR121 is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-# CONFIG_MOUSE_PS2 is not set
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_BCM5974 is not set
-# CONFIG_MOUSE_CYAPA is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MOUSE_GPIO is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MOUSE_SYNAPTICS_USB is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
@@ -1365,7 +1056,6 @@ CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 # CONFIG_INPUT_ADXL34X is not set
-# CONFIG_INPUT_IMS_PCU is not set
 # CONFIG_INPUT_CMA3000 is not set
 
 #
@@ -1409,13 +1099,10 @@ CONFIG_SERIAL_OMAP_CONSOLE=y
 # CONFIG_SERIAL_IFX6X60 is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_SERIAL_ARC is not set
-CONFIG_TTY_PRINTK=y
+# CONFIG_TTY_PRINTK is not set
 # CONFIG_HVC_DCC is not set
 # CONFIG_IPMI_HANDLER is not set
-CONFIG_HW_RANDOM=y
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_ATMEL is not set
-# CONFIG_HW_RANDOM_EXYNOS is not set
+# CONFIG_HW_RANDOM is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set
@@ -1595,7 +1282,6 @@ CONFIG_BATTERY_BQ27X00_I2C=y
 # CONFIG_BATTERY_BQ27X00_PLATFORM is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
@@ -1682,7 +1368,6 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP8788 is not set
-CONFIG_MFD_OMAP_USB_HOST=y
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_TPS6105X is not set
 # CONFIG_TPS65010 is not set
@@ -1747,118 +1432,12 @@ CONFIG_REGULATOR_TI_OMAP_PMIC=y
 # CONFIG_SGX_OMAP3630 is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_UVESA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_TMIO is not set
-# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_GOLDFISH is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_AUO_K190X is not set
-# CONFIG_FB_SIMPLE is not set
-CONFIG_OMAP2_VRFB=y
-CONFIG_OMAP2_DSS=y
-# 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 is not set
-CONFIG_OMAP4_DSS_HDMI=y
-# CONFIG_OMAP2_DSS_SDI is not set
-# CONFIG_OMAP2_DSS_DSI is not set
-CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
-# CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET is not set
-# CONFIG_OMAP2_DSS_RESET is not set
-CONFIG_FB_OMAP2=y
-CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
-CONFIG_FB_OMAP2_NUM_FBS=3
-
-#
-# OMAP2/3 Display Device Drivers
-#
-# CONFIG_PANEL_GENERIC_DPI is not set
-# CONFIG_PANEL_TFP410 is not set
-CONFIG_PANEL_ILI_9342=y
-# CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set
-# CONFIG_PANEL_PICODLP is not set
-# CONFIG_PANEL_TPO_TD043MTEA1 is not set
+# CONFIG_FB is not set
+# CONFIG_OMAP2_DSS is not set
 # CONFIG_EXYNOS_VIDEO is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 # CONFIG_ADF is not set
-# CONFIG_LOGO is not set
-# CONFIG_FB_SSD1307 is not set
-CONFIG_SOUND=y
-# CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
-CONFIG_SND_COMPRESS_OFFLOAD=y
-CONFIG_SND_JACK=y
-# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_PCM_OSS is not set
-# CONFIG_SND_HRTIMER is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-# CONFIG_SND_RAWMIDI_SEQ is not set
-# CONFIG_SND_OPL3_LIB_SEQ is not set
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-# CONFIG_SND_EMU10K1_SEQ is not set
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_ALOOP is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_MPU401 is not set
-CONFIG_SND_ARM=y
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_UA101 is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_USB_6FIRE is not set
-CONFIG_SND_SOC=y
-CONFIG_SND_SOC_DMAENGINE_PCM=y
-# CONFIG_SND_ATMEL_SOC is not set
-# CONFIG_SND_DESIGNWARE_I2S is not set
-CONFIG_SND_OMAP_SOC=y
-# CONFIG_SND_OMAP_SOC_C55 is not set
-CONFIG_SND_OMAP_SOC_MCBSP=y
-CONFIG_SND_OMAP_SOC_OMAP3_H1=y
-# CONFIG_SND_OMAP_SOC_OMAP_HDMI is not set
-CONFIG_SND_SOC_I2C_AND_SPI=y
-# CONFIG_SND_SOC_ALL_CODECS is not set
-CONFIG_SND_SOC_DMIC=y
-# CONFIG_SND_SIMPLE_CARD is not set
-# CONFIG_SOUND_PRIME is not set
+# CONFIG_SOUND is not set
 
 #
 # HID support
@@ -1880,7 +1459,6 @@ CONFIG_HID_GENERIC=y
 # CONFIG_HID_BELKIN is not set
 # CONFIG_HID_CHERRY is not set
 # CONFIG_HID_CHICONY is not set
-# CONFIG_HID_PRODIKEYS is not set
 # CONFIG_HID_CYPRESS is not set
 # CONFIG_HID_DRAGONRISE is not set
 # CONFIG_HID_EMS_FF is not set
@@ -1920,10 +1498,7 @@ CONFIG_HID_GENERIC=y
 # CONFIG_HID_SMARTJOYPLUS is not set
 # CONFIG_HID_TIVO is not set
 # CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_THINGM is not set
 # CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_WIIMOTE is not set
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
 # CONFIG_HID_SENSOR_HUB is not set
@@ -1957,18 +1532,14 @@ CONFIG_USB_DEFAULT_PERSIST=y
 # CONFIG_USB_OTG is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_MON=y
+# CONFIG_USB_MON is not set
 # CONFIG_USB_WUSB_CBAF is not set
 
 #
 # USB Host Controller Drivers
 #
 # CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-CONFIG_USB_EHCI_HCD_OMAP=y
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+# CONFIG_USB_EHCI_HCD is not set
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
@@ -1976,14 +1547,7 @@ CONFIG_USB_EHCI_HCD_OMAP=y
 # CONFIG_USB_OHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_R8A66597_HCD is not set
-CONFIG_USB_MUSB_HDRC=y
-# CONFIG_USB_MUSB_TUSB6010 is not set
-CONFIG_USB_MUSB_OMAP2PLUS=y
-# CONFIG_USB_MUSB_AM35X is not set
-# CONFIG_USB_MUSB_DSPS is not set
-# CONFIG_USB_MUSB_UX500 is not set
-# CONFIG_USB_INVENTRA_DMA is not set
-CONFIG_MUSB_PIO_ONLY=y
+# CONFIG_USB_MUSB_HDRC is not set
 # CONFIG_USB_RENESAS_USBHS is not set
 
 #
@@ -2030,7 +1594,6 @@ CONFIG_MUSB_PIO_ONLY=y
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
 # CONFIG_USB_IOWARRIOR is not set
@@ -2039,21 +1602,8 @@ CONFIG_MUSB_PIO_ONLY=y
 # CONFIG_USB_YUREX is not set
 # CONFIG_USB_EZUSB_FX2 is not set
 # CONFIG_USB_HSIC_USB3503 is not set
-CONFIG_USB_PHY=y
+# CONFIG_USB_PHY is not set
 # CONFIG_USB_OTG_WAKELOCK is not set
-CONFIG_NOP_USB_XCEIV=y
-# CONFIG_OMAP_CONTROL_USB is not set
-# CONFIG_OMAP_USB2 is not set
-# CONFIG_OMAP_USB3 is not set
-# CONFIG_SAMSUNG_USBPHY is not set
-# CONFIG_SAMSUNG_USB2PHY is not set
-# CONFIG_SAMSUNG_USB3PHY is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_ISP1301 is not set
-# CONFIG_USB_RCAR_PHY is not set
-CONFIG_USB_ULPI=y
-# CONFIG_USB_TUSB is not set
-# CONFIG_CPCAP_USB is not set
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -2069,13 +1619,11 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_PXA27X is not set
 # CONFIG_USB_MV_UDC is not set
 # CONFIG_USB_MV_U3D is not set
-CONFIG_USB_GADGET_MUSB_HDRC=y
 # CONFIG_USB_M66592 is not set
 # CONFIG_USB_NET2272 is not set
 # CONFIG_USB_DUMMY_HCD is not set
 CONFIG_USB_LIBCOMPOSITE=y
 # CONFIG_USB_ZERO is not set
-# CONFIG_USB_AUDIO is not set
 CONFIG_USB_ETH=y
 CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_ETH_EEM is not set
@@ -2084,7 +1632,6 @@ CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_FUNCTIONFS is not set
 # CONFIG_USB_MASS_STORAGE is not set
 # CONFIG_USB_G_SERIAL is not set
-# CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_G_PRINTER is not set
 # CONFIG_USB_G_ANDROID is not set
 # CONFIG_USB_CDC_COMPOSITE is not set
@@ -2094,37 +1641,7 @@ CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_G_DBGP is not set
 # CONFIG_MMC is not set
 # CONFIG_MEMSTICK is not set
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-CONFIG_LEDS_LM3530=y
-# CONFIG_LEDS_LM3535 is not set
-# CONFIG_LEDS_LM3642 is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_GPIO is not set
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_LP5523 is not set
-# CONFIG_LEDS_LP5562 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_PCA9633 is not set
-# CONFIG_LEDS_DAC124S085 is not set
-# CONFIG_LEDS_REGULATOR is not set
-# CONFIG_LEDS_BD2802 is not set
-# CONFIG_LEDS_LT3593 is not set
-# CONFIG_LEDS_RENESAS_TPU is not set
-# CONFIG_LEDS_TCA6507 is not set
-# CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_BLINKM is not set
-
-#
-# LED Triggers
-#
-# CONFIG_LEDS_TRIGGERS is not set
+# CONFIG_NEW_LEDS is not set
 # CONFIG_SWITCH is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_EDAC is not set
@@ -2230,10 +1747,7 @@ CONFIG_DMA_OF=y
 # CONFIG_ASYNC_TX_DMA is not set
 # CONFIG_DMATEST is not set
 # CONFIG_AUXDISPLAY is not set
-CONFIG_UIO=y
-CONFIG_UIO_PDRV=y
-CONFIG_UIO_PDRV_GENIRQ=y
-# CONFIG_UIO_DMEM_GENIRQ is not set
+# CONFIG_UIO is not set
 # CONFIG_VFIO is not set
 # CONFIG_VIRT_DRIVERS is not set
 
@@ -2251,7 +1765,6 @@ CONFIG_STAGING=y
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 # CONFIG_TRANZPORT is not set
-# CONFIG_LINE6_USB is not set
 
 #
 # IIO staging drivers
@@ -2351,7 +1864,7 @@ CONFIG_STAGING=y
 # CONFIG_IIO_GPIO_TRIGGER is not set
 # CONFIG_IIO_SYSFS_TRIGGER is not set
 CONFIG_INV_MPU_IIO=y
-CONFIG_OLIO_TAP_ENABLE=y
+# CONFIG_OLIO_TAP_ENABLE is not set
 # CONFIG_INV_IIO_MPU3050_ACCEL_SLAVE_BMA250 is not set
 # CONFIG_DTS_INV_MPU_IIO is not set
 # CONFIG_IIO_SIMPLE_DUMMY is not set
@@ -2401,9 +1914,7 @@ CONFIG_COMMON_CLK_DEBUG=y
 #
 # Hardware Spinlock drivers
 #
-CONFIG_CLKSRC_OF=y
 CONFIG_CLKSRC_MMIO=y
-CONFIG_ARM_ARCH_TIMER=y
 # CONFIG_MAILBOX is not set
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
@@ -2423,7 +1934,7 @@ CONFIG_OMAP_IOMMU_DEBUG=y
 # CONFIG_PM_DEVFREQ is not set
 # CONFIG_EXTCON is not set
 CONFIG_MEMORY=y
-# CONFIG_TI_EMIF is not set
+CONFIG_TI_EMIF=y
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y
 # CONFIG_IIO_BUFFER_CB is not set
@@ -2536,7 +2047,7 @@ CONFIG_DCACHE_WORD_ACCESS=y
 # CONFIG_FS_POSIX_ACL is not set
 CONFIG_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
+# CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY_USER=y
 # CONFIG_FANOTIFY is not set
 # CONFIG_QUOTA is not set
@@ -2725,6 +2236,9 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_PROVE_RCU_DELAY is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
+CONFIG_RCU_CPU_STALL_VERBOSE=y
+# CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_RCU_TRACE is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
@@ -2756,26 +2270,9 @@ CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_ARM_UNWIND is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_RODATA is not set
-CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_OMAP2PLUS_UART=y
-# CONFIG_DEBUG_ICEDCC is not set
-# CONFIG_DEBUG_SEMIHOSTING is not set
-# CONFIG_DEBUG_OMAP2UART1 is not set
-# CONFIG_DEBUG_OMAP2UART2 is not set
-# CONFIG_DEBUG_OMAP2UART3 is not set
-CONFIG_DEBUG_OMAP3UART3=y
-# CONFIG_DEBUG_OMAP4UART3 is not set
-# CONFIG_DEBUG_OMAP3UART4 is not set
-# CONFIG_DEBUG_OMAP4UART4 is not set
-# CONFIG_DEBUG_TI81XXUART1 is not set
-# CONFIG_DEBUG_TI81XXUART2 is not set
-# CONFIG_DEBUG_TI81XXUART3 is not set
-# CONFIG_DEBUG_AM33XXUART1 is not set
-# CONFIG_DEBUG_ZOOM_UART is not set
-CONFIG_DEBUG_LL_INCLUDE="debug/omap2plus.S"
+# CONFIG_DEBUG_LL is not set
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
-CONFIG_EARLY_PRINTK=y
-CONFIG_EARLY_PRINTK_DIRECT=y
 # CONFIG_PID_IN_CONTEXTIDR is not set
 
 #
@@ -2893,9 +2390,7 @@ CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_USER_API_HASH is not set
 # CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_OMAP_SHAM is not set
-# CONFIG_CRYPTO_DEV_OMAP_AES is not set
+# CONFIG_CRYPTO_HW is not set
 # CONFIG_BINARY_PRINTF is not set
 
 #
@@ -2936,10 +2431,6 @@ CONFIG_DECOMPRESS_GZIP=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_BCH=y
 CONFIG_BCH_CONST_PARAMS=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=y
-CONFIG_TEXTSEARCH_BM=y
-CONFIG_TEXTSEARCH_FSM=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
@@ -2948,5 +2439,5 @@ CONFIG_NLATTR=y
 CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_AVERAGE=y
 # CONFIG_CORDIC is not set
-# CONFIG_DDR is not set
+CONFIG_DDR=y
 # CONFIG_VIRTUALIZATION is not set
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c
index baa6f9561f1..610efcc5c71 100644
--- a/arch/arm/mach-omap2/board-omap3h1.c
+++ b/arch/arm/mach-omap2/board-omap3h1.c
@@ -1206,9 +1206,11 @@ static void __init omap3_h1_init(void)
 
 	omap3h1_spi_init();
 
+#if 0
 	omap_serial_board_init(omap_uart_ports);
 
     omap_display_init(&omap3h1_dss_data);
+#endif
 
 	usb_bind_phy("musb-hdrc.0.auto", 0, "nop_usb_xceiv"); /* "tusb-usb-h1" */