diff --git a/patch.sh b/patch.sh
index 633cd50ff8c81a2079221d1bf371a8c9c840042a..a0d18ff56bfebe099655fcc56aa4291e46adca46 100644
--- a/patch.sh
+++ b/patch.sh
@@ -123,7 +123,7 @@ lts44_backports () {
 		exit 2
 	fi
 
-	is_44="enable"
+	#is_44="enable"
 	if [ "x${is_44}" = "xenable" ] ; then
 		echo "dir: lts44_backports/fixes"
 		#4.5.0-rc0
@@ -298,7 +298,7 @@ bbb_overlays () {
 		exit 2
 	fi
 
-	is_44="enable"
+	#is_44="enable"
 	if [ "x${is_44}" = "xenable" ] ; then
 		#(< 4.5.0-rc0)
 		${git} "${DIR}/patches/bbb_overlays/configfs/0001-configfs-implement-binary-attributes.patch"
@@ -315,7 +315,7 @@ bbb_overlays () {
 		exit 2
 	fi
 
-	is_44="enable"
+	#is_44="enable"
 	if [ "x${is_44}" = "xenable" ] ; then
 		#(< 4.5.0-rc0)
 		${git} "${DIR}/patches/bbb_overlays/of/0001-drivers-of-Export-OF-changeset-functions.patch"
@@ -712,7 +712,7 @@ pru_rpmsg
 bbb_overlays
 beaglebone
 quieter
-sgx
+#sgx
 
 packaging () {
 	echo "dir: packaging"
diff --git a/patches/bbb_overlays/0009-of-Custom-printk-format-specifier-for-device-node.patch b/patches/bbb_overlays/0009-of-Custom-printk-format-specifier-for-device-node.patch
index 197d546a08d20bd9f78f853610b94b924e40b1ae..270729b7d7a4e077d0694441be10baace4aa0363 100644
--- a/patches/bbb_overlays/0009-of-Custom-printk-format-specifier-for-device-node.patch
+++ b/patches/bbb_overlays/0009-of-Custom-printk-format-specifier-for-device-node.patch
@@ -25,10 +25,10 @@ Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
  2 files changed, 179 insertions(+), 1 deletion(-)
 
 diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt
-index b784c27..5bf7026 100644
+index 6389551..1993652 100644
 --- a/Documentation/printk-formats.txt
 +++ b/Documentation/printk-formats.txt
-@@ -309,10 +309,40 @@ Command from struct task_struct
+@@ -315,10 +315,40 @@ Command from struct task_struct
  
  	Passed by reference.
  
@@ -71,7 +71,7 @@ index b784c27..5bf7026 100644
  
  
 diff --git a/lib/vsprintf.c b/lib/vsprintf.c
-index f9cee8e..ec60e5c 100644
+index ac3f947..cc6c5e2 100644
 --- a/lib/vsprintf.c
 +++ b/lib/vsprintf.c
 @@ -31,6 +31,7 @@
@@ -79,10 +79,10 @@ index f9cee8e..ec60e5c 100644
  #include <linux/cred.h>
  #include <net/addrconf.h>
 +#include <linux/of.h>
- 
- #include <asm/page.h>		/* for PAGE_SIZE */
- #include <asm/sections.h>	/* for dereference_function_descriptor() */
-@@ -1361,6 +1362,141 @@ char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec,
+ #ifdef CONFIG_BLOCK
+ #include <linux/blkdev.h>
+ #endif
+@@ -1384,6 +1385,141 @@ char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec,
  	}
  }
  
@@ -224,7 +224,7 @@ index f9cee8e..ec60e5c 100644
  int kptr_restrict __read_mostly;
  
  /*
-@@ -1448,6 +1584,16 @@ int kptr_restrict __read_mostly;
+@@ -1472,6 +1608,16 @@ int kptr_restrict __read_mostly;
   * - 'Cn' For a clock, it prints the name (Common Clock Framework) or address
   *        (legacy clock framework) of the clock
   * - 'Cr' For a clock, it prints the current rate of the clock
@@ -241,15 +241,15 @@ index f9cee8e..ec60e5c 100644
   *
   * ** Please update also Documentation/printk-formats.txt when making changes **
   *
-@@ -1600,6 +1746,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -1624,6 +1770,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
  		return dentry_name(buf, end,
  				   ((const struct file *)ptr)->f_path.dentry,
  				   spec, fmt);
 +	case 'O':
 +		return device_node_string(buf, end, ptr, spec, fmt);
- 	}
- 	spec.flags |= SMALL;
- 	if (spec.field_width == -1) {
+ #ifdef CONFIG_BLOCK
+ 	case 'g':
+ 		return bdev_name(buf, end, ptr, spec, fmt);
 -- 
 2.6.4
 
diff --git a/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch b/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch
index 079dba2a741ffbe7c6dd4d17ec01cb70367b6d8c..f8ea56fa38fa791b58889db915bf5d7dba9e57cd 100644
--- a/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch
+++ b/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch
@@ -1,308 +1,48 @@
-From 8de146556b57f66598d714af29fb27a47e37956d Mon Sep 17 00:00:00 2001
+From 90214addc224f34968377f6579acc9351a20d023 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 22 Jan 2016 12:32:57 -0600
+Date: Fri, 22 Jan 2016 11:53:31 -0600
 Subject: [PATCH] sync: am335x-peripheral/pinmux
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
- .../boot/dts/am335x-bone-common-no-capemgr.dtsi    |   6 +-
- arch/arm/boot/dts/am335x-bone-common.dtsi          | 124 +++++++++++----------
- arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi   |  18 +++
+ arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi   |  18 ++++
  arch/arm/boot/dts/am335x-bone-pinmux-can1.dtsi     |  45 ++++++++
  arch/arm/boot/dts/am335x-bone-pinmux-emmc.dtsi     |  88 +++++++++++++++
  arch/arm/boot/dts/am335x-bone-pinmux-i2c2.dtsi     |  45 ++++++++
- arch/arm/boot/dts/am335x-bone-pinmux-ttyS5.dtsi    |  48 ++++++++
- arch/arm/boot/dts/am335x-bonegreen-wl1835.dtsi     |   9 +-
+ arch/arm/boot/dts/am335x-bone-pinmux-nxp-hdmi.dtsi | 120 +++++++++++++++++++++
+ arch/arm/boot/dts/am335x-bone-pinmux-spi0.dtsi     |  51 +++++++++
+ arch/arm/boot/dts/am335x-bone-pinmux-spi1.dtsi     |  27 +++++
+ arch/arm/boot/dts/am335x-bone-pinmux-spi1a.dtsi    |  28 +++++
+ arch/arm/boot/dts/am335x-bone-pinmux-ttyS5.dtsi    |  48 +++++++++
  arch/arm/boot/dts/am335x-cape-rtc-ds1307.dtsi      |  31 ++++++
  arch/arm/boot/dts/am335x-peripheral-can1.dtsi      |  13 +++
  arch/arm/boot/dts/am335x-peripheral-emmc.dtsi      |  15 +++
  arch/arm/boot/dts/am335x-peripheral-i2c2.dtsi      |  13 +++
+ arch/arm/boot/dts/am335x-peripheral-nxp-hdmi.dtsi  |  29 +++++
+ arch/arm/boot/dts/am335x-peripheral-spi0.dtsi      |  13 +++
+ arch/arm/boot/dts/am335x-peripheral-spi1.dtsi      |  13 +++
+ arch/arm/boot/dts/am335x-peripheral-spi1a.dtsi     |  13 +++
  arch/arm/boot/dts/am335x-peripheral-ttyS5.dtsi     |  13 +++
- 13 files changed, 401 insertions(+), 67 deletions(-)
+ 18 files changed, 623 insertions(+)
  create mode 100644 arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi
  create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-can1.dtsi
  create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-emmc.dtsi
  create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-i2c2.dtsi
+ create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-nxp-hdmi.dtsi
+ create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-spi0.dtsi
+ create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-spi1.dtsi
+ create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-spi1a.dtsi
  create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-ttyS5.dtsi
  create mode 100644 arch/arm/boot/dts/am335x-cape-rtc-ds1307.dtsi
  create mode 100644 arch/arm/boot/dts/am335x-peripheral-can1.dtsi
  create mode 100644 arch/arm/boot/dts/am335x-peripheral-emmc.dtsi
  create mode 100644 arch/arm/boot/dts/am335x-peripheral-i2c2.dtsi
+ create mode 100644 arch/arm/boot/dts/am335x-peripheral-nxp-hdmi.dtsi
+ create mode 100644 arch/arm/boot/dts/am335x-peripheral-spi0.dtsi
+ create mode 100644 arch/arm/boot/dts/am335x-peripheral-spi1.dtsi
+ create mode 100644 arch/arm/boot/dts/am335x-peripheral-spi1a.dtsi
  create mode 100644 arch/arm/boot/dts/am335x-peripheral-ttyS5.dtsi
 
-diff --git a/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi b/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
-index f440182..13abd11 100644
---- a/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
-+++ b/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
-@@ -323,15 +323,11 @@
- 	phy-mode = "mii";
- };
- 
--&cpsw_emac1 {
--	phy_id = <&davinci_mdio>, <1>;
--	phy-mode = "mii";
--};
--
- &mac {
- 	pinctrl-names = "default", "sleep";
- 	pinctrl-0 = <&cpsw_default>;
- 	pinctrl-1 = <&cpsw_sleep>;
-+	slaves = <1>;
- 	status = "okay";
- };
- 
-diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 587a8d2..e124e88 100644
---- a/arch/arm/boot/dts/am335x-bone-common.dtsi
-+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -67,37 +67,37 @@
- 
- 	user_leds_s0: user_leds_s0 {
- 		pinctrl-single,pins = <
--			0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a5.gpio1_21 */
--			0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a6.gpio1_22 */
--			0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a7.gpio1_23 */
--			0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a8.gpio1_24 */
-+			AM33XX_IOPAD(0x854, PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a5.gpio1_21 */
-+			AM33XX_IOPAD(0x858, PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a6.gpio1_22 */
-+			AM33XX_IOPAD(0x85c, PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a7.gpio1_23 */
-+			AM33XX_IOPAD(0x860, PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a8.gpio1_24 */
- 		>;
- 	};
- 
- 	i2c0_pins: pinmux_i2c0_pins {
- 		pinctrl-single,pins = <
--			0x188 (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_sda.i2c0_sda */
--			0x18c (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_scl.i2c0_scl */
-+			AM33XX_IOPAD(0x988, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_sda.i2c0_sda */
-+			AM33XX_IOPAD(0x98c, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_scl.i2c0_scl */
- 		>;
- 	};
- 
- 	i2c2_pins: pinmux_i2c2_pins {
- 		pinctrl-single,pins = <
--			0x178 (PIN_INPUT_PULLUP | MUX_MODE3)	/* uart1_ctsn.i2c2_sda */
--			0x17c (PIN_INPUT_PULLUP | MUX_MODE3)	/* uart1_rtsn.i2c2_scl */
-+			AM33XX_IOPAD(0x978, PIN_INPUT_PULLUP | MUX_MODE3)	/* uart1_ctsn.i2c2_sda */
-+			AM33XX_IOPAD(0x97c, PIN_INPUT_PULLUP | MUX_MODE3)	/* uart1_rtsn.i2c2_scl */
- 		>;
- 	};
- 
- 	uart0_pins: pinmux_uart0_pins {
- 		pinctrl-single,pins = <
--			0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */
--			0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */
-+			AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */
-+			AM33XX_IOPAD(0x974, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */
- 		>;
- 	};
- 
- 	clkout2_pin: pinmux_clkout2_pin {
- 		pinctrl-single,pins = <
--			0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
-+			AM33XX_IOPAD(0x9b4, PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
- 		>;
- 	};
- 
-@@ -106,19 +106,19 @@
- 			/* Slave 1 */
- 			0x108 (PIN_INPUT | MUX_MODE0)		/* mii1_col.mii1_col */
- 			0x10c (PIN_INPUT | MUX_MODE0)		/* mii1_crs.mii1_crs */
--			0x110 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxerr.mii1_rxerr */
--			0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txen.mii1_txen */
--			0x118 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxdv.mii1_rxdv */
--			0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd3.mii1_txd3 */
--			0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd2.mii1_txd2 */
--			0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd1.mii1_txd1 */
--			0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd0.mii1_txd0 */
--			0x12c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_txclk.mii1_txclk */
--			0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxclk.mii1_rxclk */
--			0x134 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd3.mii1_rxd3 */
--			0x138 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd2.mii1_rxd2 */
--			0x13c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd1.mii1_rxd1 */
--			0x140 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd0.mii1_rxd0 */
-+			AM33XX_IOPAD(0x910, PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxerr.mii1_rxerr */
-+			AM33XX_IOPAD(0x914, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txen.mii1_txen */
-+			AM33XX_IOPAD(0x918, PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxdv.mii1_rxdv */
-+			AM33XX_IOPAD(0x91c, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd3.mii1_txd3 */
-+			AM33XX_IOPAD(0x920, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd2.mii1_txd2 */
-+			AM33XX_IOPAD(0x924, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd1.mii1_txd1 */
-+			AM33XX_IOPAD(0x928, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd0.mii1_txd0 */
-+			AM33XX_IOPAD(0x92c, PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_txclk.mii1_txclk */
-+			AM33XX_IOPAD(0x930, PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxclk.mii1_rxclk */
-+			AM33XX_IOPAD(0x934, PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd3.mii1_rxd3 */
-+			AM33XX_IOPAD(0x938, PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd2.mii1_rxd2 */
-+			AM33XX_IOPAD(0x93c, PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd1.mii1_rxd1 */
-+			AM33XX_IOPAD(0x940, PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd0.mii1_rxd0 */
- 		>;
- 	};
- 
-@@ -127,56 +127,56 @@
- 			/* Slave 1 reset value */
- 			0x108 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 			0x10c (PIN_INPUT_PULLDOWN | MUX_MODE7)
--			0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--			0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--			0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--			0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
--			0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--			0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--			0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--			0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
--			0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--			0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--			0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--			0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
--			0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-+			AM33XX_IOPAD(0x910, PIN_INPUT_PULLDOWN | MUX_MODE7)
-+			AM33XX_IOPAD(0x914, PIN_INPUT_PULLDOWN | MUX_MODE7)
-+			AM33XX_IOPAD(0x918, PIN_INPUT_PULLDOWN | MUX_MODE7)
-+			AM33XX_IOPAD(0x91c, PIN_INPUT_PULLDOWN | MUX_MODE7)
-+			AM33XX_IOPAD(0x920, PIN_INPUT_PULLDOWN | MUX_MODE7)
-+			AM33XX_IOPAD(0x924, PIN_INPUT_PULLDOWN | MUX_MODE7)
-+			AM33XX_IOPAD(0x928, PIN_INPUT_PULLDOWN | MUX_MODE7)
-+			AM33XX_IOPAD(0x92c, PIN_INPUT_PULLDOWN | MUX_MODE7)
-+			AM33XX_IOPAD(0x930, PIN_INPUT_PULLDOWN | MUX_MODE7)
-+			AM33XX_IOPAD(0x934, PIN_INPUT_PULLDOWN | MUX_MODE7)
-+			AM33XX_IOPAD(0x938, PIN_INPUT_PULLDOWN | MUX_MODE7)
-+			AM33XX_IOPAD(0x93c, PIN_INPUT_PULLDOWN | MUX_MODE7)
-+			AM33XX_IOPAD(0x940, PIN_INPUT_PULLDOWN | MUX_MODE7)
- 		>;
- 	};
- 
- 	davinci_mdio_default: davinci_mdio_default {
- 		pinctrl-single,pins = <
- 			/* MDIO */
--			0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)	/* mdio_data.mdio_data */
--			0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)			/* mdio_clk.mdio_clk */
-+			AM33XX_IOPAD(0x948, PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)	/* mdio_data.mdio_data */
-+			AM33XX_IOPAD(0x94c, PIN_OUTPUT_PULLUP | MUX_MODE0)			/* mdio_clk.mdio_clk */
- 		>;
- 	};
- 
- 	davinci_mdio_sleep: davinci_mdio_sleep {
- 		pinctrl-single,pins = <
- 			/* MDIO reset value */
--			0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--			0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-+			AM33XX_IOPAD(0x948, PIN_INPUT_PULLDOWN | MUX_MODE7)
-+			AM33XX_IOPAD(0x94c, PIN_INPUT_PULLDOWN | MUX_MODE7)
- 		>;
- 	};
- 
- 	mmc1_pins: pinmux_mmc1_pins {
- 		pinctrl-single,pins = <
--			0x160 (PIN_INPUT | MUX_MODE7) /* GPIO0_6 */
-+			AM33XX_IOPAD(0x960, PIN_INPUT | MUX_MODE7) /* GPIO0_6 */
- 		>;
- 	};
- 
- 	emmc_pins: pinmux_emmc_pins {
- 		pinctrl-single,pins = <
--			0x80 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn1.mmc1_clk */
--			0x84 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn2.mmc1_cmd */
--			0x00 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad0.mmc1_dat0 */
--			0x04 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad1.mmc1_dat1 */
--			0x08 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad2.mmc1_dat2 */
--			0x0c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad3.mmc1_dat3 */
--			0x10 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad4.mmc1_dat4 */
--			0x14 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad5.mmc1_dat5 */
--			0x18 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad6.mmc1_dat6 */
--			0x1c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */
-+			AM33XX_IOPAD(0x880, PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn1.mmc1_clk */
-+			AM33XX_IOPAD(0x884, PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn2.mmc1_cmd */
-+			AM33XX_IOPAD(0x800, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad0.mmc1_dat0 */
-+			AM33XX_IOPAD(0x804, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad1.mmc1_dat1 */
-+			AM33XX_IOPAD(0x808, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad2.mmc1_dat2 */
-+			AM33XX_IOPAD(0x80c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad3.mmc1_dat3 */
-+			AM33XX_IOPAD(0x810, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad4.mmc1_dat4 */
-+			AM33XX_IOPAD(0x814, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad5.mmc1_dat5 */
-+			AM33XX_IOPAD(0x818, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad6.mmc1_dat6 */
-+			AM33XX_IOPAD(0x81c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */
- 		>;
- 	};
- };
-@@ -289,10 +289,8 @@
- 	};
- };
- 
--
--/include/ "tps65217.dtsi"
--
- &tps {
-+	compatible = "ti,tps65217";
- 	/*
- 	 * Configure pmic to enter OFF-state instead of SLEEP-state ("RTC-only
- 	 * mode") at poweroff.  Most BeagleBone versions do not support RTC-only
-@@ -316,12 +314,17 @@
- 	interrupts = <7>;	/* NNMI */
- 
- 	regulators {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
- 		dcdc1_reg: regulator@0 {
-+			reg = <0>;
- 			regulator-name = "vdds_dpr";
- 			regulator-always-on;
- 		};
- 
- 		dcdc2_reg: regulator@1 {
-+			reg = <1>;
- 			/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
- 			regulator-name = "vdd_mpu";
- 			regulator-min-microvolt = <925000>;
-@@ -331,6 +334,7 @@
- 		};
- 
- 		dcdc3_reg: regulator@2 {
-+			reg = <2>;
- 			/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
- 			regulator-name = "vdd_core";
- 			regulator-min-microvolt = <925000>;
-@@ -340,21 +344,25 @@
- 		};
- 
- 		ldo1_reg: regulator@3 {
-+			reg = <3>;
- 			regulator-name = "vio,vrtc,vdds";
- 			regulator-always-on;
- 		};
- 
- 		ldo2_reg: regulator@4 {
-+			reg = <4>;
- 			regulator-name = "vdd_3v3aux";
- 			regulator-always-on;
- 		};
- 
- 		ldo3_reg: regulator@5 {
-+			reg = <5>;
- 			regulator-name = "vdd_1v8";
- 			regulator-always-on;
- 		};
- 
- 		ldo4_reg: regulator@6 {
-+			reg = <6>;
- 			regulator-name = "vdd_3v3a";
- 			regulator-always-on;
- 		};
-@@ -366,15 +374,11 @@
- 	phy-mode = "mii";
- };
- 
--&cpsw_emac1 {
--	phy_id = <&davinci_mdio>, <1>;
--	phy-mode = "mii";
--};
--
- &mac {
- 	pinctrl-names = "default", "sleep";
- 	pinctrl-0 = <&cpsw_default>;
- 	pinctrl-1 = <&cpsw_sleep>;
-+	slaves = <1>;
- 	status = "okay";
- };
- 
 diff --git a/arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi b/arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi
 new file mode 100644
 index 0000000..7d8f673
@@ -523,6 +263,256 @@ index 0000000..abf3b57
 +&i2c2 {
 +	pinctrl-0 = <&i2c2_pins>;
 +};
+diff --git a/arch/arm/boot/dts/am335x-bone-pinmux-nxp-hdmi.dtsi b/arch/arm/boot/dts/am335x-bone-pinmux-nxp-hdmi.dtsi
+new file mode 100644
+index 0000000..5205fa0
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-bone-pinmux-nxp-hdmi.dtsi
+@@ -0,0 +1,120 @@
++/*
++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include "am335x-peripheral-nxp-hdmi.dtsi"
++
++/* cape universal */
++
++/*
++ *&ocp {
++ *	P8_27_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_28_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_29_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_30_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_31_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_32_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_33_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_34_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_35_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_36_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_37_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_38_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_39_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_40_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_41_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_42_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_43_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_44_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_45_pinmux {
++ *		state = "disabled";
++ *	};
++ *	P8_46_pinmux {
++ *		state = "disabled";
++ *	};
++ *};
++ */
++
++/* standard */
++
++&am33xx_pinmux {
++	nxp_hdmi_pins: pinmux_nxp_hdmi_pins {
++		pinctrl-single,pins = <
++			AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr0 */
++			AM33XX_IOPAD(0x8a0, PIN_OUTPUT | MUX_MODE0)		/* lcd_data0.lcd_data0 */
++			AM33XX_IOPAD(0x8a4, PIN_OUTPUT | MUX_MODE0)		/* lcd_data1.lcd_data1 */
++			AM33XX_IOPAD(0x8a8, PIN_OUTPUT | MUX_MODE0)		/* lcd_data2.lcd_data2 */
++			AM33XX_IOPAD(0x8ac, PIN_OUTPUT | MUX_MODE0)		/* lcd_data3.lcd_data3 */
++			AM33XX_IOPAD(0x8b0, PIN_OUTPUT | MUX_MODE0)		/* lcd_data4.lcd_data4 */
++			AM33XX_IOPAD(0x8b4, PIN_OUTPUT | MUX_MODE0)		/* lcd_data5.lcd_data5 */
++			AM33XX_IOPAD(0x8b8, PIN_OUTPUT | MUX_MODE0)		/* lcd_data6.lcd_data6 */
++			AM33XX_IOPAD(0x8bc, PIN_OUTPUT | MUX_MODE0)		/* lcd_data7.lcd_data7 */
++			AM33XX_IOPAD(0x8c0, PIN_OUTPUT | MUX_MODE0)		/* lcd_data8.lcd_data8 */
++			AM33XX_IOPAD(0x8c4, PIN_OUTPUT | MUX_MODE0)		/* lcd_data9.lcd_data9 */
++			AM33XX_IOPAD(0x8c8, PIN_OUTPUT | MUX_MODE0)		/* lcd_data10.lcd_data10 */
++			AM33XX_IOPAD(0x8cc, PIN_OUTPUT | MUX_MODE0)		/* lcd_data11.lcd_data11 */
++			AM33XX_IOPAD(0x8d0, PIN_OUTPUT | MUX_MODE0)		/* lcd_data12.lcd_data12 */
++			AM33XX_IOPAD(0x8d4, PIN_OUTPUT | MUX_MODE0)		/* lcd_data13.lcd_data13 */
++			AM33XX_IOPAD(0x8d8, PIN_OUTPUT | MUX_MODE0)		/* lcd_data14.lcd_data14 */
++			AM33XX_IOPAD(0x8dc, PIN_OUTPUT | MUX_MODE0)		/* lcd_data15.lcd_data15 */
++			AM33XX_IOPAD(0x8e0, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* lcd_vsync.lcd_vsync */
++			AM33XX_IOPAD(0x8e4, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* lcd_hsync.lcd_hsync */
++			AM33XX_IOPAD(0x8e8, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* lcd_pclk.lcd_pclk */
++			AM33XX_IOPAD(0x8ec, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* lcd_ac_bias_en.lcd_ac_bias_en */
++		>;
++	};
++
++	nxp_hdmi_off_pins: nxp_hdmi_off_pins {
++		pinctrl-single,pins = <
++			AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr0 */
++		>;
++	};
++};
++
++&i2c0 {
++	tda19988 {
++		pinctrl-names = "default", "off";
++		pinctrl-0 = <&nxp_hdmi_bonelt_pins>;
++		pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;
++	};
++};
+diff --git a/arch/arm/boot/dts/am335x-bone-pinmux-spi0.dtsi b/arch/arm/boot/dts/am335x-bone-pinmux-spi0.dtsi
+new file mode 100644
+index 0000000..354e66a
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-bone-pinmux-spi0.dtsi
+@@ -0,0 +1,51 @@
++/*
++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <dt-bindings/board/am335x-bbw-bbb-base.h>
++#include "am335x-peripheral-spi0.dtsi"
++
++/* cape universal */
++
++/*
++ *&ocp {
++ *	P9_17_pinmux {
++ *		status = "disabled";
++ *	};
++ *	P9_18_pinmux {
++ *		status = "disabled";
++ *	};
++ *	P9_21_pinmux {
++ *		status = "disabled";
++ *	};
++ *	P9_22_pinmux {
++ *		status = "disabled";
++ *	};
++ *};
++ *
++ *&spi0 {
++ *	pinctrl-0 = <>;
++ *};
++ *
++ */
++
++/* standard */
++
++&am33xx_pinmux {
++	spi0_pins: pinmux_spi0_pins {
++		pinctrl-single,pins = <
++			0x150 (PIN_INPUT_PULLUP | MUX_MODE0)	/* spi0_sclk.spi0_sclk */
++			0x154 (PIN_INPUT_PULLUP | MUX_MODE0)	/* spi0_d0.spi0_d0 */
++			0x158 (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* spi0_d1.spi0_d1 */
++			0x15c (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* spi0_cs0.spi0_cs0 */
++		>;
++	};
++};
++
++&spi0 {
++	pinctrl-0 = <&spi0_pins>;
++};
+diff --git a/arch/arm/boot/dts/am335x-bone-pinmux-spi1.dtsi b/arch/arm/boot/dts/am335x-bone-pinmux-spi1.dtsi
+new file mode 100644
+index 0000000..bff7f8d
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-bone-pinmux-spi1.dtsi
+@@ -0,0 +1,27 @@
++/*
++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <dt-bindings/board/am335x-bbw-bbb-base.h>
++#include "am335x-peripheral-spi1.dtsi"
++
++/* standard */
++
++&am33xx_pinmux {
++	spi1_pins: pinmux_spi1_pins {
++		pinctrl-single,pins = <
++			0x190 0x33	/* mcasp0_aclkx.spi1_sclk, INPUT_PULLUP | MODE3 */
++			0x194 0x33	/* mcasp0_fsx.spi1_d0, INPUT_PULLUP | MODE3 */
++			0x198 0x13	/* mcasp0_axr0.spi1_d1, OUTPUT_PULLUP | MODE3 */
++			0x19c 0x13	/* mcasp0_ahclkr.spi1_cs0, OUTPUT_PULLUP | MODE3 */
++			// 0x164 0x12	/* eCAP0_in_PWM0_out.spi1_cs1 OUTPUT_PULLUP | MODE2 */		>;
++	};
++};
++
++&spi1 {
++	pinctrl-0 = <&spi1_pins>;
++};
+diff --git a/arch/arm/boot/dts/am335x-bone-pinmux-spi1a.dtsi b/arch/arm/boot/dts/am335x-bone-pinmux-spi1a.dtsi
+new file mode 100644
+index 0000000..62874c8
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-bone-pinmux-spi1a.dtsi
+@@ -0,0 +1,28 @@
++/*
++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <dt-bindings/board/am335x-bbw-bbb-base.h>
++#include "am335x-peripheral-spi1.dtsi"
++
++/* standard */
++
++&am33xx_pinmux {
++	spi1a_pins: pinmux_spi1a_pins {
++		pinctrl-single,pins = <
++			0x164 0x34	/* eCAP0_in_PWM0_out.spi1_sclk, INPUT_PULLUP | MODE4 */
++					/* NOTE: P9.42 is connected to two pads */
++			// 0x1A0 0x27	/* set the other pad to gpio input */
++			0x194 0x33	/* mcasp0_fsx.spi1_d0, INPUT_PULLUP | MODE3 */
++			0x198 0x13	/* mcasp0_axr0.spi1_d1, OUTPUT_PULLUP | MODE3 */
++			0x178 0x14	/* uart1_ctsn.spi1_cs0, OUTPUT_PULLUP | MODE4 */		>;
++	};
++};
++
++&spi1 {
++	pinctrl-0 = <&spi1a_pins>;
++};
 diff --git a/arch/arm/boot/dts/am335x-bone-pinmux-ttyS5.dtsi b/arch/arm/boot/dts/am335x-bone-pinmux-ttyS5.dtsi
 new file mode 100644
 index 0000000..01d0aec
@@ -577,27 +567,6 @@ index 0000000..01d0aec
 +&uart5 {
 +	pinctrl-0 = <&uart5_pins>;
 +};
-diff --git a/arch/arm/boot/dts/am335x-bonegreen-wl1835.dtsi b/arch/arm/boot/dts/am335x-bonegreen-wl1835.dtsi
-index 940a6c6..436a63e 100644
---- a/arch/arm/boot/dts/am335x-bonegreen-wl1835.dtsi
-+++ b/arch/arm/boot/dts/am335x-bonegreen-wl1835.dtsi
-@@ -92,9 +92,14 @@
- 	};
- };
- 
-+&edma {
-+	ti,edma-xbar-event-map = /bits/ 16 <1 12 2 13>;
-+};
-+
- &mmc3 {
--	dmas = <&edma_xbar 12 0 1
--		&edma_xbar 13 0 2>;
-+	dmas = <&edma 12
-+		&edma 13>;
-+	dma-names = "tx", "rx";
- 	status = "okay";
- 	//vmmc-supply = <&wlan_en_reg>;
- 	vmmc-supply = <&vmmcsd_fixed>;
 diff --git a/arch/arm/boot/dts/am335x-cape-rtc-ds1307.dtsi b/arch/arm/boot/dts/am335x-cape-rtc-ds1307.dtsi
 new file mode 100644
 index 0000000..bce6ac5
@@ -694,6 +663,98 @@ index 0000000..ed9a0b5
 +
 +	status = "okay";
 +};
+diff --git a/arch/arm/boot/dts/am335x-peripheral-nxp-hdmi.dtsi b/arch/arm/boot/dts/am335x-peripheral-nxp-hdmi.dtsi
+new file mode 100644
+index 0000000..1dfd26a
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-peripheral-nxp-hdmi.dtsi
+@@ -0,0 +1,29 @@
++/*
++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++&lcdc {
++	status = "okay";
++	port {
++		lcdc_0: endpoint@0 {
++			remote-endpoint = <&hdmi_0>;
++		};
++	};
++};
++
++&i2c0 {
++	tda19988 {
++		compatible = "nxp,tda998x";
++		reg = <0x70>;
++
++		port {
++			hdmi_0: endpoint@0 {
++				remote-endpoint = <&lcdc_0>;
++			};
++		};
++	};
++};
+diff --git a/arch/arm/boot/dts/am335x-peripheral-spi0.dtsi b/arch/arm/boot/dts/am335x-peripheral-spi0.dtsi
+new file mode 100644
+index 0000000..969e352
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-peripheral-spi0.dtsi
+@@ -0,0 +1,13 @@
++/*
++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++&spi0 {
++	pinctrl-names = "default";
++
++	status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am335x-peripheral-spi1.dtsi b/arch/arm/boot/dts/am335x-peripheral-spi1.dtsi
+new file mode 100644
+index 0000000..ac5fe97
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-peripheral-spi1.dtsi
+@@ -0,0 +1,13 @@
++/*
++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++&spi1 {
++	pinctrl-names = "default";
++
++	status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am335x-peripheral-spi1a.dtsi b/arch/arm/boot/dts/am335x-peripheral-spi1a.dtsi
+new file mode 100644
+index 0000000..ac5fe97
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-peripheral-spi1a.dtsi
+@@ -0,0 +1,13 @@
++/*
++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++&spi1 {
++	pinctrl-names = "default";
++
++	status = "okay";
++};
 diff --git a/arch/arm/boot/dts/am335x-peripheral-ttyS5.dtsi b/arch/arm/boot/dts/am335x-peripheral-ttyS5.dtsi
 new file mode 100644
 index 0000000..8b42fb0
diff --git a/patches/beaglebone/dts/0003-arm-dts-am335x-bone-common-add-collision-and-carrier.patch b/patches/beaglebone/dts/0003-arm-dts-am335x-bone-common-add-collision-and-carrier.patch
index 10ffff44a084b6514a04c167c4d994fedc397357..4aabf8ddb3b74c3986129f039c8c8da83088d84b 100644
--- a/patches/beaglebone/dts/0003-arm-dts-am335x-bone-common-add-collision-and-carrier.patch
+++ b/patches/beaglebone/dts/0003-arm-dts-am335x-bone-common-add-collision-and-carrier.patch
@@ -21,7 +21,7 @@ Signed-off-by: Felipe Balbi <balbi@ti.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 3921ea2..49f773f 100644
+index bfc6e2d..1d78d8e 100644
 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
 +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
 @@ -104,6 +104,8 @@
@@ -30,18 +30,18 @@ index 3921ea2..49f773f 100644
  			/* Slave 1 */
 +			0x108 (PIN_INPUT | MUX_MODE0)		/* mii1_col.mii1_col */
 +			0x10c (PIN_INPUT | MUX_MODE0)		/* mii1_crs.mii1_crs */
- 			0x110 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxerr.mii1_rxerr */
- 			0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txen.mii1_txen */
- 			0x118 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxdv.mii1_rxdv */
+ 			AM33XX_IOPAD(0x910, PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxerr.mii1_rxerr */
+ 			AM33XX_IOPAD(0x914, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txen.mii1_txen */
+ 			AM33XX_IOPAD(0x918, PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxdv.mii1_rxdv */
 @@ -123,6 +125,8 @@
  	cpsw_sleep: cpsw_sleep {
  		pinctrl-single,pins = <
  			/* Slave 1 reset value */
 +			0x108 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +			0x10c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 			0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 			0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 			0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+ 			AM33XX_IOPAD(0x910, PIN_INPUT_PULLDOWN | MUX_MODE7)
+ 			AM33XX_IOPAD(0x914, PIN_INPUT_PULLDOWN | MUX_MODE7)
+ 			AM33XX_IOPAD(0x918, PIN_INPUT_PULLDOWN | MUX_MODE7)
 -- 
 2.7.0.rc3
 
diff --git a/patches/beaglebone/dts/0004-tps65217-Enable-KEY_POWER-press-on-AC-loss-PWR_BUT.patch b/patches/beaglebone/dts/0004-tps65217-Enable-KEY_POWER-press-on-AC-loss-PWR_BUT.patch
index 431fb51c8c248a24062d3c964f317f318529c4a6..ef718c0c4780ac9ec68bc5070a4581f52fa7759d 100644
--- a/patches/beaglebone/dts/0004-tps65217-Enable-KEY_POWER-press-on-AC-loss-PWR_BUT.patch
+++ b/patches/beaglebone/dts/0004-tps65217-Enable-KEY_POWER-press-on-AC-loss-PWR_BUT.patch
@@ -14,10 +14,10 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  3 files changed, 128 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 49f773f..587a8d2 100644
+index 1d78d8e..cdd3a79 100644
 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
 +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -312,6 +312,9 @@
+@@ -310,6 +310,9 @@
  	 */
  	ti,pmic-shutdown-controller;
  
@@ -25,8 +25,8 @@ index 49f773f..587a8d2 100644
 +	interrupts = <7>;	/* NNMI */
 +
  	regulators {
- 		dcdc1_reg: regulator@0 {
- 			regulator-name = "vdds_dpr";
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
 diff --git a/drivers/mfd/tps65217.c b/drivers/mfd/tps65217.c
 index d32b5442..ca19130 100644
 --- a/drivers/mfd/tps65217.c
diff --git a/patches/beaglebone/generated/0001-auto-generated-capes-add-dtbs-to-makefile.patch b/patches/beaglebone/generated/0001-auto-generated-capes-add-dtbs-to-makefile.patch
index 152f19b6347f170160a8ee9130ee9540651a3fa0..c1b3254ec2a9205b25e28535621095ad5d7e3af6 100644
--- a/patches/beaglebone/generated/0001-auto-generated-capes-add-dtbs-to-makefile.patch
+++ b/patches/beaglebone/generated/0001-auto-generated-capes-add-dtbs-to-makefile.patch
@@ -1,6 +1,6 @@
-From a2ddfe64332bd046d519cd384be1d3f0b0a9030e Mon Sep 17 00:00:00 2001
+From c09029b964c6090ce8d8a246971bf94ad8eee91b Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 22 Jan 2016 12:34:24 -0600
+Date: Fri, 22 Jan 2016 11:57:45 -0600
 Subject: [PATCH] auto generated: capes: add dtbs to makefile
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
@@ -9,10 +9,10 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  1 file changed, 15 insertions(+)
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 00d5191..a2c350c 100644
+index c1ddfc6..d599289 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -464,6 +464,21 @@ dtb-$(CONFIG_SOC_AM33XX) += \
+@@ -482,6 +482,21 @@ dtb-$(CONFIG_SOC_AM33XX) += \
  	am335x-base0033.dtb \
  	am335x-bone.dtb \
  	am335x-boneblack.dtb \
@@ -32,8 +32,8 @@ index 00d5191..a2c350c 100644
 +	am335x-boneblack-hdmi-overlay.dtb \
 +	am335x-boneblack-emmc-overlay.dtb \
  	am335x-bonegreen.dtb \
- 	am335x-sl50.dtb \
- 	am335x-evm.dtb \
+ 	am335x-chiliboard.dtb \
+ 	am335x-cm-t335.dtb \
 -- 
 2.7.0.rc3
 
diff --git a/patches/beaglebone/pinmux-helper/0001-BeagleBone-pinmux-helper.patch b/patches/beaglebone/pinmux-helper/0001-BeagleBone-pinmux-helper.patch
index e7f47a35e8c5f15cc7d2d57e1e73baed8d97e234..c1bef9c3fcc4e9d9b06d80f33a5de188a421e5d8 100644
--- a/patches/beaglebone/pinmux-helper/0001-BeagleBone-pinmux-helper.patch
+++ b/patches/beaglebone/pinmux-helper/0001-BeagleBone-pinmux-helper.patch
@@ -50,10 +50,10 @@ Pinmux helper driver.
  create mode 100644 drivers/misc/cape/beaglebone/bone-pinmux-helper.c
 
 diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
-index a3aa0565..67e6d8a 100644
+index f19a219..b96bf50 100644
 --- a/drivers/misc/Kconfig
 +++ b/drivers/misc/Kconfig
-@@ -554,6 +554,7 @@ source "drivers/misc/mei/Kconfig"
+@@ -555,6 +555,7 @@ source "drivers/misc/mei/Kconfig"
  source "drivers/misc/vmw_vmci/Kconfig"
  source "drivers/misc/mic/Kconfig"
  source "drivers/misc/genwqe/Kconfig"
diff --git a/patches/defconfig b/patches/defconfig
index 56c47c87bad83f018a7fa99e612c1023809b70a2..34f30900192178cd6baa352264d7babe87e6d61d 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.0 Kernel Configuration
+# Linux/arm 4.5.0-rc1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -11,7 +11,6 @@ CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_HAVE_PROC_CPU=y
 CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -118,26 +117,25 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
 CONFIG_PAGE_COUNTER=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_SWAP_ENABLED=y
-CONFIG_MEMCG_KMEM=y
-CONFIG_CGROUP_PERF=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
-CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+# CONFIG_CGROUP_DEBUG is not set
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
@@ -215,7 +213,6 @@ CONFIG_KRETPROBES=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
@@ -240,6 +237,10 @@ CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_BITS_MAX=16
+CONFIG_ARCH_MMAP_RND_BITS=8
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
@@ -318,8 +319,6 @@ CONFIG_FREEZER=y
 #
 CONFIG_MMU=y
 CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_GEMINI is not set
 # CONFIG_ARCH_EBSA110 is not set
@@ -331,9 +330,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCH_LPC32XX is not set
@@ -341,7 +337,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C24XX is not set
-# CONFIG_ARCH_S3C64XX is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP1 is not set
 
@@ -407,16 +402,19 @@ CONFIG_SOC_HAS_OMAP2_SDRC=y
 #
 # OMAP Legacy Platform Data Board Type
 #
+# CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_QCOM is not set
+# CONFIG_ARCH_REALVIEW is not set
 # CONFIG_ARCH_ROCKCHIP is not set
 # CONFIG_ARCH_SOCFPGA is not set
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_STI is not set
 # CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_EXYNOS is not set
-# CONFIG_ARCH_SHMOBILE_MULTI is not set
+# CONFIG_ARCH_RENESAS is not set
 # CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_TANGO is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_UNIPHIER is not set
 # CONFIG_ARCH_U8500 is not set
@@ -511,6 +509,7 @@ CONFIG_SCHED_HRTICK=y
 CONFIG_THUMB2_KERNEL=y
 CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
 CONFIG_ARM_ASM_UNIFIED=y
+CONFIG_ARM_PATCH_IDIV=y
 CONFIG_AEABI=y
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
@@ -551,6 +550,7 @@ CONFIG_ZBUD=y
 CONFIG_ZSMALLOC=m
 # CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_FRAME_VECTOR=y
 CONFIG_FORCE_MAX_ZONEORDER=12
@@ -559,6 +559,8 @@ CONFIG_ALIGNMENT_TRAP=y
 CONFIG_SECCOMP=y
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
+# CONFIG_PARAVIRT is not set
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 # CONFIG_XEN is not set
 
 #
@@ -578,6 +580,7 @@ CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_AUTO_ZRELADDR=y
+# CONFIG_EFI is not set
 
 #
 # CPU Power Management
@@ -667,6 +670,7 @@ CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
 
 #
 # Networking options
@@ -722,6 +726,7 @@ CONFIG_INET_LRO=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
+# CONFIG_INET_DIAG_DESTROY is not set
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y
@@ -749,7 +754,7 @@ CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_IPV6_MIP6=y
-CONFIG_IPV6_ILA=m
+# CONFIG_IPV6_ILA is not set
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_TRANSPORT=m
@@ -971,7 +976,7 @@ CONFIG_IP_VS_WRR=m
 CONFIG_IP_VS_LC=m
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
+# CONFIG_IP_VS_OVF is not set
 CONFIG_IP_VS_LBLC=m
 CONFIG_IP_VS_LBLCR=m
 CONFIG_IP_VS_DH=m
@@ -1010,7 +1015,7 @@ CONFIG_NF_NAT_IPV4=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 CONFIG_NF_NAT_MASQUERADE_IPV4=m
 CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_REDIR_IPV4=m
+# CONFIG_NFT_REDIR_IPV4 is not set
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NF_NAT_PPTP=m
@@ -1053,7 +1058,7 @@ CONFIG_NF_NAT_IPV6=m
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 CONFIG_NF_NAT_MASQUERADE_IPV6=m
 CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_REDIR_IPV6=m
+# CONFIG_NFT_REDIR_IPV6 is not set
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1162,6 +1167,7 @@ CONFIG_IPDDP_ENCAP=y
 # CONFIG_LAPB is not set
 CONFIG_PHONET=m
 CONFIG_6LOWPAN=m
+# CONFIG_6LOWPAN_DEBUGFS is not set
 CONFIG_6LOWPAN_NHC=m
 CONFIG_6LOWPAN_NHC_DEST=m
 CONFIG_6LOWPAN_NHC_FRAGMENT=m
@@ -1170,6 +1176,12 @@ CONFIG_6LOWPAN_NHC_IPV6=m
 CONFIG_6LOWPAN_NHC_MOBILITY=m
 CONFIG_6LOWPAN_NHC_ROUTING=m
 CONFIG_6LOWPAN_NHC_UDP=m
+# CONFIG_6LOWPAN_GHC_EXT_HDR_HOP is not set
+# CONFIG_6LOWPAN_GHC_UDP is not set
+# CONFIG_6LOWPAN_GHC_ICMPV6 is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_DEST is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE is not set
 CONFIG_IEEE802154=m
 # CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
 CONFIG_IEEE802154_SOCKET=m
@@ -1266,10 +1278,10 @@ CONFIG_NETLINK_DIAG=m
 CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=y
 CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_HSR=m
+# CONFIG_HSR is not set
 # CONFIG_NET_SWITCHDEV is not set
 # CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_SOCK_CGROUP_DATA=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
@@ -1441,11 +1453,13 @@ CONFIG_NFC_PN544_I2C=m
 CONFIG_NFC_MICROREAD=m
 CONFIG_NFC_MICROREAD_I2C=m
 # CONFIG_NFC_MRVL_USB is not set
-# CONFIG_NFC_ST21NFCA is not set
-# CONFIG_NFC_ST_NCI is not set
+# CONFIG_NFC_ST21NFCA_I2C is not set
+# CONFIG_NFC_ST_NCI_I2C is not set
+# CONFIG_NFC_ST_NCI_SPI is not set
 # CONFIG_NFC_NXP_NCI is not set
 # CONFIG_NFC_S3FWRN5_I2C is not set
-CONFIG_LWTUNNEL=y
+# CONFIG_NFC_ST95HF is not set
+# CONFIG_LWTUNNEL is not set
 CONFIG_HAVE_BPF_JIT=y
 
 #
@@ -1605,6 +1619,7 @@ CONFIG_MTD_LPDDR=m
 CONFIG_MTD_QINFO_PROBE=m
 # CONFIG_MTD_LPDDR2_NVM is not set
 CONFIG_MTD_SPI_NOR=m
+# CONFIG_MTD_MT81xx_NOR is not set
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
@@ -1777,6 +1792,7 @@ CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
+# CONFIG_SCSI_HISI_SAS is not set
 CONFIG_SCSI_UFSHCD=m
 # CONFIG_SCSI_UFSHCD_PLATFORM is not set
 CONFIG_LIBFC=m
@@ -1845,9 +1861,9 @@ CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_MQ_DEFAULT is not set
 # CONFIG_DM_DEBUG is not set
 CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 CONFIG_DM_BIO_PRISON=m
 CONFIG_DM_PERSISTENT_DATA=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
@@ -1867,6 +1883,7 @@ CONFIG_DM_DELAY=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_FEC is not set
 CONFIG_DM_SWITCH=m
 CONFIG_DM_LOG_WRITES=m
 CONFIG_TARGET_CORE=m
@@ -1958,6 +1975,7 @@ CONFIG_ENC28J60=m
 # CONFIG_ENC28J60_WRITEVERIFY is not set
 CONFIG_ENCX24J600=m
 CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NET_VENDOR_NETRONOME=y
 CONFIG_NET_VENDOR_8390=y
 # CONFIG_AX88796 is not set
 # CONFIG_ETHOC is not set
@@ -1986,7 +2004,7 @@ CONFIG_TI_CPSW=y
 CONFIG_TI_CPTS=y
 CONFIG_NET_VENDOR_VIA=y
 # CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_VELOCITY is not set
+CONFIG_VIA_VELOCITY=m
 CONFIG_NET_VENDOR_WIZNET=y
 # CONFIG_WIZNET_W5100 is not set
 # CONFIG_WIZNET_W5300 is not set
@@ -2086,17 +2104,9 @@ CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_USB_NET_CH9200=m
 CONFIG_WLAN=y
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AT76C50X_USB=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_MAC80211_HWSIM=m
+CONFIG_WLAN_VENDOR_ADMTEK=y
 CONFIG_ATH_COMMON=m
-CONFIG_ATH_CARDS=m
+CONFIG_WLAN_VENDOR_ATH=y
 # CONFIG_ATH_DEBUG is not set
 CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
@@ -2111,6 +2121,7 @@ CONFIG_ATH9K_RFKILL=y
 CONFIG_ATH9K_PCOEM=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_ATH9K_HWRNG=y
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
@@ -2127,6 +2138,9 @@ CONFIG_ATH10K=m
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_WCN36XX=m
 # CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
 CONFIG_B43=m
 CONFIG_B43_BCMA=y
 CONFIG_B43_SSB=y
@@ -2160,19 +2174,32 @@ CONFIG_BRCMFMAC_SDIO=y
 CONFIG_BRCMFMAC_USB=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_WLAN_VENDOR_INTEL=y
+CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_SDIO=m
 CONFIG_LIBERTAS_SPI=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS_MESH=y
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-# CONFIG_P54_SPI is not set
-CONFIG_P54_LEDS=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
@@ -2190,8 +2217,9 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
-CONFIG_WL_MEDIATEK=y
-CONFIG_MT7601U=m
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
 CONFIG_RTL_CARDS=m
 CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
@@ -2200,7 +2228,14 @@ CONFIG_RTLWIFI_USB=m
 CONFIG_RTL8192C_COMMON=m
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
-CONFIG_WL_TI=y
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+# CONFIG_RSI_SDIO is not set
+CONFIG_RSI_USB=m
+CONFIG_WLAN_VENDOR_ST=y
+# CONFIG_CW1200 is not set
+CONFIG_WLAN_VENDOR_TI=y
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
@@ -2210,16 +2245,12 @@ CONFIG_WLCORE=m
 CONFIG_WLCORE_SPI=m
 CONFIG_WLCORE_SDIO=m
 CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_WLAN_VENDOR_ZYDAS=y
+CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_USB=m
-# CONFIG_CW1200 is not set
-CONFIG_RSI_91X=m
-CONFIG_RSI_DEBUGFS=y
-# CONFIG_RSI_SDIO is not set
-CONFIG_RSI_USB=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_USB_NET_RNDIS_WLAN=m
 
 #
 # WiMAX Wireless Broadband devices
@@ -2235,6 +2266,7 @@ CONFIG_IEEE802154_AT86RF230=m
 CONFIG_IEEE802154_MRF24J40=m
 CONFIG_IEEE802154_CC2520=m
 CONFIG_IEEE802154_ATUSB=m
+# CONFIG_IEEE802154_ADF7242 is not set
 # CONFIG_ISDN is not set
 # CONFIG_NVM is not set
 
@@ -2370,6 +2402,7 @@ CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_EGALAX=m
+# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
 CONFIG_TOUCHSCREEN_FT6236=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GOODIX=m
@@ -2418,6 +2451,7 @@ CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
+# CONFIG_TOUCHSCREEN_TS4800 is not set
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_TSC200X_CORE=m
 CONFIG_TOUCHSCREEN_TSC2004=m
@@ -2527,6 +2561,7 @@ CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_8250_OMAP=y
 CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
 # CONFIG_SERIAL_8250_INGENIC is not set
+CONFIG_SERIAL_OF_PLATFORM=y
 
 #
 # Non-8250 serial port support
@@ -2539,7 +2574,6 @@ CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_CONSOLE_POLL=y
-CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_OMAP is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
@@ -2662,6 +2696,7 @@ CONFIG_SPI_ROCKCHIP=m
 # SPI Protocol Masters
 #
 CONFIG_SPI_SPIDEV=m
+# CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPMI is not set
 CONFIG_HSI=m
@@ -2783,7 +2818,7 @@ CONFIG_GPIO_MCP23S08=m
 # USB GPIO expanders
 #
 CONFIG_GPIO_VIPERBOARD=m
-CONFIG_W1=y
+CONFIG_W1=m
 CONFIG_W1_CON=y
 
 #
@@ -2825,8 +2860,7 @@ CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BATTERY_BQ27XXX=m
-CONFIG_BATTERY_BQ27XXX_I2C=y
-CONFIG_BATTERY_BQ27XXX_PLATFORM=y
+CONFIG_BATTERY_BQ27XXX_I2C=m
 CONFIG_BATTERY_DA9052=m
 CONFIG_AXP288_FUEL_GAUGE=m
 # CONFIG_BATTERY_MAX17040 is not set
@@ -2928,7 +2962,6 @@ CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_HTU21=m
 CONFIG_SENSORS_MCP3021=m
 CONFIG_SENSORS_ADCXX=m
 CONFIG_SENSORS_LM63=m
@@ -2961,6 +2994,7 @@ CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC2978=m
 CONFIG_SENSORS_LTC2978_REGULATOR=y
+# CONFIG_SENSORS_LTC3815 is not set
 CONFIG_SENSORS_MAX16064=m
 CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_MAX34440=m
@@ -3037,6 +3071,7 @@ CONFIG_TI_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
+# CONFIG_WATCHDOG_SYSFS is not set
 
 #
 # Watchdog Device Drivers
@@ -3047,10 +3082,12 @@ CONFIG_SOFT_WATCHDOG=m
 # CONFIG_DA9063_WATCHDOG is not set
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_ZIIRAVE_WATCHDOG is not set
 # CONFIG_CADENCE_WATCHDOG is not set
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_OMAP_WATCHDOG=y
 CONFIG_TWL4030_WATCHDOG=y
+# CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
 # CONFIG_BCM7038_WDT is not set
 # CONFIG_MEN_A21_WDT is not set
@@ -3068,7 +3105,6 @@ CONFIG_SSB=m
 CONFIG_SSB_BLOCKIO=y
 CONFIG_SSB_SDIOHOST_POSSIBLE=y
 CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_HOST_SOC is not set
 # CONFIG_SSB_SILENT is not set
 # CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB_DRIVER_GPIO is not set
@@ -3220,6 +3256,8 @@ CONFIG_REGULATOR_MT6311=y
 CONFIG_REGULATOR_PALMAS=y
 CONFIG_REGULATOR_PBIAS=y
 CONFIG_REGULATOR_PFUZE100=y
+# CONFIG_REGULATOR_PV88060 is not set
+# CONFIG_REGULATOR_PV88090 is not set
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S2MPS11=m
@@ -3247,6 +3285,7 @@ CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
+# CONFIG_MEDIA_CONTROLLER_DVB is not set
 CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2=y
@@ -3772,6 +3811,7 @@ CONFIG_DRM_VGEM=m
 # CONFIG_DRM_EXYNOS is not set
 CONFIG_DRM_UDL=m
 # CONFIG_DRM_ARMADA is not set
+# CONFIG_DRM_OMAP is not set
 CONFIG_DRM_TILCDC=m
 CONFIG_DRM_TILCDC_SLAVE_COMPAT=y
 CONFIG_DRM_VIRTIO_GPU=m
@@ -3791,6 +3831,7 @@ CONFIG_DRM_BRIDGE=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
 CONFIG_FB_CFB_FILLRECT=y
@@ -3824,7 +3865,7 @@ CONFIG_FB_UDL=m
 # CONFIG_FB_BROADSHEET is not set
 # CONFIG_FB_AUO_K190X is not set
 CONFIG_FB_SIMPLE=y
-# CONFIG_OMAP2_DSS is not set
+# CONFIG_FB_OMAP2 is not set
 CONFIG_FB_SSD1307=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_LCD_CLASS_DEVICE is not set
@@ -3920,6 +3961,7 @@ CONFIG_SND_USB_TONEPORT=m
 CONFIG_SND_USB_VARIAX=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+# CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_ATMEL_SOC is not set
 CONFIG_SND_EDMA_SOC=m
 CONFIG_SND_DAVINCI_SOC_MCASP=m
@@ -3945,6 +3987,7 @@ CONFIG_SND_OMAP_SOC_MCBSP=m
 CONFIG_SND_OMAP_SOC_HDMI_AUDIO=m
 CONFIG_SND_OMAP_SOC_RX51=m
 CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
+# CONFIG_SND_SOC_IMG is not set
 
 #
 # Allwinner SoC Audio support
@@ -3977,8 +4020,11 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_ES8328 is not set
 # CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_PCM1681 is not set
-# CONFIG_SND_SOC_PCM1792A is not set
+# CONFIG_SND_SOC_PCM179X is not set
+# CONFIG_SND_SOC_PCM3168A_I2C is not set
+# CONFIG_SND_SOC_PCM3168A_SPI is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
 # CONFIG_SND_SOC_RT5631 is not set
@@ -4019,6 +4065,7 @@ CONFIG_SND_SOC_TWL4030=m
 # CONFIG_SND_SOC_WM8804_SPI is not set
 # CONFIG_SND_SOC_WM8903 is not set
 # CONFIG_SND_SOC_WM8962 is not set
+# CONFIG_SND_SOC_WM8974 is not set
 # CONFIG_SND_SOC_WM8978 is not set
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SIMPLE_CARD=m
@@ -4249,6 +4296,7 @@ CONFIG_USB_DWC3_DUAL_ROLE=y
 # Platform Glue Driver Support
 #
 CONFIG_USB_DWC3_OMAP=m
+CONFIG_USB_DWC3_OF_SIMPLE=y
 CONFIG_USB_DWC2=m
 # CONFIG_USB_DWC2_HOST is not set
 
@@ -4263,7 +4311,6 @@ CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_OF=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
 # CONFIG_USB_ISP1760 is not set
 
 #
@@ -4311,6 +4358,7 @@ CONFIG_USB_SERIAL_MCT_U232=m
 CONFIG_USB_SERIAL_METRO=m
 CONFIG_USB_SERIAL_MOS7720=m
 CONFIG_USB_SERIAL_MOS7840=m
+# CONFIG_USB_SERIAL_MXUPORT11 is not set
 CONFIG_USB_SERIAL_MXUPORT=m
 CONFIG_USB_SERIAL_NAVMAN=m
 CONFIG_USB_SERIAL_PL2303=m
@@ -4383,6 +4431,7 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=500
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_U_SERIAL_CONSOLE is not set
 
 #
 # USB Peripheral Controller
@@ -4436,6 +4485,7 @@ CONFIG_USB_CONFIGFS_RNDIS=y
 # CONFIG_USB_CONFIGFS_F_HID is not set
 # CONFIG_USB_CONFIGFS_F_UVC is not set
 # CONFIG_USB_CONFIGFS_F_PRINTER is not set
+# CONFIG_USB_CONFIGFS_F_TCM is not set
 CONFIG_USB_ZERO=m
 CONFIG_USB_AUDIO=m
 # CONFIG_GADGET_UAC1 is not set
@@ -4623,6 +4673,7 @@ CONFIG_RTC_DRV_TWL4030=y
 CONFIG_RTC_DRV_TPS65910=m
 CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_FM3130=m
+# CONFIG_RTC_DRV_RX8010 is not set
 CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_RX8025=m
 CONFIG_RTC_DRV_EM3027=m
@@ -4839,7 +4890,6 @@ CONFIG_AD2S1210=m
 # Triggers - standalone
 #
 # CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
-# CONFIG_IIO_SIMPLE_DUMMY is not set
 
 #
 # Speakup console speech
@@ -4911,7 +4961,8 @@ CONFIG_FB_TFT_UPD161704=m
 CONFIG_FB_TFT_WATTEROTT=m
 CONFIG_FB_FLEX=m
 CONFIG_FB_TFT_FBTFT_DEVICE=m
-# CONFIG_WILC1000_DRIVER is not set
+# CONFIG_WILC1000_SDIO is not set
+# CONFIG_WILC1000_SPI is not set
 # CONFIG_MOST is not set
 # CONFIG_CHROME_PLATFORMS is not set
 CONFIG_CLKDEV_LOOKUP=y
@@ -4925,9 +4976,11 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_SI514 is not set
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
+# CONFIG_COMMON_CLK_CS2000_CP is not set
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_CLK_TWL6040=y
 # CONFIG_CLK_QORIQ is not set
+# CONFIG_COMMON_CLK_NXP is not set
 CONFIG_COMMON_CLK_PALMAS=y
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_PXA is not set
@@ -4990,6 +5043,7 @@ CONFIG_WKUP_M3_RPROC=y
 # CONFIG_SOC_BRCMSTB is not set
 # CONFIG_SUNXI_SRAM is not set
 CONFIG_SOC_TI=y
+CONFIG_WKUP_M3_IPC=y
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -5012,6 +5066,7 @@ CONFIG_EXTCON=y
 # CONFIG_EXTCON_ADC_JACK is not set
 # CONFIG_EXTCON_AXP288 is not set
 CONFIG_EXTCON_GPIO=y
+# CONFIG_EXTCON_MAX3355 is not set
 CONFIG_EXTCON_PALMAS=y
 # CONFIG_EXTCON_RT8973A is not set
 # CONFIG_EXTCON_SM5502 is not set
@@ -5025,8 +5080,10 @@ CONFIG_IIO_BUFFER=y
 # CONFIG_IIO_BUFFER_CB is not set
 CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO_TRIGGERED_BUFFER=m
+# CONFIG_IIO_CONFIGFS is not set
 CONFIG_IIO_TRIGGER=y
 CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+# CONFIG_IIO_SW_TRIGGER is not set
 CONFIG_IIO_TRIGGERED_EVENT=m
 
 #
@@ -5042,11 +5099,15 @@ CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
 CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
 CONFIG_KXSD9=m
 CONFIG_KXCJK1013=m
+CONFIG_MMA7455=m
+CONFIG_MMA7455_I2C=m
+CONFIG_MMA7455_SPI=m
 CONFIG_MMA8452=m
 CONFIG_MMA9551_CORE=m
 CONFIG_MMA9551=m
 CONFIG_MMA9553=m
 CONFIG_MXC4005=m
+CONFIG_MXC6255=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
 
@@ -5066,13 +5127,16 @@ CONFIG_AD799X=m
 CONFIG_AXP288_ADC=m
 CONFIG_CC10001_ADC=m
 CONFIG_HI8435=m
+CONFIG_INA2XX_ADC=m
 CONFIG_MAX1027=m
 CONFIG_MAX1363=m
 CONFIG_MCP320X=m
 CONFIG_MCP3422=m
 CONFIG_NAU7802=m
+CONFIG_PALMAS_GPADC=m
 CONFIG_TI_ADC081C=m
 CONFIG_TI_ADC128S052=m
+CONFIG_TI_ADS8688=m
 CONFIG_TI_AM335X_ADC=m
 CONFIG_TWL4030_MADC=m
 CONFIG_TWL6030_GPADC=m
@@ -5087,6 +5151,7 @@ CONFIG_AD8366=m
 #
 # Chemical Sensors
 #
+# CONFIG_IAQCORE is not set
 CONFIG_VZ89X=m
 
 #
@@ -5127,6 +5192,11 @@ CONFIG_MAX5821=m
 CONFIG_MCP4725=m
 CONFIG_MCP4922=m
 
+#
+# IIO dummy driver
+#
+# CONFIG_IIO_SIMPLE_DUMMY is not set
+
 #
 # Frequency Synthesizers DDS/PLL
 #
@@ -5158,6 +5228,11 @@ CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_ITG3200=m
 
+#
+# Health sensors
+#
+CONFIG_MAX30100=m
+
 #
 # Humidity sensors
 #
@@ -5281,7 +5356,9 @@ CONFIG_PWM_TIPWMSS=y
 CONFIG_PWM_TWL=m
 CONFIG_PWM_TWL_LED=m
 CONFIG_IRQCHIP=y
+CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_OMAP_IRQCHIP=y
+# CONFIG_TS4800_IRQ is not set
 # CONFIG_IPACK_BUS is not set
 # CONFIG_RESET_CONTROLLER is not set
 # CONFIG_FMC is not set
@@ -5297,6 +5374,7 @@ CONFIG_OMAP_CONTROL_PHY=y
 CONFIG_OMAP_USB2=y
 CONFIG_TI_PIPE3=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_PHY_HI6220_USB is not set
 CONFIG_PHY_SAMSUNG_USB2=m
 # CONFIG_PHY_EXYNOS4210_USB2 is not set
 # CONFIG_PHY_EXYNOS4X12_USB2 is not set
@@ -5332,6 +5410,7 @@ CONFIG_NVMEM=y
 #
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_HAVE_ARM_SMCCC=y
 
 #
 # File systems
@@ -5392,6 +5471,7 @@ CONFIG_F2FS_FS_ENCRYPTION=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 CONFIG_FILE_LOCKING=y
+CONFIG_MANDATORY_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -5664,7 +5744,7 @@ CONFIG_DLM_DEBUG=y
 #
 CONFIG_PRINTK_TIME=y
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_DYNAMIC_DEBUG=y
 
 #
@@ -5711,6 +5791,7 @@ CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_WQ_WATCHDOG is not set
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
@@ -5756,6 +5837,7 @@ CONFIG_DEBUG_LIST=y
 CONFIG_NOTIFIER_ERROR_INJECTION=m
 CONFIG_PM_NOTIFIER_ERROR_INJECT=m
 # CONFIG_OF_RECONFIG_NOTIFIER_ERROR_INJECT is not set
+# CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_NOP_TRACER=y
@@ -5833,14 +5915,15 @@ CONFIG_KGDB_KDB=y
 CONFIG_KDB_DEFAULT_ENABLE=0x1
 CONFIG_KDB_KEYBOARD=y
 CONFIG_KDB_CONTINUE_CATASTROPHIC=0
-# CONFIG_ARM_PTDUMP is not set
+# CONFIG_UBSAN is not set
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 # CONFIG_STRICT_DEVMEM is not set
+# CONFIG_ARM_PTDUMP is not set
 CONFIG_ARM_UNWIND=y
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_LL is not set
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 # CONFIG_DEBUG_UART_8250 is not set
-# CONFIG_DEBUG_UART_BCM63XX is not set
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 # CONFIG_ARM_KPROBES_TEST is not set
 # CONFIG_PID_IN_CONTEXTIDR is not set
@@ -6121,6 +6204,7 @@ CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_LRU_CACHE=m
 CONFIG_CORDIC=m
 CONFIG_DDR=y
+# CONFIG_IRQ_POLL is not set
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_FONT_SUPPORT=y
diff --git a/patches/defconfig-bone b/patches/defconfig-bone
index efb1c8469efcbfa5abc26fd5b71ce14f3acdc7c1..827cbb9edeb56fc9c552b8e0b3568013d7883541 100644
--- a/patches/defconfig-bone
+++ b/patches/defconfig-bone
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.0 Kernel Configuration
+# Linux/arm 4.5.0-rc1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -11,7 +11,6 @@ CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_HAVE_PROC_CPU=y
 CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -118,26 +117,25 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
 CONFIG_PAGE_COUNTER=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_SWAP_ENABLED=y
-CONFIG_MEMCG_KMEM=y
-CONFIG_CGROUP_PERF=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
-CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+# CONFIG_CGROUP_DEBUG is not set
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
@@ -215,7 +213,6 @@ CONFIG_KRETPROBES=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
@@ -240,6 +237,10 @@ CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_BITS_MAX=16
+CONFIG_ARCH_MMAP_RND_BITS=8
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
@@ -318,8 +319,6 @@ CONFIG_FREEZER=y
 #
 CONFIG_MMU=y
 CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_GEMINI is not set
 # CONFIG_ARCH_EBSA110 is not set
@@ -331,9 +330,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCH_LPC32XX is not set
@@ -341,7 +337,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C24XX is not set
-# CONFIG_ARCH_S3C64XX is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP1 is not set
 
@@ -407,16 +402,19 @@ CONFIG_SOC_HAS_OMAP2_SDRC=y
 #
 # OMAP Legacy Platform Data Board Type
 #
+# CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_QCOM is not set
+# CONFIG_ARCH_REALVIEW is not set
 # CONFIG_ARCH_ROCKCHIP is not set
 # CONFIG_ARCH_SOCFPGA is not set
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_STI is not set
 # CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_EXYNOS is not set
-# CONFIG_ARCH_SHMOBILE_MULTI is not set
+# CONFIG_ARCH_RENESAS is not set
 # CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_TANGO is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_UNIPHIER is not set
 # CONFIG_ARCH_U8500 is not set
@@ -511,6 +509,7 @@ CONFIG_SCHED_HRTICK=y
 CONFIG_THUMB2_KERNEL=y
 CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
 CONFIG_ARM_ASM_UNIFIED=y
+CONFIG_ARM_PATCH_IDIV=y
 CONFIG_AEABI=y
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
@@ -551,6 +550,7 @@ CONFIG_ZBUD=y
 CONFIG_ZSMALLOC=m
 # CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_FRAME_VECTOR=y
 CONFIG_FORCE_MAX_ZONEORDER=12
@@ -559,6 +559,8 @@ CONFIG_ALIGNMENT_TRAP=y
 CONFIG_SECCOMP=y
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
+# CONFIG_PARAVIRT is not set
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 # CONFIG_XEN is not set
 
 #
@@ -578,6 +580,7 @@ CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_AUTO_ZRELADDR=y
+# CONFIG_EFI is not set
 
 #
 # CPU Power Management
@@ -667,6 +670,7 @@ CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
 
 #
 # Networking options
@@ -722,6 +726,7 @@ CONFIG_INET_LRO=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
+# CONFIG_INET_DIAG_DESTROY is not set
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y
@@ -749,7 +754,7 @@ CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_IPV6_MIP6=y
-CONFIG_IPV6_ILA=m
+# CONFIG_IPV6_ILA is not set
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_TRANSPORT=m
@@ -971,7 +976,7 @@ CONFIG_IP_VS_WRR=m
 CONFIG_IP_VS_LC=m
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
+# CONFIG_IP_VS_OVF is not set
 CONFIG_IP_VS_LBLC=m
 CONFIG_IP_VS_LBLCR=m
 CONFIG_IP_VS_DH=m
@@ -1010,7 +1015,7 @@ CONFIG_NF_NAT_IPV4=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 CONFIG_NF_NAT_MASQUERADE_IPV4=m
 CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_REDIR_IPV4=m
+# CONFIG_NFT_REDIR_IPV4 is not set
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NF_NAT_PPTP=m
@@ -1053,7 +1058,7 @@ CONFIG_NF_NAT_IPV6=m
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 CONFIG_NF_NAT_MASQUERADE_IPV6=m
 CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_REDIR_IPV6=m
+# CONFIG_NFT_REDIR_IPV6 is not set
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1162,6 +1167,7 @@ CONFIG_IPDDP_ENCAP=y
 # CONFIG_LAPB is not set
 CONFIG_PHONET=m
 CONFIG_6LOWPAN=m
+# CONFIG_6LOWPAN_DEBUGFS is not set
 CONFIG_6LOWPAN_NHC=m
 CONFIG_6LOWPAN_NHC_DEST=m
 CONFIG_6LOWPAN_NHC_FRAGMENT=m
@@ -1170,6 +1176,12 @@ CONFIG_6LOWPAN_NHC_IPV6=m
 CONFIG_6LOWPAN_NHC_MOBILITY=m
 CONFIG_6LOWPAN_NHC_ROUTING=m
 CONFIG_6LOWPAN_NHC_UDP=m
+# CONFIG_6LOWPAN_GHC_EXT_HDR_HOP is not set
+# CONFIG_6LOWPAN_GHC_UDP is not set
+# CONFIG_6LOWPAN_GHC_ICMPV6 is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_DEST is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE is not set
 CONFIG_IEEE802154=m
 # CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
 CONFIG_IEEE802154_SOCKET=m
@@ -1266,10 +1278,10 @@ CONFIG_NETLINK_DIAG=m
 CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=y
 CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_HSR=m
+# CONFIG_HSR is not set
 # CONFIG_NET_SWITCHDEV is not set
 # CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_SOCK_CGROUP_DATA=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
@@ -1441,11 +1453,13 @@ CONFIG_NFC_PN544_I2C=m
 CONFIG_NFC_MICROREAD=m
 CONFIG_NFC_MICROREAD_I2C=m
 # CONFIG_NFC_MRVL_USB is not set
-# CONFIG_NFC_ST21NFCA is not set
-# CONFIG_NFC_ST_NCI is not set
+# CONFIG_NFC_ST21NFCA_I2C is not set
+# CONFIG_NFC_ST_NCI_I2C is not set
+# CONFIG_NFC_ST_NCI_SPI is not set
 # CONFIG_NFC_NXP_NCI is not set
 # CONFIG_NFC_S3FWRN5_I2C is not set
-CONFIG_LWTUNNEL=y
+# CONFIG_NFC_ST95HF is not set
+# CONFIG_LWTUNNEL is not set
 CONFIG_HAVE_BPF_JIT=y
 
 #
@@ -1605,6 +1619,7 @@ CONFIG_MTD_LPDDR=m
 CONFIG_MTD_QINFO_PROBE=m
 # CONFIG_MTD_LPDDR2_NVM is not set
 CONFIG_MTD_SPI_NOR=m
+# CONFIG_MTD_MT81xx_NOR is not set
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
@@ -1777,6 +1792,7 @@ CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
+# CONFIG_SCSI_HISI_SAS is not set
 CONFIG_SCSI_UFSHCD=m
 # CONFIG_SCSI_UFSHCD_PLATFORM is not set
 CONFIG_LIBFC=m
@@ -1845,9 +1861,9 @@ CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_MQ_DEFAULT is not set
 # CONFIG_DM_DEBUG is not set
 CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 CONFIG_DM_BIO_PRISON=m
 CONFIG_DM_PERSISTENT_DATA=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
@@ -1867,6 +1883,7 @@ CONFIG_DM_DELAY=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_FEC is not set
 CONFIG_DM_SWITCH=m
 CONFIG_DM_LOG_WRITES=m
 CONFIG_TARGET_CORE=m
@@ -1958,6 +1975,7 @@ CONFIG_ENC28J60=m
 # CONFIG_ENC28J60_WRITEVERIFY is not set
 CONFIG_ENCX24J600=m
 CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NET_VENDOR_NETRONOME=y
 CONFIG_NET_VENDOR_8390=y
 # CONFIG_AX88796 is not set
 # CONFIG_ETHOC is not set
@@ -1986,7 +2004,7 @@ CONFIG_TI_CPSW=y
 CONFIG_TI_CPTS=y
 CONFIG_NET_VENDOR_VIA=y
 # CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_VELOCITY is not set
+CONFIG_VIA_VELOCITY=m
 CONFIG_NET_VENDOR_WIZNET=y
 # CONFIG_WIZNET_W5100 is not set
 # CONFIG_WIZNET_W5300 is not set
@@ -2086,17 +2104,9 @@ CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_USB_NET_CH9200=m
 CONFIG_WLAN=y
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AT76C50X_USB=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_MAC80211_HWSIM=m
+CONFIG_WLAN_VENDOR_ADMTEK=y
 CONFIG_ATH_COMMON=m
-CONFIG_ATH_CARDS=m
+CONFIG_WLAN_VENDOR_ATH=y
 # CONFIG_ATH_DEBUG is not set
 CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
@@ -2111,6 +2121,7 @@ CONFIG_ATH9K_RFKILL=y
 CONFIG_ATH9K_PCOEM=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_ATH9K_HWRNG=y
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
@@ -2127,6 +2138,9 @@ CONFIG_ATH10K=m
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_WCN36XX=m
 # CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
 CONFIG_B43=m
 CONFIG_B43_BCMA=y
 CONFIG_B43_SSB=y
@@ -2160,19 +2174,32 @@ CONFIG_BRCMFMAC_SDIO=y
 CONFIG_BRCMFMAC_USB=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_WLAN_VENDOR_INTEL=y
+CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_SDIO=m
 CONFIG_LIBERTAS_SPI=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS_MESH=y
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-# CONFIG_P54_SPI is not set
-CONFIG_P54_LEDS=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
@@ -2190,8 +2217,9 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
-CONFIG_WL_MEDIATEK=y
-CONFIG_MT7601U=m
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
 CONFIG_RTL_CARDS=m
 CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
@@ -2200,7 +2228,14 @@ CONFIG_RTLWIFI_USB=m
 CONFIG_RTL8192C_COMMON=m
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
-CONFIG_WL_TI=y
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+# CONFIG_RSI_SDIO is not set
+CONFIG_RSI_USB=m
+CONFIG_WLAN_VENDOR_ST=y
+# CONFIG_CW1200 is not set
+CONFIG_WLAN_VENDOR_TI=y
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
@@ -2210,16 +2245,12 @@ CONFIG_WLCORE=m
 CONFIG_WLCORE_SPI=m
 CONFIG_WLCORE_SDIO=m
 CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_WLAN_VENDOR_ZYDAS=y
+CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_USB=m
-# CONFIG_CW1200 is not set
-CONFIG_RSI_91X=m
-CONFIG_RSI_DEBUGFS=y
-# CONFIG_RSI_SDIO is not set
-CONFIG_RSI_USB=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_USB_NET_RNDIS_WLAN=m
 
 #
 # WiMAX Wireless Broadband devices
@@ -2235,6 +2266,7 @@ CONFIG_IEEE802154_AT86RF230=m
 CONFIG_IEEE802154_MRF24J40=m
 CONFIG_IEEE802154_CC2520=m
 CONFIG_IEEE802154_ATUSB=m
+# CONFIG_IEEE802154_ADF7242 is not set
 # CONFIG_ISDN is not set
 # CONFIG_NVM is not set
 
@@ -2370,6 +2402,7 @@ CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_EGALAX=m
+# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
 CONFIG_TOUCHSCREEN_FT6236=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GOODIX=m
@@ -2418,6 +2451,7 @@ CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
+# CONFIG_TOUCHSCREEN_TS4800 is not set
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_TSC200X_CORE=m
 CONFIG_TOUCHSCREEN_TSC2004=m
@@ -2527,6 +2561,7 @@ CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_8250_OMAP=y
 CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
 # CONFIG_SERIAL_8250_INGENIC is not set
+CONFIG_SERIAL_OF_PLATFORM=y
 
 #
 # Non-8250 serial port support
@@ -2539,7 +2574,6 @@ CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_CONSOLE_POLL=y
-CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_OMAP is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
@@ -2662,6 +2696,7 @@ CONFIG_SPI_ROCKCHIP=m
 # SPI Protocol Masters
 #
 CONFIG_SPI_SPIDEV=m
+# CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPMI is not set
 CONFIG_HSI=m
@@ -2783,7 +2818,7 @@ CONFIG_GPIO_MCP23S08=m
 # USB GPIO expanders
 #
 CONFIG_GPIO_VIPERBOARD=m
-CONFIG_W1=y
+CONFIG_W1=m
 CONFIG_W1_CON=y
 
 #
@@ -2825,8 +2860,7 @@ CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BATTERY_BQ27XXX=m
-CONFIG_BATTERY_BQ27XXX_I2C=y
-CONFIG_BATTERY_BQ27XXX_PLATFORM=y
+CONFIG_BATTERY_BQ27XXX_I2C=m
 CONFIG_BATTERY_DA9052=m
 CONFIG_AXP288_FUEL_GAUGE=m
 # CONFIG_BATTERY_MAX17040 is not set
@@ -2928,7 +2962,6 @@ CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_HTU21=m
 CONFIG_SENSORS_MCP3021=m
 CONFIG_SENSORS_ADCXX=m
 CONFIG_SENSORS_LM63=m
@@ -2961,6 +2994,7 @@ CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC2978=m
 CONFIG_SENSORS_LTC2978_REGULATOR=y
+# CONFIG_SENSORS_LTC3815 is not set
 CONFIG_SENSORS_MAX16064=m
 CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_MAX34440=m
@@ -3037,6 +3071,7 @@ CONFIG_TI_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
+# CONFIG_WATCHDOG_SYSFS is not set
 
 #
 # Watchdog Device Drivers
@@ -3047,10 +3082,12 @@ CONFIG_SOFT_WATCHDOG=m
 # CONFIG_DA9063_WATCHDOG is not set
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_ZIIRAVE_WATCHDOG is not set
 # CONFIG_CADENCE_WATCHDOG is not set
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_OMAP_WATCHDOG=y
 CONFIG_TWL4030_WATCHDOG=y
+# CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
 # CONFIG_BCM7038_WDT is not set
 # CONFIG_MEN_A21_WDT is not set
@@ -3068,7 +3105,6 @@ CONFIG_SSB=m
 CONFIG_SSB_BLOCKIO=y
 CONFIG_SSB_SDIOHOST_POSSIBLE=y
 CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_HOST_SOC is not set
 # CONFIG_SSB_SILENT is not set
 # CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB_DRIVER_GPIO is not set
@@ -3220,6 +3256,8 @@ CONFIG_REGULATOR_MT6311=y
 CONFIG_REGULATOR_PALMAS=y
 CONFIG_REGULATOR_PBIAS=y
 CONFIG_REGULATOR_PFUZE100=y
+# CONFIG_REGULATOR_PV88060 is not set
+# CONFIG_REGULATOR_PV88090 is not set
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S2MPS11=m
@@ -3247,6 +3285,7 @@ CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
+# CONFIG_MEDIA_CONTROLLER_DVB is not set
 CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2=y
@@ -3764,6 +3803,7 @@ CONFIG_DRM_KMS_CMA_HELPER=y
 # I2C encoder or helper chips
 #
 CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_ADIHDMI=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
@@ -3771,6 +3811,7 @@ CONFIG_DRM_VGEM=m
 # CONFIG_DRM_EXYNOS is not set
 CONFIG_DRM_UDL=m
 # CONFIG_DRM_ARMADA is not set
+# CONFIG_DRM_OMAP is not set
 CONFIG_DRM_TILCDC=m
 CONFIG_DRM_TILCDC_SLAVE_COMPAT=y
 CONFIG_DRM_VIRTIO_GPU=m
@@ -3790,6 +3831,7 @@ CONFIG_DRM_BRIDGE=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
 CONFIG_FB_CFB_FILLRECT=y
@@ -3823,7 +3865,7 @@ CONFIG_FB_UDL=m
 # CONFIG_FB_BROADSHEET is not set
 # CONFIG_FB_AUO_K190X is not set
 CONFIG_FB_SIMPLE=y
-# CONFIG_OMAP2_DSS is not set
+# CONFIG_FB_OMAP2 is not set
 CONFIG_FB_SSD1307=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_LCD_CLASS_DEVICE is not set
@@ -3919,6 +3961,7 @@ CONFIG_SND_USB_TONEPORT=m
 CONFIG_SND_USB_VARIAX=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+# CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_ATMEL_SOC is not set
 CONFIG_SND_EDMA_SOC=m
 CONFIG_SND_DAVINCI_SOC_MCASP=m
@@ -3944,6 +3987,7 @@ CONFIG_SND_OMAP_SOC_MCBSP=m
 CONFIG_SND_OMAP_SOC_HDMI_AUDIO=m
 CONFIG_SND_OMAP_SOC_RX51=m
 CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
+# CONFIG_SND_SOC_IMG is not set
 
 #
 # Allwinner SoC Audio support
@@ -3976,8 +4020,11 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_ES8328 is not set
 # CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_PCM1681 is not set
-# CONFIG_SND_SOC_PCM1792A is not set
+# CONFIG_SND_SOC_PCM179X is not set
+# CONFIG_SND_SOC_PCM3168A_I2C is not set
+# CONFIG_SND_SOC_PCM3168A_SPI is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
 # CONFIG_SND_SOC_RT5631 is not set
@@ -4018,6 +4065,7 @@ CONFIG_SND_SOC_TWL4030=m
 # CONFIG_SND_SOC_WM8804_SPI is not set
 # CONFIG_SND_SOC_WM8903 is not set
 # CONFIG_SND_SOC_WM8962 is not set
+# CONFIG_SND_SOC_WM8974 is not set
 # CONFIG_SND_SOC_WM8978 is not set
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SIMPLE_CARD=m
@@ -4248,6 +4296,7 @@ CONFIG_USB_DWC3_DUAL_ROLE=y
 # Platform Glue Driver Support
 #
 CONFIG_USB_DWC3_OMAP=m
+CONFIG_USB_DWC3_OF_SIMPLE=y
 CONFIG_USB_DWC2=m
 # CONFIG_USB_DWC2_HOST is not set
 
@@ -4262,7 +4311,6 @@ CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_OF=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
 # CONFIG_USB_ISP1760 is not set
 
 #
@@ -4310,6 +4358,7 @@ CONFIG_USB_SERIAL_MCT_U232=m
 CONFIG_USB_SERIAL_METRO=m
 CONFIG_USB_SERIAL_MOS7720=m
 CONFIG_USB_SERIAL_MOS7840=m
+# CONFIG_USB_SERIAL_MXUPORT11 is not set
 CONFIG_USB_SERIAL_MXUPORT=m
 CONFIG_USB_SERIAL_NAVMAN=m
 CONFIG_USB_SERIAL_PL2303=m
@@ -4383,6 +4432,7 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=500
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_U_SERIAL_CONSOLE is not set
 
 #
 # USB Peripheral Controller
@@ -4436,6 +4486,7 @@ CONFIG_USB_CONFIGFS_RNDIS=y
 # CONFIG_USB_CONFIGFS_F_HID is not set
 # CONFIG_USB_CONFIGFS_F_UVC is not set
 # CONFIG_USB_CONFIGFS_F_PRINTER is not set
+# CONFIG_USB_CONFIGFS_F_TCM is not set
 CONFIG_USB_ZERO=m
 CONFIG_USB_AUDIO=m
 # CONFIG_GADGET_UAC1 is not set
@@ -4623,6 +4674,7 @@ CONFIG_RTC_DRV_TWL4030=y
 CONFIG_RTC_DRV_TPS65910=m
 CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_FM3130=m
+# CONFIG_RTC_DRV_RX8010 is not set
 CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_RX8025=m
 CONFIG_RTC_DRV_EM3027=m
@@ -4839,7 +4891,6 @@ CONFIG_AD2S1210=m
 # Triggers - standalone
 #
 # CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
-# CONFIG_IIO_SIMPLE_DUMMY is not set
 
 #
 # Speakup console speech
@@ -4911,7 +4962,8 @@ CONFIG_FB_TFT_UPD161704=m
 CONFIG_FB_TFT_WATTEROTT=m
 CONFIG_FB_FLEX=m
 CONFIG_FB_TFT_FBTFT_DEVICE=m
-# CONFIG_WILC1000_DRIVER is not set
+# CONFIG_WILC1000_SDIO is not set
+# CONFIG_WILC1000_SPI is not set
 # CONFIG_MOST is not set
 # CONFIG_CHROME_PLATFORMS is not set
 CONFIG_CLKDEV_LOOKUP=y
@@ -4925,9 +4977,11 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_SI514 is not set
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
+# CONFIG_COMMON_CLK_CS2000_CP is not set
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_CLK_TWL6040=y
 # CONFIG_CLK_QORIQ is not set
+# CONFIG_COMMON_CLK_NXP is not set
 CONFIG_COMMON_CLK_PALMAS=y
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_PXA is not set
@@ -4990,6 +5044,7 @@ CONFIG_WKUP_M3_RPROC=y
 # CONFIG_SOC_BRCMSTB is not set
 # CONFIG_SUNXI_SRAM is not set
 CONFIG_SOC_TI=y
+CONFIG_WKUP_M3_IPC=y
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -5012,6 +5067,7 @@ CONFIG_EXTCON=y
 # CONFIG_EXTCON_ADC_JACK is not set
 # CONFIG_EXTCON_AXP288 is not set
 CONFIG_EXTCON_GPIO=y
+# CONFIG_EXTCON_MAX3355 is not set
 CONFIG_EXTCON_PALMAS=y
 # CONFIG_EXTCON_RT8973A is not set
 # CONFIG_EXTCON_SM5502 is not set
@@ -5025,8 +5081,10 @@ CONFIG_IIO_BUFFER=y
 # CONFIG_IIO_BUFFER_CB is not set
 CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO_TRIGGERED_BUFFER=m
+# CONFIG_IIO_CONFIGFS is not set
 CONFIG_IIO_TRIGGER=y
 CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+# CONFIG_IIO_SW_TRIGGER is not set
 CONFIG_IIO_TRIGGERED_EVENT=m
 
 #
@@ -5042,11 +5100,15 @@ CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
 CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
 CONFIG_KXSD9=m
 CONFIG_KXCJK1013=m
+CONFIG_MMA7455=m
+CONFIG_MMA7455_I2C=m
+CONFIG_MMA7455_SPI=m
 CONFIG_MMA8452=m
 CONFIG_MMA9551_CORE=m
 CONFIG_MMA9551=m
 CONFIG_MMA9553=m
 CONFIG_MXC4005=m
+CONFIG_MXC6255=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
 
@@ -5066,13 +5128,16 @@ CONFIG_AD799X=m
 CONFIG_AXP288_ADC=m
 CONFIG_CC10001_ADC=m
 CONFIG_HI8435=m
+CONFIG_INA2XX_ADC=m
 CONFIG_MAX1027=m
 CONFIG_MAX1363=m
 CONFIG_MCP320X=m
 CONFIG_MCP3422=m
 CONFIG_NAU7802=m
+CONFIG_PALMAS_GPADC=m
 CONFIG_TI_ADC081C=m
 CONFIG_TI_ADC128S052=m
+CONFIG_TI_ADS8688=m
 CONFIG_TI_AM335X_ADC=m
 CONFIG_TWL4030_MADC=m
 CONFIG_TWL6030_GPADC=m
@@ -5087,6 +5152,7 @@ CONFIG_AD8366=m
 #
 # Chemical Sensors
 #
+# CONFIG_IAQCORE is not set
 CONFIG_VZ89X=m
 
 #
@@ -5127,6 +5193,11 @@ CONFIG_MAX5821=m
 CONFIG_MCP4725=m
 CONFIG_MCP4922=m
 
+#
+# IIO dummy driver
+#
+# CONFIG_IIO_SIMPLE_DUMMY is not set
+
 #
 # Frequency Synthesizers DDS/PLL
 #
@@ -5158,6 +5229,11 @@ CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_ITG3200=m
 
+#
+# Health sensors
+#
+CONFIG_MAX30100=m
+
 #
 # Humidity sensors
 #
@@ -5273,6 +5349,7 @@ CONFIG_TSYS02D=m
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_FSL_FTM is not set
+CONFIG_PWM_OMAP_DMTIMER=m
 CONFIG_PWM_PCA9685=m
 CONFIG_PWM_TIECAP=m
 CONFIG_PWM_TIEHRPWM=m
@@ -5280,7 +5357,9 @@ CONFIG_PWM_TIPWMSS=y
 CONFIG_PWM_TWL=m
 CONFIG_PWM_TWL_LED=m
 CONFIG_IRQCHIP=y
+CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_OMAP_IRQCHIP=y
+# CONFIG_TS4800_IRQ is not set
 # CONFIG_IPACK_BUS is not set
 # CONFIG_RESET_CONTROLLER is not set
 # CONFIG_FMC is not set
@@ -5296,6 +5375,7 @@ CONFIG_OMAP_CONTROL_PHY=y
 CONFIG_OMAP_USB2=y
 CONFIG_TI_PIPE3=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_PHY_HI6220_USB is not set
 CONFIG_PHY_SAMSUNG_USB2=m
 # CONFIG_PHY_EXYNOS4210_USB2 is not set
 # CONFIG_PHY_EXYNOS4X12_USB2 is not set
@@ -5331,6 +5411,7 @@ CONFIG_NVMEM=y
 #
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_HAVE_ARM_SMCCC=y
 
 #
 # File systems
@@ -5391,6 +5472,7 @@ CONFIG_F2FS_FS_ENCRYPTION=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 CONFIG_FILE_LOCKING=y
+CONFIG_MANDATORY_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -5663,7 +5745,7 @@ CONFIG_DLM_DEBUG=y
 #
 CONFIG_PRINTK_TIME=y
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_DYNAMIC_DEBUG=y
 
 #
@@ -5710,6 +5792,7 @@ CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_WQ_WATCHDOG is not set
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
@@ -5755,6 +5838,7 @@ CONFIG_DEBUG_LIST=y
 CONFIG_NOTIFIER_ERROR_INJECTION=m
 CONFIG_PM_NOTIFIER_ERROR_INJECT=m
 # CONFIG_OF_RECONFIG_NOTIFIER_ERROR_INJECT is not set
+# CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_NOP_TRACER=y
@@ -5832,14 +5916,15 @@ CONFIG_KGDB_KDB=y
 CONFIG_KDB_DEFAULT_ENABLE=0x1
 CONFIG_KDB_KEYBOARD=y
 CONFIG_KDB_CONTINUE_CATASTROPHIC=0
-# CONFIG_ARM_PTDUMP is not set
+# CONFIG_UBSAN is not set
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 # CONFIG_STRICT_DEVMEM is not set
+# CONFIG_ARM_PTDUMP is not set
 CONFIG_ARM_UNWIND=y
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_LL is not set
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 # CONFIG_DEBUG_UART_8250 is not set
-# CONFIG_DEBUG_UART_BCM63XX is not set
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 # CONFIG_ARM_KPROBES_TEST is not set
 # CONFIG_PID_IN_CONTEXTIDR is not set
@@ -6120,6 +6205,7 @@ CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_LRU_CACHE=m
 CONFIG_CORDIC=m
 CONFIG_DDR=y
+# CONFIG_IRQ_POLL is not set
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_FONT_SUPPORT=y
diff --git a/patches/pru_uio/0001-Making-the-uio-pruss-driver-work.patch b/patches/pru_uio/0001-Making-the-uio-pruss-driver-work.patch
index 05b317266cde21cf38ee0d6d46bd9b94231505c7..d8525c9f55e2198b05bad6ab23ba160f3c7039c0 100644
--- a/patches/pru_uio/0001-Making-the-uio-pruss-driver-work.patch
+++ b/patches/pru_uio/0001-Making-the-uio-pruss-driver-work.patch
@@ -1,4 +1,4 @@
-From ad5a83ffb331941fcc02631607d324712feab952 Mon Sep 17 00:00:00 2001
+From 0e16a61a6e04a0ab70a40e1c63f93bbb93df9b96 Mon Sep 17 00:00:00 2001
 From: Elias Bakken <elias@iagent.no>
 Date: Thu, 9 Apr 2015 19:25:53 +0200
 Subject: [PATCH 1/2] Making the uio pruss driver work
@@ -12,7 +12,7 @@ Subject: [PATCH 1/2] Making the uio pruss driver work
  5 files changed, 136 insertions(+), 8 deletions(-)
 
 diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt
-index 4f6a82c..619f13a 100644
+index 9f4e513..6cb39bd 100644
 --- a/Documentation/devicetree/bindings/arm/omap/omap.txt
 +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
 @@ -23,6 +23,8 @@ Optional properties:
@@ -25,10 +25,10 @@ index 4f6a82c..619f13a 100644
  Example:
  
 diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index 09664df..f2d5b68 100644
+index 0e871f8..cd0b5d2 100644
 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi
-@@ -429,6 +429,17 @@
+@@ -446,6 +446,17 @@
  			ti,timer-pwm;
  		};
  
@@ -47,7 +47,7 @@ index 09664df..f2d5b68 100644
  			compatible = "ti,am3352-rtc", "ti,da830-rtc";
  			reg = <0x44e3e000 0x1000>;
 diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
-index 4cb8fd9..f14cd26 100644
+index 72ebc4c..4ff61fc 100644
 --- a/arch/arm/mach-omap2/omap_device.c
 +++ b/arch/arm/mach-omap2/omap_device.c
 @@ -122,8 +122,8 @@ static int omap_device_build_from_dt(struct platform_device *pdev)
@@ -301,5 +301,5 @@ index ca9e2fa..025e8e4 100644
  };
  
 -- 
-2.5.0
+2.6.4
 
diff --git a/patches/pru_uio/0002-Cleaned-up-error-reporting.patch b/patches/pru_uio/0002-Cleaned-up-error-reporting.patch
index d404af0c0104d593ef9ed38fa923665b74c7b253..80c2adc6db581ef524e57480216f40c19396893f 100644
--- a/patches/pru_uio/0002-Cleaned-up-error-reporting.patch
+++ b/patches/pru_uio/0002-Cleaned-up-error-reporting.patch
@@ -1,4 +1,4 @@
-From 03925e9976bc0813eeb0505822eee41a1e9a6cee Mon Sep 17 00:00:00 2001
+From f1c60e205573811ead5fd50f8686c0a595a28c14 Mon Sep 17 00:00:00 2001
 From: Elias Bakken <elias@iagent.no>
 Date: Fri, 10 Apr 2015 18:44:56 +0200
 Subject: [PATCH 2/2] Cleaned up error reporting
@@ -8,10 +8,10 @@ Subject: [PATCH 2/2] Cleaned up error reporting
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/uio/uio_pruss.c b/drivers/uio/uio_pruss.c
-index e235e45..c237040 100644
+index 025e8e4..6559752 100644
 --- a/drivers/uio/uio_pruss.c
 +++ b/drivers/uio/uio_pruss.c
-@@ -216,7 +216,6 @@ static int pruss_probe(struct platform_device *pdev)
+@@ -217,7 +217,6 @@ static int pruss_probe(struct platform_device *pdev)
  				continue;
  			}
  
@@ -19,7 +19,7 @@ index e235e45..c237040 100644
  			for(cnt=0; cnt<count; cnt++){
  				ret = of_property_read_string_index(child,
  					"pin-names", cnt, &pin_name);
-@@ -224,6 +223,10 @@ static int pruss_probe(struct platform_device *pdev)
+@@ -225,6 +224,10 @@ static int pruss_probe(struct platform_device *pdev)
  					dev_err(&pdev->dev, "Error on pin-name #%d\n", cnt);
  				gpio = of_get_gpio_flags(child, cnt, &flags);
  				ret = devm_gpio_request_one(&pdev->dev, gpio, flags, pin_name);
@@ -31,5 +31,5 @@ index e235e45..c237040 100644
  		}
  	}
 -- 
-2.1.4
+2.6.4
 
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index 72ec64cf0e934533051fc85ffdaa7dc7efb57199..72437bcf0f3a3ed031f7f7e12e7666877e987831 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.0 Kernel Configuration
+# Linux/arm 4.5.0-rc1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -51,10 +51,12 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_FHANDLE=y
-CONFIG_USELIB=y
+# CONFIG_USELIB is not set
 CONFIG_AUDIT=y
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-# CONFIG_AUDITSYSCALL is not set
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
 
 #
 # IRQ subsystem
@@ -113,26 +115,25 @@ CONFIG_LOG_BUF_SHIFT=16
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_FREEZER=y
-# CONFIG_CGROUP_PIDS is not set
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
 CONFIG_PAGE_COUNTER=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_SWAP_ENABLED=y
-CONFIG_MEMCG_KMEM=y
-CONFIG_CGROUP_PERF=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
-CONFIG_CGROUP_WRITEBACK=y
+# CONFIG_CGROUP_PIDS is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+# CONFIG_CGROUP_DEBUG is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
@@ -211,7 +212,6 @@ CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_OPTPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
@@ -236,6 +236,10 @@ CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_BITS_MAX=16
+CONFIG_ARCH_MMAP_RND_BITS=8
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
@@ -312,8 +316,6 @@ CONFIG_FREEZER=y
 #
 CONFIG_MMU=y
 CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_GEMINI is not set
 # CONFIG_ARCH_EBSA110 is not set
@@ -325,9 +327,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCH_LPC32XX is not set
@@ -335,7 +334,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C24XX is not set
-# CONFIG_ARCH_S3C64XX is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP1 is not set
 
@@ -428,16 +426,20 @@ CONFIG_MACH_NOKIA_N8X0=y
 CONFIG_MACH_NOKIA_RX51=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
 # CONFIG_ARCH_PICOXCELL is not set
+# CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_QCOM is not set
+# CONFIG_ARCH_REALVIEW is not set
 # CONFIG_ARCH_ROCKCHIP is not set
 # CONFIG_ARCH_SOCFPGA is not set
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_STI is not set
+# CONFIG_ARCH_S3C64XX is not set
 # CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_EXYNOS is not set
-# CONFIG_ARCH_SHMOBILE_MULTI is not set
+# CONFIG_ARCH_RENESAS is not set
 # CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_TANGO is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_UNIPHIER is not set
 # CONFIG_ARCH_U8500 is not set
@@ -553,6 +555,7 @@ CONFIG_HZ_100=y
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
+CONFIG_ARM_PATCH_IDIV=y
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
@@ -588,6 +591,7 @@ CONFIG_CMA_AREAS=7
 # CONFIG_ZPOOL is not set
 # CONFIG_ZBUD is not set
 # CONFIG_ZSMALLOC is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_ALIGNMENT_TRAP=y
@@ -595,6 +599,8 @@ CONFIG_ALIGNMENT_TRAP=y
 CONFIG_SECCOMP=y
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
+# CONFIG_PARAVIRT is not set
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 
 #
 # Boot options
@@ -616,6 +622,7 @@ CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_AUTO_ZRELADDR=y
+# CONFIG_EFI is not set
 
 #
 # CPU Power Management
@@ -653,7 +660,7 @@ CONFIG_CPUFREQ_DT=m
 # CPU Idle
 #
 CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
+# CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE_GOV_MENU=y
 
 #
@@ -754,6 +761,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_INET_UDP_DIAG is not set
+# CONFIG_INET_DIAG_DESTROY is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -853,6 +861,7 @@ CONFIG_DNS_RESOLVER=y
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
+# CONFIG_SOCK_CGROUP_DATA is not set
 # CONFIG_CGROUP_NET_PRIO is not set
 # CONFIG_CGROUP_NET_CLASSID is not set
 CONFIG_NET_RX_BUSY_POLL=y
@@ -1146,6 +1155,7 @@ CONFIG_MTD_ONENAND_OMAP2=y
 # CONFIG_MTD_LPDDR is not set
 # CONFIG_MTD_LPDDR2_NVM is not set
 CONFIG_MTD_SPI_NOR=m
+# CONFIG_MTD_MT81xx_NOR is not set
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
@@ -1304,6 +1314,7 @@ CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_ISCSI_BOOT_SYSFS is not set
+# CONFIG_SCSI_HISI_SAS is not set
 # CONFIG_SCSI_UFSHCD is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_DH is not set
@@ -1393,6 +1404,7 @@ CONFIG_KS8851=y
 CONFIG_KS8851_MLL=y
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_NATSEMI is not set
+CONFIG_NET_VENDOR_NETRONOME=y
 # CONFIG_ETHOC is not set
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 CONFIG_NET_VENDOR_RENESAS=y
@@ -1500,31 +1512,53 @@ CONFIG_USB_CDC_PHONET=m
 # CONFIG_USB_VL600 is not set
 # CONFIG_USB_NET_CH9200 is not set
 CONFIG_WLAN=y
-# CONFIG_LIBERTAS_THINFIRM is not set
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+# CONFIG_ATH9K is not set
+# CONFIG_ATH9K_HTC is not set
+# CONFIG_CARL9170 is not set
+# CONFIG_ATH6KL is not set
+# CONFIG_AR5523 is not set
+# CONFIG_ATH10K is not set
+# CONFIG_WCN36XX is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
 # CONFIG_AT76C50X_USB is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_RTL8187 is not set
-# CONFIG_MAC80211_HWSIM is not set
-# CONFIG_ATH_CARDS is not set
+CONFIG_WLAN_VENDOR_BROADCOM=y
 # CONFIG_B43 is not set
 # CONFIG_B43LEGACY is not set
 # CONFIG_BRCMSMAC is not set
 # CONFIG_BRCMFMAC is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_WLAN_VENDOR_INTEL=y
+CONFIG_WLAN_VENDOR_INTERSIL=y
 # CONFIG_HOSTAP is not set
+# CONFIG_P54_COMMON is not set
+CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_SDIO=m
 # CONFIG_LIBERTAS_SPI is not set
 CONFIG_LIBERTAS_DEBUG=y
 # CONFIG_LIBERTAS_MESH is not set
-# CONFIG_P54_COMMON is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+# CONFIG_MT7601U is not set
+CONFIG_WLAN_VENDOR_RALINK=y
 # CONFIG_RT2X00 is not set
-# CONFIG_WL_MEDIATEK is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+# CONFIG_RTL8187 is not set
 CONFIG_RTL_CARDS=m
 # CONFIG_RTL8192CU is not set
 # CONFIG_RTL8XXXU is not set
-CONFIG_WL_TI=y
+CONFIG_WLAN_VENDOR_RSI=y
+# CONFIG_RSI_91X is not set
+CONFIG_WLAN_VENDOR_ST=y
+# CONFIG_CW1200 is not set
+CONFIG_WLAN_VENDOR_TI=y
 # CONFIG_WL1251 is not set
 CONFIG_WL12XX=m
 CONFIG_WL18XX=m
@@ -1532,12 +1566,11 @@ CONFIG_WLCORE=m
 CONFIG_WLCORE_SPI=m
 CONFIG_WLCORE_SDIO=m
 CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_WLAN_VENDOR_ZYDAS=y
+# CONFIG_USB_ZD1201 is not set
 # CONFIG_ZD1211RW is not set
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_USB=m
-# CONFIG_CW1200 is not set
-# CONFIG_RSI_91X is not set
+# CONFIG_MAC80211_HWSIM is not set
+# CONFIG_USB_NET_RNDIS_WLAN is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1617,6 +1650,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m
 # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
 # CONFIG_TOUCHSCREEN_EETI is not set
 # CONFIG_TOUCHSCREEN_EGALAX is not set
+# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
 # CONFIG_TOUCHSCREEN_FT6236 is not set
 # CONFIG_TOUCHSCREEN_FUJITSU is not set
 # CONFIG_TOUCHSCREEN_GOODIX is not set
@@ -1642,6 +1676,7 @@ CONFIG_TOUCHSCREEN_PIXCIR=m
 # CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
 # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TS4800 is not set
 # CONFIG_TOUCHSCREEN_TSC_SERIO is not set
 CONFIG_TOUCHSCREEN_TSC200X_CORE=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
@@ -1739,6 +1774,7 @@ CONFIG_SERIAL_8250_FSL=y
 # CONFIG_SERIAL_8250_RT288X is not set
 # CONFIG_SERIAL_8250_OMAP is not set
 # CONFIG_SERIAL_8250_INGENIC is not set
+CONFIG_SERIAL_OF_PLATFORM=y
 
 #
 # Non-8250 serial port support
@@ -1749,7 +1785,6 @@ CONFIG_SERIAL_8250_FSL=y
 # CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
 # CONFIG_SERIAL_SCCNXP is not set
@@ -1849,6 +1884,7 @@ CONFIG_SPI_TI_QSPI=m
 # SPI Protocol Masters
 #
 # CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPMI is not set
 CONFIG_HSI=m
@@ -2003,8 +2039,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BATTERY_BQ27XXX=m
-CONFIG_BATTERY_BQ27XXX_I2C=y
-CONFIG_BATTERY_BQ27XXX_PLATFORM=y
+CONFIG_BATTERY_BQ27XXX_I2C=m
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 CONFIG_CHARGER_ISP1704=m
@@ -2095,7 +2130,6 @@ CONFIG_SENSORS_GPIO_FAN=m
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MAX31790 is not set
-# CONFIG_SENSORS_HTU21 is not set
 # CONFIG_SENSORS_MCP3021 is not set
 # CONFIG_SENSORS_ADCXX is not set
 # CONFIG_SENSORS_LM63 is not set
@@ -2191,6 +2225,7 @@ CONFIG_DRA752_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
+# CONFIG_WATCHDOG_SYSFS is not set
 
 #
 # Watchdog Device Drivers
@@ -2198,10 +2233,12 @@ CONFIG_WATCHDOG_CORE=y
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_ZIIRAVE_WATCHDOG is not set
 # CONFIG_CADENCE_WATCHDOG is not set
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_TWL4030_WATCHDOG=m
+# CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
 # CONFIG_BCM7038_WDT is not set
 # CONFIG_MEN_A21_WDT is not set
@@ -2348,6 +2385,8 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_PALMAS=y
 CONFIG_REGULATOR_PBIAS=y
 # CONFIG_REGULATOR_PFUZE100 is not set
+# CONFIG_REGULATOR_PV88060 is not set
+# CONFIG_REGULATOR_PV88090 is not set
 # CONFIG_REGULATOR_PWM is not set
 CONFIG_REGULATOR_TI_ABB=y
 # CONFIG_REGULATOR_TPS51632 is not set
@@ -2372,6 +2411,7 @@ CONFIG_REGULATOR_TWL4030=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
 CONFIG_FB_CFB_FILLRECT=m
@@ -2405,40 +2445,40 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_AUO_K190X is not set
 # CONFIG_FB_SIMPLE is not set
 CONFIG_OMAP2_VRFB=y
-CONFIG_OMAP2_DSS_INIT=y
-CONFIG_OMAP2_DSS=m
-# CONFIG_OMAP2_DSS_DEBUG is not set
-# CONFIG_OMAP2_DSS_DEBUGFS is not set
-CONFIG_OMAP2_DSS_DPI=y
-CONFIG_OMAP2_DSS_VENC=y
-CONFIG_OMAP2_DSS_HDMI_COMMON=y
-CONFIG_OMAP4_DSS_HDMI=y
-CONFIG_OMAP5_DSS_HDMI=y
-CONFIG_OMAP2_DSS_SDI=y
-CONFIG_OMAP2_DSS_DSI=y
-CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
-CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
 CONFIG_FB_OMAP2=m
 CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
 CONFIG_FB_OMAP2_NUM_FBS=3
-
-#
-# OMAP Display Device Drivers (new device model)
-#
-# CONFIG_DISPLAY_ENCODER_OPA362 is not set
-CONFIG_DISPLAY_ENCODER_TFP410=m
-CONFIG_DISPLAY_ENCODER_TPD12S015=m
-CONFIG_DISPLAY_CONNECTOR_DVI=m
-CONFIG_DISPLAY_CONNECTOR_HDMI=m
-CONFIG_DISPLAY_CONNECTOR_ANALOG_TV=m
-CONFIG_DISPLAY_PANEL_DPI=m
-CONFIG_DISPLAY_PANEL_DSI_CM=m
-CONFIG_DISPLAY_PANEL_SONY_ACX565AKM=m
-CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02=m
-CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01=m
-CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1=m
-CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1=m
-CONFIG_DISPLAY_PANEL_NEC_NL8048HL11=m
+CONFIG_FB_OMAP2_DSS_INIT=y
+CONFIG_FB_OMAP2_DSS=m
+# CONFIG_FB_OMAP2_DSS_DEBUG is not set
+# CONFIG_FB_OMAP2_DSS_DEBUGFS is not set
+CONFIG_FB_OMAP2_DSS_DPI=y
+CONFIG_FB_OMAP2_DSS_VENC=y
+CONFIG_FB_OMAP2_DSS_HDMI_COMMON=y
+CONFIG_FB_OMAP4_DSS_HDMI=y
+# CONFIG_FB_OMAP5_DSS_HDMI is not set
+# CONFIG_FB_OMAP2_DSS_SDI is not set
+# CONFIG_FB_OMAP2_DSS_DSI is not set
+CONFIG_FB_OMAP2_DSS_MIN_FCK_PER_PCK=0
+CONFIG_FB_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
+
+#
+# OMAPFB Panel and Encoder Drivers
+#
+# CONFIG_FB_OMAP2_ENCODER_OPA362 is not set
+# CONFIG_FB_OMAP2_ENCODER_TFP410 is not set
+# CONFIG_FB_OMAP2_ENCODER_TPD12S015 is not set
+# CONFIG_FB_OMAP2_CONNECTOR_DVI is not set
+# CONFIG_FB_OMAP2_CONNECTOR_HDMI is not set
+# CONFIG_FB_OMAP2_CONNECTOR_ANALOG_TV is not set
+# CONFIG_FB_OMAP2_PANEL_DPI is not set
+# CONFIG_FB_OMAP2_PANEL_DSI_CM is not set
+# CONFIG_FB_OMAP2_PANEL_SONY_ACX565AKM is not set
+# CONFIG_FB_OMAP2_PANEL_LGPHILIPS_LB035Q02 is not set
+# CONFIG_FB_OMAP2_PANEL_SHARP_LS037V7DW01 is not set
+# CONFIG_FB_OMAP2_PANEL_TPO_TD028TTEC1 is not set
+# CONFIG_FB_OMAP2_PANEL_TPO_TD043MTEA1 is not set
+# CONFIG_FB_OMAP2_PANEL_NEC_NL8048HL11 is not set
 # CONFIG_FB_SSD1307 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
@@ -2540,6 +2580,7 @@ CONFIG_SND_USB_AUDIO=m
 # CONFIG_SND_USB_VARIAX is not set
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+# CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_ATMEL_SOC is not set
 CONFIG_SND_EDMA_SOC=m
 CONFIG_SND_DAVINCI_SOC_MCASP=m
@@ -2571,6 +2612,7 @@ CONFIG_SND_OMAP_SOC_MCPDM=m
 CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
 CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
+# CONFIG_SND_SOC_IMG is not set
 
 #
 # Allwinner SoC Audio support
@@ -2604,8 +2646,11 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_ES8328 is not set
 # CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_PCM1681 is not set
-# CONFIG_SND_SOC_PCM1792A is not set
+# CONFIG_SND_SOC_PCM179X is not set
+# CONFIG_SND_SOC_PCM3168A_I2C is not set
+# CONFIG_SND_SOC_PCM3168A_SPI is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
 # CONFIG_SND_SOC_RT5631 is not set
@@ -2646,6 +2691,7 @@ CONFIG_SND_SOC_TWL6040=m
 # CONFIG_SND_SOC_WM8804_SPI is not set
 # CONFIG_SND_SOC_WM8903 is not set
 # CONFIG_SND_SOC_WM8962 is not set
+# CONFIG_SND_SOC_WM8974 is not set
 # CONFIG_SND_SOC_WM8978 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
 CONFIG_SND_SIMPLE_CARD=m
@@ -2748,7 +2794,7 @@ CONFIG_USB_MOUSE=m
 # CONFIG_I2C_HID is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
+CONFIG_USB_COMMON=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=m
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -2854,6 +2900,7 @@ CONFIG_USB_DWC3_DUAL_ROLE=y
 # Platform Glue Driver Support
 #
 CONFIG_USB_DWC3_OMAP=m
+CONFIG_USB_DWC3_OF_SIMPLE=m
 # CONFIG_USB_DWC2 is not set
 # CONFIG_USB_CHIPIDEA is not set
 # CONFIG_USB_ISP1760 is not set
@@ -3107,6 +3154,7 @@ CONFIG_RTC_DRV_TWL4030=m
 # CONFIG_RTC_DRV_TPS65910 is not set
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8010 is not set
 # CONFIG_RTC_DRV_RX8581 is not set
 # CONFIG_RTC_DRV_RX8025 is not set
 # CONFIG_RTC_DRV_EM3027 is not set
@@ -3208,8 +3256,10 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_SI514 is not set
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
+# CONFIG_COMMON_CLK_CS2000_CP is not set
 # CONFIG_CLK_TWL6040 is not set
 # CONFIG_CLK_QORIQ is not set
+# CONFIG_COMMON_CLK_NXP is not set
 CONFIG_COMMON_CLK_PALMAS=m
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_PXA is not set
@@ -3262,6 +3312,7 @@ CONFIG_EXTCON=m
 #
 # CONFIG_EXTCON_ADC_JACK is not set
 # CONFIG_EXTCON_GPIO is not set
+# CONFIG_EXTCON_MAX3355 is not set
 CONFIG_EXTCON_PALMAS=m
 # CONFIG_EXTCON_RT8973A is not set
 # CONFIG_EXTCON_SM5502 is not set
@@ -3274,7 +3325,9 @@ CONFIG_IIO=m
 CONFIG_IIO_BUFFER=y
 # CONFIG_IIO_BUFFER_CB is not set
 CONFIG_IIO_KFIFO_BUF=m
+# CONFIG_IIO_CONFIGFS is not set
 # CONFIG_IIO_TRIGGER is not set
+# CONFIG_IIO_SW_TRIGGER is not set
 
 #
 # Accelerometers
@@ -3284,10 +3337,13 @@ CONFIG_IIO_KFIFO_BUF=m
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_KXSD9 is not set
 # CONFIG_KXCJK1013 is not set
+# CONFIG_MMA7455_I2C is not set
+# CONFIG_MMA7455_SPI is not set
 # CONFIG_MMA8452 is not set
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_MXC4005 is not set
+# CONFIG_MXC6255 is not set
 # CONFIG_STK8312 is not set
 # CONFIG_STK8BA50 is not set
 
@@ -3305,13 +3361,16 @@ CONFIG_IIO_KFIFO_BUF=m
 # CONFIG_AD799X is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_HI8435 is not set
+# CONFIG_INA2XX_ADC is not set
 # CONFIG_MAX1027 is not set
 # CONFIG_MAX1363 is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
 # CONFIG_NAU7802 is not set
+# CONFIG_PALMAS_GPADC is not set
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADC128S052 is not set
+# CONFIG_TI_ADS8688 is not set
 CONFIG_TI_AM335X_ADC=m
 # CONFIG_TWL4030_MADC is not set
 # CONFIG_TWL6030_GPADC is not set
@@ -3325,6 +3384,7 @@ CONFIG_TI_AM335X_ADC=m
 #
 # Chemical Sensors
 #
+# CONFIG_IAQCORE is not set
 # CONFIG_VZ89X is not set
 
 #
@@ -3358,6 +3418,11 @@ CONFIG_TI_AM335X_ADC=m
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4922 is not set
 
+#
+# IIO dummy driver
+#
+# CONFIG_IIO_SIMPLE_DUMMY is not set
+
 #
 # Frequency Synthesizers DDS/PLL
 #
@@ -3384,6 +3449,11 @@ CONFIG_TI_AM335X_ADC=m
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
 # CONFIG_ITG3200 is not set
 
+#
+# Health sensors
+#
+# CONFIG_MAX30100 is not set
+
 #
 # Humidity sensors
 #
@@ -3488,7 +3558,9 @@ CONFIG_PWM_TWL=m
 CONFIG_PWM_TWL_LED=m
 CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC=y
+CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_OMAP_IRQCHIP=y
+# CONFIG_TS4800_IRQ is not set
 CONFIG_IRQ_CROSSBAR=y
 # CONFIG_IPACK_BUS is not set
 # CONFIG_RESET_CONTROLLER is not set
@@ -3506,6 +3578,7 @@ CONFIG_OMAP_USB2=m
 CONFIG_TI_PIPE3=y
 CONFIG_TWL4030_USB=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_PHY_HI6220_USB is not set
 # CONFIG_POWERCAP is not set
 # CONFIG_MCB is not set
 
@@ -3534,6 +3607,7 @@ CONFIG_ARM_PMU=y
 # Firmware Drivers
 #
 # CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_HAVE_ARM_SMCCC=y
 
 #
 # File systems
@@ -3563,6 +3637,7 @@ CONFIG_FS_MBCACHE=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 CONFIG_FILE_LOCKING=y
+CONFIG_MANDATORY_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -3794,6 +3869,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 #
 # CONFIG_LOCKUP_DETECTOR is not set
 # CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_WQ_WATCHDOG is not set
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
@@ -3843,6 +3919,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -3905,14 +3982,15 @@ CONFIG_TRACING_EVENTS_GPIO=y
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
-# CONFIG_ARM_PTDUMP is not set
+# CONFIG_UBSAN is not set
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 # CONFIG_STRICT_DEVMEM is not set
+# CONFIG_ARM_PTDUMP is not set
 CONFIG_ARM_UNWIND=y
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_LL is not set
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 # CONFIG_DEBUG_UART_8250 is not set
-# CONFIG_DEBUG_UART_BCM63XX is not set
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 # CONFIG_ARM_KPROBES_TEST is not set
 # CONFIG_PID_IN_CONTEXTIDR is not set
@@ -4145,6 +4223,7 @@ CONFIG_GENERIC_ATOMIC64=y
 CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 # CONFIG_CORDIC is not set
 CONFIG_DDR=y
+# CONFIG_IRQ_POLL is not set
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_FONT_SUPPORT=y
diff --git a/patches/ti/cpu_freq/0013-PM-Voltagedomain-Add-generic-clk-notifier-handler-fo.patch b/patches/ti/cpu_freq/0013-PM-Voltagedomain-Add-generic-clk-notifier-handler-fo.patch
index 3777a8f5524ef39683746bb19cdc4ab1f8824b1f..c9d7dafe25ffb5a2cc4556520fcbe51ed34046cc 100644
--- a/patches/ti/cpu_freq/0013-PM-Voltagedomain-Add-generic-clk-notifier-handler-fo.patch
+++ b/patches/ti/cpu_freq/0013-PM-Voltagedomain-Add-generic-clk-notifier-handler-fo.patch
@@ -32,19 +32,19 @@ Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
  create mode 100644 include/linux/pm_voltage_domain.h
 
 diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
-index 08beeed..592eea2 100644
+index 1ddd13c..7f6d40a 100644
 --- a/drivers/power/Kconfig
 +++ b/drivers/power/Kconfig
-@@ -472,3 +472,4 @@ source "drivers/power/reset/Kconfig"
- endif # POWER_SUPPLY
+@@ -506,3 +506,4 @@ endif # POWER_SUPPLY
  
+ source "drivers/power/reset/Kconfig"
  source "drivers/power/avs/Kconfig"
 +source "drivers/power/voltdm/Kconfig"
 diff --git a/drivers/power/Makefile b/drivers/power/Makefile
-index 5752ce8..46e8d7c 100644
+index 0e4eab5..45be382 100644
 --- a/drivers/power/Makefile
 +++ b/drivers/power/Makefile
-@@ -68,3 +68,4 @@ obj-$(CONFIG_CHARGER_TPS65090)	+= tps65090-charger.o
+@@ -73,3 +73,4 @@ obj-$(CONFIG_CHARGER_TPS65217)	+= tps65217_charger.o
  obj-$(CONFIG_POWER_RESET)	+= reset/
  obj-$(CONFIG_AXP288_FUEL_GAUGE) += axp288_fuel_gauge.o
  obj-$(CONFIG_AXP288_CHARGER)	+= axp288_charger.o
@@ -325,5 +325,5 @@ index 0000000..1ee7343
 +
 +#endif				/* __PM_VOLTAGE_DOMAIN__ */
 -- 
-2.1.4
+2.6.4
 
diff --git a/patches/ti/iodelay/0003-pinctrl-Introduce-TI-IOdelay-configuration-driver.patch b/patches/ti/iodelay/0003-pinctrl-Introduce-TI-IOdelay-configuration-driver.patch
index 85a235b8e2da120aaee48e8b5769cc4be57013d9..b34fd45dda5f3db05c3c965f278f98d8843d23dc 100644
--- a/patches/ti/iodelay/0003-pinctrl-Introduce-TI-IOdelay-configuration-driver.patch
+++ b/patches/ti/iodelay/0003-pinctrl-Introduce-TI-IOdelay-configuration-driver.patch
@@ -45,10 +45,10 @@ Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
  create mode 100644 drivers/pinctrl/pinctrl-ti-iodelay.c
 
 diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
-index 100d9ac..05290b5 100644
+index 99a4c10..9376e78 100644
 --- a/drivers/pinctrl/Kconfig
 +++ b/drivers/pinctrl/Kconfig
-@@ -182,6 +182,18 @@ config PINCTRL_TEGRA_XUSB
+@@ -199,6 +199,18 @@ config PINCTRL_TEGRA_XUSB
  	select PINCONF
  	select PINMUX
  
@@ -68,7 +68,7 @@ index 100d9ac..05290b5 100644
  	bool "Toumaz Xenif TZ1090 pin control driver"
  	depends on SOC_TZ1090
 diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
-index f4216d9..d5d4567 100644
+index bf1b5ca..7d786e1 100644
 --- a/drivers/pinctrl/Makefile
 +++ b/drivers/pinctrl/Makefile
 @@ -29,6 +29,7 @@ obj-$(CONFIG_PINCTRL_TEGRA114)	+= pinctrl-tegra114.o
@@ -1049,7 +1049,7 @@ index 0000000..e4c6e25
 +MODULE_DESCRIPTION("Pinconf driver for TI's IO Delay module");
 +MODULE_LICENSE("GPL v2");
 diff --git a/include/dt-bindings/pinctrl/dra.h b/include/dt-bindings/pinctrl/dra.h
-index 4379e29..a7e4ae3 100644
+index 5c75e80..5a60e3b 100644
 --- a/include/dt-bindings/pinctrl/dra.h
 +++ b/include/dt-bindings/pinctrl/dra.h
 @@ -50,6 +50,8 @@
@@ -1061,9 +1061,9 @@ index 4379e29..a7e4ae3 100644
  #define PULL_ENA		(0 << 16)
  #define PULL_DIS		(1 << 16)
  #define PULL_UP			(1 << 17)
-@@ -67,5 +69,9 @@
- #define PIN_INPUT_PULLUP	(PULL_ENA | INPUT_EN | PULL_UP)
- #define PIN_INPUT_PULLDOWN	(PULL_ENA | INPUT_EN)
+@@ -73,5 +75,9 @@
+  */
+ #define DRA7XX_CORE_IOPAD(pa, val)	(((pa) & 0xffff) - 0x3400) (val)
  
 +/* DRA7 IODELAY configuration parameters */
 +#define A_DELAY(val)		((val) & 0xFFFF)
diff --git a/version.sh b/version.sh
index 5db101f95fe0b8798d490de32aea887ceeeedbc2..cb27daff29bdeb8650c1d4c02a8064db948dd0ed 100644
--- a/version.sh
+++ b/version.sh
@@ -19,9 +19,9 @@ toolchain="gcc_linaro_gnueabihf_5"
 #toolchain="gcc_linaro_aarch64_gnu_5"
 
 #Kernel/Build
-KERNEL_REL=4.4
-KERNEL_TAG=${KERNEL_REL}
-BUILD=bone2.2
+KERNEL_REL=4.5
+KERNEL_TAG=${KERNEL_REL}-rc1
+BUILD=bone0
 kernel_rt=".X-rtY"
 
 #v4.X-rcX + upto SHA
@@ -29,7 +29,7 @@ kernel_rt=".X-rtY"
 #KERNEL_SHA=""
 
 #git branch
-BRANCH="am33x-v4.4"
+BRANCH="am33x-v4.5"
 
 DISTRO=cross
 DEBARCH=armhf