diff --git a/patch.sh b/patch.sh
index 87b446de5bb95c3f0c71ac5f86b832fc2267ac0e..6b6ac6bd8a2c675e0df704e748e0e449befdb269 100644
--- a/patch.sh
+++ b/patch.sh
@@ -394,9 +394,10 @@ beaglebone () {
${git} "${DIR}/patches/beaglebone/dts/0001-dts-am335x-bone-common-fixup-leds-to-match-3.8.patch"
${git} "${DIR}/patches/beaglebone/dts/0002-arm-dts-am335x-bone-common-add-collision-and-carrier.patch"
${git} "${DIR}/patches/beaglebone/dts/0003-tps65217-Enable-KEY_POWER-press-on-AC-loss-PWR_BUT.patch"
+ ${git} "${DIR}/patches/beaglebone/dts/0004-am335x-bone-common-disable-default-clkout2_pin.patch"
if [ "x${regenerate}" = "xenable" ] ; then
- number=3
+ number=4
cleanup
fi
diff --git a/patches/bbb_overlays/0001-OF-DT-Overlay-configfs-interface-v6.patch b/patches/bbb_overlays/0001-OF-DT-Overlay-configfs-interface-v6.patch
index 1f4e73dc63fc796aca6008f3ae4ea35f0617ec80..45e4bc766eec467ccb659333014b01278f468c42 100644
--- a/patches/bbb_overlays/0001-OF-DT-Overlay-configfs-interface-v6.patch
+++ b/patches/bbb_overlays/0001-OF-DT-Overlay-configfs-interface-v6.patch
@@ -1,4 +1,4 @@
-From 74b33caa7588795c9618a0967bab4275daa04d35 Mon Sep 17 00:00:00 2001
+From bd8a21b7abd24851724542de9f4886f78c138110 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Wed, 4 Dec 2013 19:32:00 +0200
Subject: [PATCH 01/37] OF: DT-Overlay configfs interface (v6)
@@ -420,5 +420,5 @@ index 0000000..b68dea8
+}
+late_initcall(of_cfs_init);
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0002-gitignore-Ignore-DTB-files.patch b/patches/bbb_overlays/0002-gitignore-Ignore-DTB-files.patch
index 4bb9d25fceb2d4c939e0ed80bef449ddf144a0da..8f362e529ca68de7ce9b7f03e7001558ce3d4bed 100644
--- a/patches/bbb_overlays/0002-gitignore-Ignore-DTB-files.patch
+++ b/patches/bbb_overlays/0002-gitignore-Ignore-DTB-files.patch
@@ -1,4 +1,4 @@
-From f7fee7182d4ee385e0ea8422478c010c39438ba7 Mon Sep 17 00:00:00 2001
+From e012e9dda8da2086295b1330ecd3d9fd26418d0f Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Fri, 21 Feb 2014 18:49:29 +0200
Subject: [PATCH 02/37] gitignore: Ignore DTB files
@@ -21,5 +21,5 @@ index fd3a355..a36edcc 100644
+*.dtb
+*.dtbo
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0003-add-PM-firmware.patch b/patches/bbb_overlays/0003-add-PM-firmware.patch
index 12a382b00ff11fe2f28332d1a8474a90bff372fc..9bdab1254296af9de6cc1213d6b25ac7466a3973 100644
--- a/patches/bbb_overlays/0003-add-PM-firmware.patch
+++ b/patches/bbb_overlays/0003-add-PM-firmware.patch
@@ -1,4 +1,4 @@
-From 6fd78a7739b4f241bceba0df2fba24bf093eddb1 Mon Sep 17 00:00:00 2001
+From 14c8551dce6b422c02bc9e8924c6a9ee5f8983db Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Thu, 6 Jun 2013 17:09:38 +0200
Subject: [PATCH 03/37] add PM firmware
@@ -100,5 +100,5 @@ literal 0
HcmV?d00001
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0004-ARM-CUSTOM-Build-a-uImage-with-dtb-already-appended.patch b/patches/bbb_overlays/0004-ARM-CUSTOM-Build-a-uImage-with-dtb-already-appended.patch
index 5867f6db76803a0c436a58a0b81a1bb5c817e8a0..ca43a8c401e74b08f4bbdd08853a1cbd881787ca 100644
--- a/patches/bbb_overlays/0004-ARM-CUSTOM-Build-a-uImage-with-dtb-already-appended.patch
+++ b/patches/bbb_overlays/0004-ARM-CUSTOM-Build-a-uImage-with-dtb-already-appended.patch
@@ -1,4 +1,4 @@
-From a31a8184553a041729122ceadaed9a60420acd19 Mon Sep 17 00:00:00 2001
+From 54f2e386220b6bf807974a59ce0c615dab473cef Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Tue, 2 Aug 2011 15:30:09 +0100
Subject: [PATCH 04/37] ARM: CUSTOM: Build a uImage with dtb already appended
@@ -54,5 +54,5 @@ index 9eca7ae..a0cee4c 100644
$(Q)$(MAKE) $(build)=$(obj)/bootp $@
@:
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0005-arm-omap-Proper-cleanups-for-omap_device.patch b/patches/bbb_overlays/0005-arm-omap-Proper-cleanups-for-omap_device.patch
index 2991a9d06060828479f58ced3820e0ba07432548..b9194cd826ca9c1ef27b22e2acaabcc17096def8 100644
--- a/patches/bbb_overlays/0005-arm-omap-Proper-cleanups-for-omap_device.patch
+++ b/patches/bbb_overlays/0005-arm-omap-Proper-cleanups-for-omap_device.patch
@@ -1,4 +1,4 @@
-From 077c2303050ab542db4dbf454997729dcbfc603a Mon Sep 17 00:00:00 2001
+From 1ceba71fec3c78486e9a549d66f18761f67c4bd8 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Mon, 5 Aug 2013 22:44:09 +0300
Subject: [PATCH 05/37] arm: omap: Proper cleanups for omap_device
@@ -62,5 +62,5 @@ index 20068ba..8a35c13 100644
case BUS_NOTIFY_ADD_DEVICE:
if (pdev->dev.of_node)
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0006-serial-omap-Fix-port-line-number-without-aliases.patch b/patches/bbb_overlays/0006-serial-omap-Fix-port-line-number-without-aliases.patch
index 9723040d56c497ee32414916530b062e4466ae23..cba4b428f238184de8bcf9c237fe91cc3551e0a4 100644
--- a/patches/bbb_overlays/0006-serial-omap-Fix-port-line-number-without-aliases.patch
+++ b/patches/bbb_overlays/0006-serial-omap-Fix-port-line-number-without-aliases.patch
@@ -1,4 +1,4 @@
-From 681130c22983c93995ba0bed20f1d9dd75b5e695 Mon Sep 17 00:00:00 2001
+From 1e6c03c4c6ecf2819df7c03b643afc7cdd32211b Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Thu, 6 Nov 2014 14:12:14 +0200
Subject: [PATCH 06/37] serial: omap: Fix port line number without aliases
@@ -57,5 +57,5 @@ index b645f92..b89d509 100644
ret = pdev->id;
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0007-tty-omap-serial-Fix-up-platform-data-alloc.patch b/patches/bbb_overlays/0007-tty-omap-serial-Fix-up-platform-data-alloc.patch
index de9ee188899166cd8fba6f054a13003a2b9d7ddc..e0a4e3f11612048b75486fdf77cca8e6d27afaf0 100644
--- a/patches/bbb_overlays/0007-tty-omap-serial-Fix-up-platform-data-alloc.patch
+++ b/patches/bbb_overlays/0007-tty-omap-serial-Fix-up-platform-data-alloc.patch
@@ -1,4 +1,4 @@
-From 6be3c19802f81ad72050dbb73dcb186bcdf6cc5e Mon Sep 17 00:00:00 2001
+From 01497b26686c936a7c07a7bcc1b2e45cb218561f Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Mon, 9 Dec 2013 20:12:17 +0200
Subject: [PATCH 07/37] tty: omap-serial: Fix up platform data alloc
@@ -33,5 +33,5 @@ index b89d509..be1f9d0 100644
uartirq = platform_get_irq(pdev, 0);
if (uartirq < 0)
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0008-ARM-DT-Enable-symbols-when-CONFIG_OF_OVERLAY-is-used.patch b/patches/bbb_overlays/0008-ARM-DT-Enable-symbols-when-CONFIG_OF_OVERLAY-is-used.patch
index 04188580b562f7302ff8cc9964df59aa452ea59e..46111b90a184780b38083dde44db0bd2bba280eb 100644
--- a/patches/bbb_overlays/0008-ARM-DT-Enable-symbols-when-CONFIG_OF_OVERLAY-is-used.patch
+++ b/patches/bbb_overlays/0008-ARM-DT-Enable-symbols-when-CONFIG_OF_OVERLAY-is-used.patch
@@ -1,4 +1,4 @@
-From 2b1147c80b7e89bbc59f32c4b24ecb9255ae9bb3 Mon Sep 17 00:00:00 2001
+From 9e5385477c652cadb8aa603f7ee9b068931f9042 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Sat, 6 Dec 2014 20:10:49 +0200
Subject: [PATCH 08/37] ARM: DT: Enable symbols when CONFIG_OF_OVERLAY is used
@@ -24,7 +24,7 @@ index a0cee4c..75eb57b 100644
$(obj)/xipImage: vmlinux FORCE
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index a4a6d70..6209e35 100644
+index 147ac22..c1ddfc6 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1,9 +1,15 @@
@@ -44,5 +44,5 @@ index a4a6d70..6209e35 100644
dtb-$(CONFIG_SOC_SAM_V4_V5) += \
at91rm9200ek.dtb \
--
-2.7.0.rc3
+2.7.0
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 637d9c2bd337b5683f2d861de14048856706852b..04427a0b9f8b30fba5d45eb368a893a382a56dd8 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
@@ -1,4 +1,4 @@
-From 9110b9790e3d3d8d976e3c91f6f1e634c549c96d Mon Sep 17 00:00:00 2001
+From b0e14d244a58f9668f248f7f4701e9a947e2d174 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Tue, 20 Jan 2015 16:15:05 +0200
Subject: [PATCH 09/37] of: Custom printk format specifier for device node
@@ -20,18 +20,27 @@ documentation entry.
Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
---
- Documentation/printk-formats.txt | 32 ++++++++-
- lib/vsprintf.c | 148 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 179 insertions(+), 1 deletion(-)
+ Documentation/printk-formats.txt | 41 ++++++++++-
+ lib/vsprintf.c | 149 ++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 188 insertions(+), 2 deletions(-)
diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt
-index 5d1128b..10e3af5 100644
+index 5d1128b..1993652 100644
--- a/Documentation/printk-formats.txt
+++ b/Documentation/printk-formats.txt
-@@ -306,10 +306,40 @@ Network device features:
+@@ -306,10 +306,49 @@ Network device features:
Passed by reference.
++Command from struct task_struct
++
++ %pT ls
++
++ For printing executable name excluding path from struct
++ task_struct.
++
++ Passed by reference.
++
+Device tree nodes:
+
+ %pO[fnpPcCFr]
@@ -71,17 +80,17 @@ index 5d1128b..10e3af5 100644
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
-index 48ff9c3..a4b2034 100644
+index 48ff9c3..ed6f62d 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
-@@ -31,6 +31,7 @@
- #include <linux/dcache.h>
- #include <linux/cred.h>
- #include <net/addrconf.h>
-+#include <linux/of.h>
+@@ -34,6 +34,7 @@
#ifdef CONFIG_BLOCK
#include <linux/blkdev.h>
#endif
++#include <linux/of.h>
+
+ #include <asm/page.h> /* for PAGE_SIZE */
+ #include <asm/sections.h> /* for dereference_function_descriptor() */
@@ -1407,6 +1408,141 @@ char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec,
}
}
@@ -241,15 +250,16 @@ index 48ff9c3..a4b2034 100644
*
* ** Please update also Documentation/printk-formats.txt when making changes **
*
-@@ -1643,6 +1789,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);
- #ifdef CONFIG_BLOCK
+@@ -1647,7 +1793,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
case 'g':
return bdev_name(buf, end, ptr, spec, fmt);
+ #endif
+-
++ case 'O':
++ return device_node_string(buf, end, ptr, spec, fmt);
+ }
+ spec.flags |= SMALL;
+ if (spec.field_width == -1) {
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0010-of-overlay-kobjectify-overlay-objects.patch b/patches/bbb_overlays/0010-of-overlay-kobjectify-overlay-objects.patch
index c012a77eb90f9b6b2827f7e116f54ef199ea5d51..8d311b0b9869e532560511b3590fe5be3184637c 100644
--- a/patches/bbb_overlays/0010-of-overlay-kobjectify-overlay-objects.patch
+++ b/patches/bbb_overlays/0010-of-overlay-kobjectify-overlay-objects.patch
@@ -1,4 +1,4 @@
-From b126eabd3b6c3cf0951f27e66b0180e10895e31c Mon Sep 17 00:00:00 2001
+From 3ed2e287251c402318749dbd480f153761a93d5b Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Sun, 15 Mar 2015 20:39:36 +0200
Subject: [PATCH 10/37] of: overlay: kobjectify overlay objects
@@ -176,5 +176,5 @@ index 8225081..19001a0 100644
+ return 0;
+}
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0011-of-overlay-global-sysfs-enable-attribute.patch b/patches/bbb_overlays/0011-of-overlay-global-sysfs-enable-attribute.patch
index 69dccfee7ea81405cab3cc6005637d3829d3b375..b7f8aa89475c1b3d5c00eace4c117e55242f0fc5 100644
--- a/patches/bbb_overlays/0011-of-overlay-global-sysfs-enable-attribute.patch
+++ b/patches/bbb_overlays/0011-of-overlay-global-sysfs-enable-attribute.patch
@@ -1,4 +1,4 @@
-From 969d08cc92cfb58f5b7925009387ec7cb4c2360b Mon Sep 17 00:00:00 2001
+From 6dcc162da5f04ac77feee990c3fac26ce0060fc3 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Tue, 17 Mar 2015 15:25:46 +0200
Subject: [PATCH 11/37] of: overlay: global sysfs enable attribute
@@ -103,5 +103,5 @@ index 19001a0..1707dcd 100644
+ return rc;
}
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0012-Documentation-ABI-overlays-global-attributes.patch b/patches/bbb_overlays/0012-Documentation-ABI-overlays-global-attributes.patch
index 2b02b86cfd5c250e816015beb4a1030ca9bc4c55..bb27005c8fa6c427888c89a88f2e3895f48a4861 100644
--- a/patches/bbb_overlays/0012-Documentation-ABI-overlays-global-attributes.patch
+++ b/patches/bbb_overlays/0012-Documentation-ABI-overlays-global-attributes.patch
@@ -1,4 +1,4 @@
-From 2d3f53eb77bf4e4006424c9e7dab93d0fc3645a9 Mon Sep 17 00:00:00 2001
+From 266ec11787c246b9e32fb724459c5d8dda8d9491 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Tue, 17 Mar 2015 21:42:10 +0200
Subject: [PATCH 12/37] Documentation: ABI: overlays - global attributes
@@ -42,5 +42,5 @@ index 0000000..e938f44
+ that systems that have this interface can choose to turn it off
+ during initial boot, etc."
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0013-Documentation-document-of_overlay_disable-parameter.patch b/patches/bbb_overlays/0013-Documentation-document-of_overlay_disable-parameter.patch
index dd32143123863e75209d05ba8bf851a323252e82..229b53472d7565cc8b8e99d9e4c71926e9e0fdb9 100644
--- a/patches/bbb_overlays/0013-Documentation-document-of_overlay_disable-parameter.patch
+++ b/patches/bbb_overlays/0013-Documentation-document-of_overlay_disable-parameter.patch
@@ -1,4 +1,4 @@
-From 8721f8028fdbc10f8274ef1ec816a1c2b1756b43 Mon Sep 17 00:00:00 2001
+From 5dfb7a5050c6be647cab20b148e64349a8eabd54 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Thu, 22 Oct 2015 22:37:06 +0300
Subject: [PATCH 13/37] Documentation: document of_overlay_disable parameter
@@ -11,7 +11,7 @@ Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
1 file changed, 3 insertions(+)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 87d40a7..6d07a98 100644
+index 9a53c92..d9faf16 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -90,6 +90,7 @@ parameter is applicable:
@@ -22,7 +22,7 @@ index 87d40a7..6d07a98 100644
OSS OSS sound support is enabled.
PV_OPS A paravirtualized kernel is enabled.
PARIDE The ParIDE (parallel port IDE) subsystem is enabled.
-@@ -2669,6 +2670,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -2674,6 +2675,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
This can be set from sysctl after boot.
See Documentation/sysctl/vm.txt for details.
@@ -32,5 +32,5 @@ index 87d40a7..6d07a98 100644
See Documentation/debugging-via-ohci1394.txt for more
info.
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0014-of-overlay-add-per-overlay-sysfs-attributes.patch b/patches/bbb_overlays/0014-of-overlay-add-per-overlay-sysfs-attributes.patch
index 6b97681355174f462e971abdc799f458aadcdc88..e052c200e91f51735a13f19f4a837c0dcdedfe3e 100644
--- a/patches/bbb_overlays/0014-of-overlay-add-per-overlay-sysfs-attributes.patch
+++ b/patches/bbb_overlays/0014-of-overlay-add-per-overlay-sysfs-attributes.patch
@@ -1,4 +1,4 @@
-From 1dbf07da12e04885bbb85d61905e826e677d1ca1 Mon Sep 17 00:00:00 2001
+From 4ad0f806bc4f44d7ea4ecbdfb67e8ff69dccff7a Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Thu, 23 Apr 2015 19:02:16 +0300
Subject: [PATCH 14/37] of: overlay: add per overlay sysfs attributes
@@ -223,5 +223,5 @@ index 1707dcd..a8bfbf0 100644
of_free_overlay_info(ov);
idr_remove(&ov_idr, id);
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0015-Documentation-ABI-overlays-per-overlay-docs.patch b/patches/bbb_overlays/0015-Documentation-ABI-overlays-per-overlay-docs.patch
index 32cbd1ea196fa9ee6b9f9d82956cdb895a3e8884..50060436fae6a4240cc425088beebbc9465a5529 100644
--- a/patches/bbb_overlays/0015-Documentation-ABI-overlays-per-overlay-docs.patch
+++ b/patches/bbb_overlays/0015-Documentation-ABI-overlays-per-overlay-docs.patch
@@ -1,4 +1,4 @@
-From 3dda723bd148750d2aae52c474155b6039e1501d Mon Sep 17 00:00:00 2001
+From a5400a64e059e53fd4307174f805b5ac12389990 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Thu, 22 Oct 2015 20:59:27 +0300
Subject: [PATCH 15/37] Documentation: ABI: overlays - per overlay docs
@@ -47,5 +47,5 @@ index e938f44..88d1549 100644
+Description:
+ The full-path of the target of the fragment
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0016-misc-Beaglebone-capemanager.patch b/patches/bbb_overlays/0016-misc-Beaglebone-capemanager.patch
index 8661f8f01183c0608254f4d353fb2fed2e2aa101..c27b51d498cc89870c5457264dbce5d6b29887c4 100644
--- a/patches/bbb_overlays/0016-misc-Beaglebone-capemanager.patch
+++ b/patches/bbb_overlays/0016-misc-Beaglebone-capemanager.patch
@@ -1,4 +1,4 @@
-From bf6096f40356f43f6f55e267d6cf70556a84d564 Mon Sep 17 00:00:00 2001
+From 9510494d0d2a82a53900e8e9bccdf2932c905532 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Wed, 6 May 2015 23:09:53 +0300
Subject: [PATCH 16/37] misc: Beaglebone capemanager
@@ -1949,5 +1949,5 @@ index 0000000..094ea75
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:bone_capemgr");
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0017-doc-misc-Beaglebone-capemanager-documentation.patch b/patches/bbb_overlays/0017-doc-misc-Beaglebone-capemanager-documentation.patch
index 857387e562582c7c6ec3c45bc7e5ba3f046070ba..fcb8682988397ff2a4d4964b0d418db14cf7a23f 100644
--- a/patches/bbb_overlays/0017-doc-misc-Beaglebone-capemanager-documentation.patch
+++ b/patches/bbb_overlays/0017-doc-misc-Beaglebone-capemanager-documentation.patch
@@ -1,4 +1,4 @@
-From 00baf1a7d7ec4cd529d53b9087bc700ab0d6024a Mon Sep 17 00:00:00 2001
+From a04152faad856f0ea369f1b9fcfd72562555fc57 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Wed, 13 May 2015 10:27:46 +0300
Subject: [PATCH 17/37] doc: misc: Beaglebone capemanager documentation
@@ -81,5 +81,5 @@ index 0000000..2a8c766
+Applying the device tree overlay makes the cape operational, as if it was part
+of the kernel's booting device tree.
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0018-doc-dt-beaglebone-cape-manager-bindings.patch b/patches/bbb_overlays/0018-doc-dt-beaglebone-cape-manager-bindings.patch
index a550a19160b3f8355d04758f95b3df5cea14698c..67ffb863bd166fd9c39dfc8efca781b4fa7b9fdb 100644
--- a/patches/bbb_overlays/0018-doc-dt-beaglebone-cape-manager-bindings.patch
+++ b/patches/bbb_overlays/0018-doc-dt-beaglebone-cape-manager-bindings.patch
@@ -1,4 +1,4 @@
-From ac6e216e61405a5853332db287a3c8e874463cda Mon Sep 17 00:00:00 2001
+From c192324e1495a8ef56d3949654a7eddbfe13ea2e Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Tue, 12 May 2015 15:24:22 +0300
Subject: [PATCH 18/37] doc: dt: beaglebone cape manager bindings.
@@ -129,5 +129,5 @@ index 0000000..7e4fbc9
+ };
+};
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0019-doc-ABI-bone_capemgr-sysfs-API.patch b/patches/bbb_overlays/0019-doc-ABI-bone_capemgr-sysfs-API.patch
index 8bf3fa9e8528d91eb9fa90881cc32f15847fb25f..618d4eb73e5310aaf75e9f49640274c3524bb25f 100644
--- a/patches/bbb_overlays/0019-doc-ABI-bone_capemgr-sysfs-API.patch
+++ b/patches/bbb_overlays/0019-doc-ABI-bone_capemgr-sysfs-API.patch
@@ -1,4 +1,4 @@
-From d7b8542d63755ef14dd4b1d28c0de1cd486676fc Mon Sep 17 00:00:00 2001
+From 0bad62599c00cecd0e8f00dc4438cfa085a2c337 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Tue, 12 May 2015 16:20:08 +0300
Subject: [PATCH 19/37] doc: ABI: bone_capemgr sysfs API
@@ -81,5 +81,5 @@ index 0000000..e2df613
+ serial-number - baseboard serial number
+ config-option - displayed but ignored
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0020-MAINTAINERS-Beaglebone-capemanager-maintainer.patch b/patches/bbb_overlays/0020-MAINTAINERS-Beaglebone-capemanager-maintainer.patch
index 3c58a9e3eb44225844b2e54dad8d588d2be182db..7e82117928695616cc7964d17aa956c5ad1b2f46 100644
--- a/patches/bbb_overlays/0020-MAINTAINERS-Beaglebone-capemanager-maintainer.patch
+++ b/patches/bbb_overlays/0020-MAINTAINERS-Beaglebone-capemanager-maintainer.patch
@@ -1,4 +1,4 @@
-From 90652afa231b679f8172df883536dba0a6532fef Mon Sep 17 00:00:00 2001
+From c1b5a7301df6e600fb9401c6fcbf00f6e9b0e73c Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Wed, 13 May 2015 10:32:27 +0300
Subject: [PATCH 20/37] MAINTAINERS: Beaglebone capemanager maintainer
@@ -11,10 +11,10 @@ Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
1 file changed, 8 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
-index 30aca4a..ddf8b81 100644
+index 68282f0..09201b5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -2173,6 +2173,14 @@ W: https://linuxtv.org
+@@ -2177,6 +2177,14 @@ W: https://linuxtv.org
S: Supported
F: drivers/media/platform/sti/bdisp
@@ -30,5 +30,5 @@ index 30aca4a..ddf8b81 100644
S: Orphan
F: Documentation/filesystems/befs.txt
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0021-arm-dts-Enable-beaglebone-cape-manager.patch b/patches/bbb_overlays/0021-arm-dts-Enable-beaglebone-cape-manager.patch
index ff927e7670cf5c4bd91e4e9285574119eb7b6548..fcdb49520612cdf9945278efbcabbd1e16e18ccd 100644
--- a/patches/bbb_overlays/0021-arm-dts-Enable-beaglebone-cape-manager.patch
+++ b/patches/bbb_overlays/0021-arm-dts-Enable-beaglebone-cape-manager.patch
@@ -1,4 +1,4 @@
-From 4c575a4c8cdd8cc04693583ccd8fabe59da115d0 Mon Sep 17 00:00:00 2001
+From 69cb01e555e94d83435db390fd3a53b3bafab930 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Tue, 12 May 2015 14:35:13 +0300
Subject: [PATCH 21/37] arm: dts: Enable beaglebone cape-manager
@@ -44,5 +44,5 @@ index f3db13d..0d41adc 100644
+ };
+};
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0022-of-overlay-Implement-indirect-target-support.patch b/patches/bbb_overlays/0022-of-overlay-Implement-indirect-target-support.patch
index 2d62908360f65456bce5906eed3be6c6717eb7b4..6ac8de7e6c9a3e1f8e156eb4f18f054f4e430683 100644
--- a/patches/bbb_overlays/0022-of-overlay-Implement-indirect-target-support.patch
+++ b/patches/bbb_overlays/0022-of-overlay-Implement-indirect-target-support.patch
@@ -1,4 +1,4 @@
-From 352fa66565e59ac2c71853b90b6deca18d48b0a2 Mon Sep 17 00:00:00 2001
+From a04dc0499bd026ed82857184b9225abd2e25e8c0 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Thu, 21 May 2015 12:31:06 +0300
Subject: [PATCH 22/37] of: overlay: Implement indirect target support
@@ -229,7 +229,7 @@ index a8bfbf0..6508565 100644
static int overlay_subtree_check(struct device_node *tree,
struct device_node *dn)
diff --git a/include/linux/of.h b/include/linux/of.h
-index dd10626..8323b1d 100644
+index dc6e396..14763c1 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -1083,6 +1083,8 @@ int of_overlay_create(struct device_node *tree);
@@ -255,5 +255,5 @@ index dd10626..8323b1d 100644
#endif /* _LINUX_OF_H */
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0023-of-unittest-Add-indirect-overlay-target-test.patch b/patches/bbb_overlays/0023-of-unittest-Add-indirect-overlay-target-test.patch
index a49c3764707c5aaa47727d2a35d904651df3b187..dc5cb0da25eef16ef788fcf3463dbc92395f35d2 100644
--- a/patches/bbb_overlays/0023-of-unittest-Add-indirect-overlay-target-test.patch
+++ b/patches/bbb_overlays/0023-of-unittest-Add-indirect-overlay-target-test.patch
@@ -1,4 +1,4 @@
-From e12ab61f1716c776898b881533c4616c26abd9dc Mon Sep 17 00:00:00 2001
+From 00e332168ca9b72f8664c57ac485942c9c617f5e Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Thu, 21 May 2015 12:37:27 +0300
Subject: [PATCH 23/37] of: unittest: Add indirect overlay target test
@@ -145,5 +145,5 @@ index 979b6e4..23b866a 100644
if (unittest(of_unittest_overlay_i2c_init() == 0, "i2c init failed\n"))
goto out;
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0024-doc-dt-Document-the-indirect-overlay-method.patch b/patches/bbb_overlays/0024-doc-dt-Document-the-indirect-overlay-method.patch
index 16d38cf0eaecc078c4484eeb14170752a8fdfcbf..f87deec39672c31d11f4e60d9c55de46f05d4a4c 100644
--- a/patches/bbb_overlays/0024-doc-dt-Document-the-indirect-overlay-method.patch
+++ b/patches/bbb_overlays/0024-doc-dt-Document-the-indirect-overlay-method.patch
@@ -1,4 +1,4 @@
-From 4d9f89ab2c9b45555f6e1b4314216c093e5316ff Mon Sep 17 00:00:00 2001
+From 1a88184aa37c8a2da591cb8129697d37a1170910 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Fri, 12 Jun 2015 16:39:18 +0300
Subject: [PATCH 24/37] doc: dt: Document the indirect overlay method.
@@ -47,5 +47,5 @@ index d418a6c..dd595e6 100644
+of_overlay_create_indirect(). I.e. passing the "foo" id will select the target
+in the foo node, "bar" in bar node, etc.
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0025-of-overlay-Introduce-target-root-capability.patch b/patches/bbb_overlays/0025-of-overlay-Introduce-target-root-capability.patch
index bf95dcf2892bdf2e5e414e9e165a73e7d43dd06d..e2ca4b1e06e1b13142b95b88774e3c1c857ee61e 100644
--- a/patches/bbb_overlays/0025-of-overlay-Introduce-target-root-capability.patch
+++ b/patches/bbb_overlays/0025-of-overlay-Introduce-target-root-capability.patch
@@ -1,4 +1,4 @@
-From 0081d6092d6440e1ba15841d1e5a43938bad6f69 Mon Sep 17 00:00:00 2001
+From 9a1139364e1dbb754745a7f8f0ac71a48d473e9c Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Fri, 12 Jun 2015 15:32:55 +0300
Subject: [PATCH 25/37] of: overlay: Introduce target root capability.
@@ -197,7 +197,7 @@ index 6508565..de5aae1 100644
static int overlay_subtree_check(struct device_node *tree,
struct device_node *dn)
diff --git a/include/linux/of.h b/include/linux/of.h
-index 8323b1d..043e15f 100644
+index 14763c1..f7c91b3 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -1084,6 +1084,8 @@ int of_overlay_destroy(int id);
@@ -223,5 +223,5 @@ index 8323b1d..043e15f 100644
#endif /* _LINUX_OF_H */
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0026-of-unittest-Unit-tests-for-target-root-overlays.patch b/patches/bbb_overlays/0026-of-unittest-Unit-tests-for-target-root-overlays.patch
index 812ba25daabd01bec3962fd0983bb1d162038f5f..05b4e11397128edab70827dbe719c36fdac01206 100644
--- a/patches/bbb_overlays/0026-of-unittest-Unit-tests-for-target-root-overlays.patch
+++ b/patches/bbb_overlays/0026-of-unittest-Unit-tests-for-target-root-overlays.patch
@@ -1,4 +1,4 @@
-From 7ad3ca2addc54b7797c8251c25fb95f1f42b893c Mon Sep 17 00:00:00 2001
+From ee368d9b56c82772b946ec7189eb9003424c89aa Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Fri, 12 Jun 2015 16:18:26 +0300
Subject: [PATCH 26/37] of: unittest: Unit-tests for target root overlays.
@@ -324,5 +324,5 @@ index 23b866a..6a1270e 100644
if (unittest(of_unittest_overlay_i2c_init() == 0, "i2c init failed\n"))
goto out;
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0027-doc-dt-Document-the-target-root-overlay-method.patch b/patches/bbb_overlays/0027-doc-dt-Document-the-target-root-overlay-method.patch
index 721387d7ed7ba8fab606941b1614972c7140585f..f72b2060b8f7b7106fda4d9de0a569af63fe0b33 100644
--- a/patches/bbb_overlays/0027-doc-dt-Document-the-target-root-overlay-method.patch
+++ b/patches/bbb_overlays/0027-doc-dt-Document-the-target-root-overlay-method.patch
@@ -1,4 +1,4 @@
-From 2b35f0ae44ce32cb75c630eda18053fa659d07c0 Mon Sep 17 00:00:00 2001
+From ed2b7d6198f44919fda47c3867f118bbf5413c93 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Fri, 12 Jun 2015 16:51:27 +0300
Subject: [PATCH 27/37] doc: dt: Document the target root overlay method
@@ -35,5 +35,5 @@ index dd595e6..00ede57 100644
+lie under the target root node. I.e. the overlay is not allowed to 'break' out
+of the root.
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0028-of-dynamic-Add-__of_node_dupv.patch b/patches/bbb_overlays/0028-of-dynamic-Add-__of_node_dupv.patch
index 91b628fbbb15c7b6d668aff7008b235e05ab8de1..fffd5511b8f1a47f68478197fc5cc09616f4ffcc 100644
--- a/patches/bbb_overlays/0028-of-dynamic-Add-__of_node_dupv.patch
+++ b/patches/bbb_overlays/0028-of-dynamic-Add-__of_node_dupv.patch
@@ -1,4 +1,4 @@
-From 5866d77b10235b0f9f64bbcf877b1a000d43eda8 Mon Sep 17 00:00:00 2001
+From 28b15bfa5833f2810c7d7f76da1aa7983759af3a Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Wed, 10 Jun 2015 17:54:17 +0300
Subject: [PATCH 28/37] of: dynamic: Add __of_node_dupv()
@@ -74,5 +74,5 @@ index c647bd1..bd817eb 100644
{
of_node_put(ce->np);
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0029-of-changesets-Introduce-changeset-helper-methods.patch b/patches/bbb_overlays/0029-of-changesets-Introduce-changeset-helper-methods.patch
index 02f53bec6d7b40f9a18fef861b0e8595cd4d901b..ff5adda974b51cdc607230379ef11802e8685b31 100644
--- a/patches/bbb_overlays/0029-of-changesets-Introduce-changeset-helper-methods.patch
+++ b/patches/bbb_overlays/0029-of-changesets-Introduce-changeset-helper-methods.patch
@@ -1,4 +1,4 @@
-From fb5c25bd09c4d0ec8acccc66ac0957f9fdf32510 Mon Sep 17 00:00:00 2001
+From 7f1dd239eb7fe07ba024f9fea6166af2cdd2081b Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Wed, 10 Jun 2015 18:35:53 +0300
Subject: [PATCH 29/37] of: changesets: Introduce changeset helper methods
@@ -287,7 +287,7 @@ index bd817eb..7b0469f 100644
+ return of_changeset_add_property_copy(ocs, np, name, "", 0);
+}
diff --git a/include/linux/of.h b/include/linux/of.h
-index 043e15f..d6fca98 100644
+index f7c91b3..2d4f4db 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -1037,6 +1037,27 @@ static inline int of_changeset_update_property(struct of_changeset *ocs,
@@ -379,5 +379,5 @@ index 043e15f..d6fca98 100644
/* CONFIG_OF_RESOLVE api */
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0030-RFC-Device-overlay-manager-PCI-USB-DT.patch b/patches/bbb_overlays/0030-RFC-Device-overlay-manager-PCI-USB-DT.patch
index dd9602452dcb2b65e9cf0a0519d6c5f6dafef4f9..f3407b4f78b53a35fdbcc29f0d2e1828a0ec10dd 100644
--- a/patches/bbb_overlays/0030-RFC-Device-overlay-manager-PCI-USB-DT.patch
+++ b/patches/bbb_overlays/0030-RFC-Device-overlay-manager-PCI-USB-DT.patch
@@ -1,4 +1,4 @@
-From fadc9540f3c38484342a2a5b87fba13bee3979ae Mon Sep 17 00:00:00 2001
+From 6d62ec306739c850b69c6b81137298f5b44a39ab Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Thu, 21 May 2015 12:08:54 +0300
Subject: [PATCH 30/37] RFC: Device overlay manager (PCI/USB + DT)
@@ -1360,5 +1360,5 @@ index 0000000..18ea187
+}
+late_initcall(dovmgr_init);
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0031-boneblack-defconfig.patch b/patches/bbb_overlays/0031-boneblack-defconfig.patch
index a537563ad91ab1bc404590cfc82bb10cffaa43a4..7d36806d7072b581e669d039f3a6b59b6ebeca2a 100644
--- a/patches/bbb_overlays/0031-boneblack-defconfig.patch
+++ b/patches/bbb_overlays/0031-boneblack-defconfig.patch
@@ -1,4 +1,4 @@
-From aac6657d364ad0c3774711ed785141386f002b62 Mon Sep 17 00:00:00 2001
+From 838baca76b8d3b81f5b92e85bc414726735ee3dd Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Sat, 21 Jun 2014 17:38:38 +0300
Subject: [PATCH 31/37] boneblack defconfig
@@ -1273,5 +1273,5 @@ index 0000000..368ab15
+CONFIG_FONT_8x16=y
+CONFIG_FONT_MINI_4x6=y
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0032-connector-wip.patch b/patches/bbb_overlays/0032-connector-wip.patch
index 019c0d4be1a186e84ef159a73bbe24dc1dd11ca3..8172ba761b172496c193783d62e550d2e00fd084 100644
--- a/patches/bbb_overlays/0032-connector-wip.patch
+++ b/patches/bbb_overlays/0032-connector-wip.patch
@@ -1,4 +1,4 @@
-From f9852884aa2136684f4bb0ed208dff3daaa81099 Mon Sep 17 00:00:00 2001
+From 1c190c0a1435a6c5482d29df872cb337b0fcb45e Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Wed, 16 Sep 2015 13:02:34 +0300
Subject: [PATCH 32/37] connector wip
@@ -635,5 +635,5 @@ index 0000000..ba77e7a
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:extcon-dt-con");
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0033-of-remove-bogus-return-in-of_core_init.patch b/patches/bbb_overlays/0033-of-remove-bogus-return-in-of_core_init.patch
index e07d1d394f39d5a19ff850b8350d43a46cc11d7a..1d521e0fa75083e0c986d3677a66e6f203a70cd5 100644
--- a/patches/bbb_overlays/0033-of-remove-bogus-return-in-of_core_init.patch
+++ b/patches/bbb_overlays/0033-of-remove-bogus-return-in-of_core_init.patch
@@ -1,4 +1,4 @@
-From 5d1a1057f10461c80c1de3427c44a47c67170b70 Mon Sep 17 00:00:00 2001
+From 311858d5612e1118f06c87a82fb82fbf70103af1 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Wed, 14 Oct 2015 13:22:38 +0300
Subject: [PATCH 33/37] of: remove bogus return in of_core_init
@@ -22,5 +22,5 @@ index c6f6286..fc9070f 100644
static struct property *__of_find_property(const struct device_node *np,
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0034-of-Maintainer-fixes-for-dynamic.patch b/patches/bbb_overlays/0034-of-Maintainer-fixes-for-dynamic.patch
index 5afe66bf3f1770120a00c93fed47df69558d8929..d1f24ce9dfe0255e19c41121f391f69a82bcd682 100644
--- a/patches/bbb_overlays/0034-of-Maintainer-fixes-for-dynamic.patch
+++ b/patches/bbb_overlays/0034-of-Maintainer-fixes-for-dynamic.patch
@@ -1,4 +1,4 @@
-From 232d4f19e2f8461c262f6c28ccb18b7b796e9f3f Mon Sep 17 00:00:00 2001
+From d1466d789283f8412a59f785ad81bf699568111e Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Wed, 14 Oct 2015 13:14:29 +0300
Subject: [PATCH 34/37] of: Maintainer fixes for dynamic
@@ -56,5 +56,5 @@ index 7b0469f..eca22b4 100644
ret = of_changeset_add_property_copy(ocs, np, name, value, total);
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0035-of-unittest-changeset-helpers.patch b/patches/bbb_overlays/0035-of-unittest-changeset-helpers.patch
index 9e84901dc44a64947b94c4619b8e05ca0792202b..1ca2f55906803fb6c1cc1dcadf4687b5e09f584d 100644
--- a/patches/bbb_overlays/0035-of-unittest-changeset-helpers.patch
+++ b/patches/bbb_overlays/0035-of-unittest-changeset-helpers.patch
@@ -1,18 +1,18 @@
-From fe22f1ffa845c63f336e7639ff6f475138045f0e Mon Sep 17 00:00:00 2001
+From 3b6f304f99341e2cdbe90a98597ad8688260d99d Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Wed, 14 Oct 2015 13:16:15 +0300
Subject: [PATCH 35/37] of: unittest: changeset helpers
Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
---
- drivers/of/unittest.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 44 insertions(+)
+ drivers/of/unittest.c | 40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
-index 6a1270e..71e47c4 100644
+index 6a1270e..6501252 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
-@@ -543,6 +543,49 @@ static void __init of_unittest_changeset(void)
+@@ -543,6 +543,45 @@ static void __init of_unittest_changeset(void)
#endif
}
@@ -39,18 +39,14 @@ index 6a1270e..71e47c4 100644
+ of_changeset_init(&chgset);
+ unittest(!of_changeset_add_property_string(&chgset, parent,
+ "prop-add", "foo"), "fail add prop\n");
-+ mutex_lock(&of_mutex);
+ unittest(!__of_changeset_apply(&chgset), "apply failed\n");
-+ mutex_unlock(&of_mutex);
+
+ /* Make sure node names are constructed correctly */
+ unittest((np = of_find_node_by_path("/testcase-data/changeset/n2/n21")),
+ "'%s' not added\n", n21->full_name);
+ of_node_put(np);
+
-+ mutex_lock(&of_mutex);
-+ unittest(!of_changeset_revert(&chgset), "revert failed\n");
-+ mutex_unlock(&of_mutex);
++ unittest(!__of_changeset_revert(&chgset), "revert failed\n");
+
+ of_changeset_destroy(&chgset);
+
@@ -62,7 +58,7 @@ index 6a1270e..71e47c4 100644
static void __init of_unittest_parse_interrupts(void)
{
struct device_node *np;
-@@ -2236,6 +2279,7 @@ static int __init of_unittest(void)
+@@ -2236,6 +2275,7 @@ static int __init of_unittest(void)
of_unittest_property_string();
of_unittest_property_copy();
of_unittest_changeset();
@@ -71,5 +67,5 @@ index 6a1270e..71e47c4 100644
of_unittest_parse_interrupts_extended();
of_unittest_match_node();
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0036-of-rename-_node_sysfs-to-_node_post.patch b/patches/bbb_overlays/0036-of-rename-_node_sysfs-to-_node_post.patch
index c23f7b91dd53cb3901a7bef936592ed26052c1df..caadb09a0f50729807dbbe8188250269181d50f4 100644
--- a/patches/bbb_overlays/0036-of-rename-_node_sysfs-to-_node_post.patch
+++ b/patches/bbb_overlays/0036-of-rename-_node_sysfs-to-_node_post.patch
@@ -1,4 +1,4 @@
-From 3eac28051e50f0c4e1a56f4c60a9221a850f5db0 Mon Sep 17 00:00:00 2001
+From bbe8c86a268c7b05188a4af58774adf050103bae Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Wed, 14 Oct 2015 13:20:54 +0300
Subject: [PATCH 36/37] of: rename *_node_sysfs to _node_post
@@ -94,10 +94,10 @@ index 092cba7..10b0342 100644
/* iterators for transactions, used for overlays */
/* forward iterator */
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
-index 71e47c4..2512172 100644
+index 6501252..d68c19b 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
-@@ -921,7 +921,7 @@ static int attach_node_and_children(struct device_node *np)
+@@ -917,7 +917,7 @@ static int attach_node_and_children(struct device_node *np)
of_node_clear_flag(np, OF_DETACHED);
raw_spin_unlock_irqrestore(&devtree_lock, flags);
@@ -106,7 +106,7 @@ index 71e47c4..2512172 100644
mutex_unlock(&of_mutex);
while (child) {
-@@ -979,7 +979,7 @@ static int __init unittest_data_add(void)
+@@ -975,7 +975,7 @@ static int __init unittest_data_add(void)
if (!of_root) {
of_root = unittest_data_node;
for_each_of_allnodes(np)
@@ -116,5 +116,5 @@ index 71e47c4..2512172 100644
of_chosen = of_find_node_by_path("/chosen");
return 0;
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/bbb_overlays/0037-of-Support-hashtable-lookups-for-phandles.patch b/patches/bbb_overlays/0037-of-Support-hashtable-lookups-for-phandles.patch
index 04a1f555d5552911d643c31d9697245333cc39cd..50bf79aae3a8ebed80c2bc6c32251013699daf01 100644
--- a/patches/bbb_overlays/0037-of-Support-hashtable-lookups-for-phandles.patch
+++ b/patches/bbb_overlays/0037-of-Support-hashtable-lookups-for-phandles.patch
@@ -1,4 +1,4 @@
-From b2c2963edd9e0c72143cff7aa00f974f3f5fa215 Mon Sep 17 00:00:00 2001
+From 1cdf7f99f8f67f932e520de0879b1a3586f8c7ac Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Wed, 14 Oct 2015 13:29:23 +0300
Subject: [PATCH 37/37] of: Support hashtable lookups for phandles
@@ -152,7 +152,7 @@ index 10b0342..88b3b8f 100644
+
#endif /* _LINUX_OF_PRIVATE_H */
diff --git a/include/linux/of.h b/include/linux/of.h
-index d6fca98..4687d73 100644
+index 2d4f4db..c6ef1b9 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -25,6 +25,7 @@
@@ -172,5 +172,5 @@ index d6fca98..4687d73 100644
struct property *properties;
struct property *deadprops; /* removed properties */
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/beaglebone/capes/0004-add-lcd-am335x-boneblack-bbb-exp-c.dtb-am335x-bonebl.patch b/patches/beaglebone/capes/0004-add-lcd-am335x-boneblack-bbb-exp-c.dtb-am335x-bonebl.patch
index 045e2dc5fc6655ec49a7218be7641165e767f918..f24d678c0d47f0aac9bc36391d046d9e9b57957a 100644
--- a/patches/beaglebone/capes/0004-add-lcd-am335x-boneblack-bbb-exp-c.dtb-am335x-bonebl.patch
+++ b/patches/beaglebone/capes/0004-add-lcd-am335x-boneblack-bbb-exp-c.dtb-am335x-bonebl.patch
@@ -1,6 +1,6 @@
-From 10d4ff47f8b0b5ef0b513e5e19be5a6cd8e08de2 Mon Sep 17 00:00:00 2001
+From e8e27c3120dd7f8a3cb2a108469f8d2c8b048d79 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 22 Jan 2016 11:41:21 -0600
+Date: Fri, 12 Feb 2016 15:03:52 -0600
Subject: [PATCH 4/4] add: lcd: am335x-boneblack-bbb-exp-c.dtb
am335x-boneblack-bbb-exp-r.dtb
@@ -11,8 +11,8 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
arch/arm/boot/dts/am335x-bone-pinmux-ttyS1.dtsi | 48 +++++
arch/arm/boot/dts/am335x-bone-pinmux-ttyS2.dtsi | 48 +++++
arch/arm/boot/dts/am335x-bone-pinmux-ttyS4.dtsi | 48 +++++
- arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts | 45 +++++
- arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts | 45 +++++
+ arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts | 40 ++++
+ arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts | 40 ++++
arch/arm/boot/dts/am335x-cape-bbb-exp-c.dtsi | 224 +++++++++++++++++++++
arch/arm/boot/dts/am335x-cape-bbb-exp-r.dtsi | 217 ++++++++++++++++++++
arch/arm/boot/dts/am335x-peripheral-can0.dtsi | 13 ++
@@ -20,7 +20,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
arch/arm/boot/dts/am335x-peripheral-ttyS1.dtsi | 13 ++
arch/arm/boot/dts/am335x-peripheral-ttyS2.dtsi | 13 ++
arch/arm/boot/dts/am335x-peripheral-ttyS4.dtsi | 13 ++
- 14 files changed, 972 insertions(+)
+ 14 files changed, 962 insertions(+)
create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-can0.dtsi
create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-panel-1024x600-24bit.dtsi
create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-ttyS1.dtsi
@@ -408,10 +408,10 @@ index 0000000..1d22a95
+};
diff --git a/arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts
new file mode 100644
-index 0000000..938a26a
+index 0000000..857c21e
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts
-@@ -0,0 +1,45 @@
+@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
@@ -439,11 +439,6 @@ index 0000000..938a26a
+ vmmc-supply = <&vmmcsd_fixed>;
+};
+
-+&am33xx_pinmux {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&clkout2_pin>;
-+};
-+
+&mmc2 {
+ vmmc-supply = <&vmmcsd_fixed>;
+ pinctrl-names = "default";
@@ -459,10 +454,10 @@ index 0000000..938a26a
+#include "am335x-cape-bbb-exp-c.dtsi"
diff --git a/arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts
new file mode 100644
-index 0000000..6cf786f
+index 0000000..b834fa2
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts
-@@ -0,0 +1,45 @@
+@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
@@ -490,11 +485,6 @@ index 0000000..6cf786f
+ vmmc-supply = <&vmmcsd_fixed>;
+};
+
-+&am33xx_pinmux {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&clkout2_pin>;
-+};
-+
+&mmc2 {
+ vmmc-supply = <&vmmcsd_fixed>;
+ pinctrl-names = "default";
@@ -1093,5 +1083,5 @@ index 0000000..adc89f0
+ status = "okay";
+};
--
-2.7.0.rc3
+2.7.0
diff --git a/patches/beaglebone/dts/0004-am335x-bone-common-disable-default-clkout2_pin.patch b/patches/beaglebone/dts/0004-am335x-bone-common-disable-default-clkout2_pin.patch
new file mode 100644
index 0000000000000000000000000000000000000000..236051d89c81b57ffb20dbdfea31ef2cacfc00ed
--- /dev/null
+++ b/patches/beaglebone/dts/0004-am335x-bone-common-disable-default-clkout2_pin.patch
@@ -0,0 +1,40 @@
+From 21e4234824310141f5e725e88abc6b48d169f95b Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Fri, 12 Feb 2016 14:52:52 -0600
+Subject: [PATCH 4/4] am335x-bone-common: disable default clkout2_pin
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
+index cdd3a79..6d53ba7 100644
+--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
++++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
+@@ -62,9 +62,6 @@
+ };
+
+ &am33xx_pinmux {
+- pinctrl-names = "default";
+- pinctrl-0 = <&clkout2_pin>;
+-
+ user_leds_s0: user_leds_s0 {
+ pinctrl-single,pins = <
+ AM33XX_IOPAD(0x854, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a5.gpio1_21 */
+@@ -95,12 +92,6 @@
+ >;
+ };
+
+- clkout2_pin: pinmux_clkout2_pin {
+- pinctrl-single,pins = <
+- AM33XX_IOPAD(0x9b4, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
+- >;
+- };
+-
+ cpsw_default: cpsw_default {
+ pinctrl-single,pins = <
+ /* Slave 1 */
+--
+2.7.0
+
diff --git a/patches/beaglebone/overlays/0001-am335x-overlays.patch b/patches/beaglebone/overlays/0001-am335x-overlays.patch
index 18798c1612c2f9227527f828f5a5ae9191d67d96..39bb03aa44378036c83f905668d34506b2935bf2 100644
--- a/patches/beaglebone/overlays/0001-am335x-overlays.patch
+++ b/patches/beaglebone/overlays/0001-am335x-overlays.patch
@@ -1,11 +1,11 @@
-From 8c3feeb74b34aaedf0e599a0342ad25553d18b1e Mon Sep 17 00:00:00 2001
+From eebf924a1f8d00440364d45e7844ea64cdb889bd Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 5 Feb 2016 09:51:39 -0600
+Date: Fri, 12 Feb 2016 15:00:13 -0600
Subject: [PATCH] am335x: overlays
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
- .../boot/dts/am335x-bone-common-no-capemgr.dtsi | 359 +++++++++++++++++++++
+ .../boot/dts/am335x-bone-common-no-capemgr.dtsi | 353 +++++++++++++++++++++
arch/arm/boot/dts/am335x-bone.dts | 1 +
.../arm/boot/dts/am335x-boneblack-emmc-overlay.dts | 39 +++
.../arm/boot/dts/am335x-boneblack-hdmi-overlay.dts | 99 ++++++
@@ -16,7 +16,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
arch/arm/boot/dts/am335x-bonegreen.dts | 1 +
arch/arm/boot/dts/am33xx-overlay-edma-fix.dtsi | 25 ++
include/dt-bindings/board/am335x-bbw-bbb-base.h | 103 ++++++
- 11 files changed, 809 insertions(+)
+ 11 files changed, 803 insertions(+)
create mode 100644 arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
create mode 100644 arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts
create mode 100644 arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts
@@ -28,10 +28,10 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
diff --git a/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi b/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
new file mode 100644
-index 0000000..f440182
+index 0000000..6c79cc7
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
-@@ -0,0 +1,359 @@
+@@ -0,0 +1,353 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
@@ -126,12 +126,6 @@ index 0000000..f440182
+ >;
+ };
+
-+ clkout2_pin: pinmux_clkout2_pin {
-+ pinctrl-single,pins = <
-+ AM33XX_IOPAD(0x9b4, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
-+ >;
-+ };
-+
+ cpsw_default: cpsw_default {
+ pinctrl-single,pins = <
+ /* Slave 1 */
@@ -706,7 +700,7 @@ index 0000000..880629c
+ system-power-controller;
+};
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
-index eadbba3..deb5c10 100644
+index 55c0e95..db5beb5 100644
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -9,6 +9,7 @@
@@ -765,7 +759,7 @@ index 0000000..b87a606
+ system-power-controller;
+};
diff --git a/arch/arm/boot/dts/am335x-bonegreen.dts b/arch/arm/boot/dts/am335x-bonegreen.dts
-index 0f65bda..dec84cb 100644
+index dce3c86..42ac698 100644
--- a/arch/arm/boot/dts/am335x-bonegreen.dts
+++ b/arch/arm/boot/dts/am335x-bonegreen.dts
@@ -9,6 +9,7 @@
diff --git a/patches/defconfig b/patches/defconfig
index d8a26e9034879884cebd9f6bb8f45797d142f4a2..f8a2bb7cde5eb1642b8739ea3884b0bb5ba6e571 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.5.0-rc3 Kernel Configuration
+# Linux/arm 4.5.0-rc4 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -200,7 +200,7 @@ CONFIG_SLAB=y
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
CONFIG_KEXEC_CORE=y
-CONFIG_OPROFILE=y
+CONFIG_OPROFILE=m
CONFIG_HAVE_OPROFILE=y
CONFIG_KPROBES=y
CONFIG_JUMP_LABEL=y
@@ -840,7 +840,7 @@ CONFIG_NF_NAT_REDIRECT=m
CONFIG_NETFILTER_SYNPROXY=m
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_INET=m
-# CONFIG_NF_TABLES_NETDEV is not set
+CONFIG_NF_TABLES_NETDEV=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_CT=m
@@ -856,6 +856,9 @@ CONFIG_NFT_QUEUE=m
CONFIG_NFT_REJECT=m
CONFIG_NFT_REJECT_INET=m
CONFIG_NFT_COMPAT=m
+# CONFIG_NF_DUP_NETDEV is not set
+# CONFIG_NFT_DUP_NETDEV is not set
+# CONFIG_NFT_FWD_NETDEV is not set
CONFIG_NETFILTER_XTABLES=m
#
@@ -984,7 +987,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 is not set
+CONFIG_IP_VS_OVF=m
CONFIG_IP_VS_LBLC=m
CONFIG_IP_VS_LBLCR=m
CONFIG_IP_VS_DH=m
@@ -1023,7 +1026,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 is not set
+CONFIG_NFT_REDIR_IPV4=m
CONFIG_NF_NAT_SNMP_BASIC=m
CONFIG_NF_NAT_PROTO_GRE=m
CONFIG_NF_NAT_PPTP=m
@@ -1066,7 +1069,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 is not set
+CONFIG_NFT_REDIR_IPV6=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1242,7 +1245,7 @@ CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_FLOW=m
CONFIG_NET_CLS_CGROUP=m
CONFIG_NET_CLS_BPF=m
-# CONFIG_NET_CLS_FLOWER is not set
+CONFIG_NET_CLS_FLOWER=m
CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_STACK=32
CONFIG_NET_EMATCH_CMP=m
@@ -1286,9 +1289,10 @@ CONFIG_NETLINK_DIAG=m
CONFIG_MPLS=y
CONFIG_NET_MPLS_GSO=y
CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
# CONFIG_HSR is not set
# CONFIG_NET_SWITCHDEV is not set
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
CONFIG_SOCK_CGROUP_DATA=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_NET_CLASSID=y
@@ -1467,7 +1471,7 @@ CONFIG_NFC_MICROREAD_I2C=m
# CONFIG_NFC_NXP_NCI is not set
# CONFIG_NFC_S3FWRN5_I2C is not set
# CONFIG_NFC_ST95HF is not set
-# CONFIG_LWTUNNEL is not set
+CONFIG_LWTUNNEL=y
CONFIG_HAVE_BPF_JIT=y
#
@@ -1928,6 +1932,7 @@ CONFIG_TUN=m
CONFIG_VETH=m
CONFIG_VIRTIO_NET=m
CONFIG_NLMON=m
+CONFIG_NET_VRF=m
CONFIG_ATM_DRIVERS=y
CONFIG_ATM_DUMMY=m
# CONFIG_ATM_TCP is not set
@@ -2020,7 +2025,7 @@ CONFIG_PHYLIB=y
#
# MII PHY device drivers
#
-# CONFIG_AQUANTIA_PHY is not set
+CONFIG_AQUANTIA_PHY=m
CONFIG_AT803X_PHY=m
CONFIG_AMD_PHY=m
CONFIG_MARVELL_PHY=m
@@ -2029,7 +2034,7 @@ CONFIG_QSEMI_PHY=m
CONFIG_LXT_PHY=m
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
-# CONFIG_TERANETICS_PHY is not set
+CONFIG_TERANETICS_PHY=m
CONFIG_SMSC_PHY=y
CONFIG_BCM_NET_PHYLIB=m
CONFIG_BROADCOM_PHY=m
@@ -3084,7 +3089,7 @@ CONFIG_SOFT_WATCHDOG=m
# 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_DW_WATCHDOG=y
CONFIG_OMAP_WATCHDOG=y
CONFIG_TWL4030_WATCHDOG=y
# CONFIG_TS4800_WATCHDOG is not set
@@ -3387,7 +3392,7 @@ CONFIG_USB_GSPCA_STV0680=m
CONFIG_USB_GSPCA_SUNPLUS=m
CONFIG_USB_GSPCA_T613=m
CONFIG_USB_GSPCA_TOPRO=m
-# CONFIG_USB_GSPCA_TOUPTEK is not set
+CONFIG_USB_GSPCA_TOUPTEK=m
CONFIG_USB_GSPCA_TV8532=m
CONFIG_USB_GSPCA_VC032X=m
CONFIG_USB_GSPCA_VICAM=m
@@ -5374,7 +5379,6 @@ 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
@@ -5634,7 +5638,7 @@ CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
-# CONFIG_NFSD_PNFS is not set
+CONFIG_NFSD_PNFS=y
CONFIG_NFSD_V4_SECURITY_LABEL=y
# CONFIG_NFSD_FAULT_INJECTION is not set
CONFIG_GRACE_PERIOD=y
@@ -5833,6 +5837,7 @@ CONFIG_DEBUG_LIST=y
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RCU_TRACE is not set
# CONFIG_RCU_EQS_DEBUG is not set
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
CONFIG_NOTIFIER_ERROR_INJECTION=m
CONFIG_PM_NOTIFIER_ERROR_INJECT=m
@@ -6018,7 +6023,7 @@ CONFIG_CRYPTO_ABLK_HELPER=m
#
CONFIG_CRYPTO_CCM=m
CONFIG_CRYPTO_GCM=m
-# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
+CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_SEQIV=y
CONFIG_CRYPTO_ECHAINIV=m
@@ -6049,7 +6054,7 @@ CONFIG_CRYPTO_CRC32C=y
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRCT10DIF=y
CONFIG_CRYPTO_GHASH=m
-# CONFIG_CRYPTO_POLY1305 is not set
+CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -6079,7 +6084,7 @@ CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_SALSA20=m
-# CONFIG_CRYPTO_CHACHA20 is not set
+CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_TEA=m
@@ -6110,7 +6115,7 @@ CONFIG_CRYPTO_USER_API=m
CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
# CONFIG_CRYPTO_USER_API_RNG is not set
-# CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_OMAP_SHAM=m
CONFIG_CRYPTO_DEV_OMAP_AES=m
diff --git a/patches/defconfig-bone b/patches/defconfig-bone
index 2a2d31060c28a51b784d70a083107241551481cd..10723615c4733671041434e891149e8fbff5da1d 100644
--- a/patches/defconfig-bone
+++ b/patches/defconfig-bone
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.5.0-rc3 Kernel Configuration
+# Linux/arm 4.5.0-rc4 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -200,7 +200,7 @@ CONFIG_SLAB=y
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
CONFIG_KEXEC_CORE=y
-CONFIG_OPROFILE=y
+CONFIG_OPROFILE=m
CONFIG_HAVE_OPROFILE=y
CONFIG_KPROBES=y
CONFIG_JUMP_LABEL=y
@@ -840,7 +840,7 @@ CONFIG_NF_NAT_REDIRECT=m
CONFIG_NETFILTER_SYNPROXY=m
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_INET=m
-# CONFIG_NF_TABLES_NETDEV is not set
+CONFIG_NF_TABLES_NETDEV=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_CT=m
@@ -856,6 +856,9 @@ CONFIG_NFT_QUEUE=m
CONFIG_NFT_REJECT=m
CONFIG_NFT_REJECT_INET=m
CONFIG_NFT_COMPAT=m
+# CONFIG_NF_DUP_NETDEV is not set
+# CONFIG_NFT_DUP_NETDEV is not set
+# CONFIG_NFT_FWD_NETDEV is not set
CONFIG_NETFILTER_XTABLES=m
#
@@ -984,7 +987,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 is not set
+CONFIG_IP_VS_OVF=m
CONFIG_IP_VS_LBLC=m
CONFIG_IP_VS_LBLCR=m
CONFIG_IP_VS_DH=m
@@ -1023,7 +1026,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 is not set
+CONFIG_NFT_REDIR_IPV4=m
CONFIG_NF_NAT_SNMP_BASIC=m
CONFIG_NF_NAT_PROTO_GRE=m
CONFIG_NF_NAT_PPTP=m
@@ -1066,7 +1069,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 is not set
+CONFIG_NFT_REDIR_IPV6=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1242,7 +1245,7 @@ CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_FLOW=m
CONFIG_NET_CLS_CGROUP=m
CONFIG_NET_CLS_BPF=m
-# CONFIG_NET_CLS_FLOWER is not set
+CONFIG_NET_CLS_FLOWER=m
CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_STACK=32
CONFIG_NET_EMATCH_CMP=m
@@ -1286,9 +1289,10 @@ CONFIG_NETLINK_DIAG=m
CONFIG_MPLS=y
CONFIG_NET_MPLS_GSO=y
CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
# CONFIG_HSR is not set
# CONFIG_NET_SWITCHDEV is not set
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
CONFIG_SOCK_CGROUP_DATA=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_NET_CLASSID=y
@@ -1467,7 +1471,7 @@ CONFIG_NFC_MICROREAD_I2C=m
# CONFIG_NFC_NXP_NCI is not set
# CONFIG_NFC_S3FWRN5_I2C is not set
# CONFIG_NFC_ST95HF is not set
-# CONFIG_LWTUNNEL is not set
+CONFIG_LWTUNNEL=y
CONFIG_HAVE_BPF_JIT=y
#
@@ -1928,6 +1932,7 @@ CONFIG_TUN=m
CONFIG_VETH=m
CONFIG_VIRTIO_NET=m
CONFIG_NLMON=m
+CONFIG_NET_VRF=m
CONFIG_ATM_DRIVERS=y
CONFIG_ATM_DUMMY=m
# CONFIG_ATM_TCP is not set
@@ -2020,7 +2025,7 @@ CONFIG_PHYLIB=y
#
# MII PHY device drivers
#
-# CONFIG_AQUANTIA_PHY is not set
+CONFIG_AQUANTIA_PHY=m
CONFIG_AT803X_PHY=m
CONFIG_AMD_PHY=m
CONFIG_MARVELL_PHY=m
@@ -2029,7 +2034,7 @@ CONFIG_QSEMI_PHY=m
CONFIG_LXT_PHY=m
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
-# CONFIG_TERANETICS_PHY is not set
+CONFIG_TERANETICS_PHY=m
CONFIG_SMSC_PHY=y
CONFIG_BCM_NET_PHYLIB=m
CONFIG_BROADCOM_PHY=m
@@ -3084,7 +3089,7 @@ CONFIG_SOFT_WATCHDOG=m
# 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_DW_WATCHDOG=y
CONFIG_OMAP_WATCHDOG=y
CONFIG_TWL4030_WATCHDOG=y
# CONFIG_TS4800_WATCHDOG is not set
@@ -3387,7 +3392,7 @@ CONFIG_USB_GSPCA_STV0680=m
CONFIG_USB_GSPCA_SUNPLUS=m
CONFIG_USB_GSPCA_T613=m
CONFIG_USB_GSPCA_TOPRO=m
-# CONFIG_USB_GSPCA_TOUPTEK is not set
+CONFIG_USB_GSPCA_TOUPTEK=m
CONFIG_USB_GSPCA_TV8532=m
CONFIG_USB_GSPCA_VC032X=m
CONFIG_USB_GSPCA_VICAM=m
@@ -5375,7 +5380,6 @@ 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
@@ -5635,7 +5639,7 @@ CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
-# CONFIG_NFSD_PNFS is not set
+CONFIG_NFSD_PNFS=y
CONFIG_NFSD_V4_SECURITY_LABEL=y
# CONFIG_NFSD_FAULT_INJECTION is not set
CONFIG_GRACE_PERIOD=y
@@ -5834,6 +5838,7 @@ CONFIG_DEBUG_LIST=y
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RCU_TRACE is not set
# CONFIG_RCU_EQS_DEBUG is not set
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
CONFIG_NOTIFIER_ERROR_INJECTION=m
CONFIG_PM_NOTIFIER_ERROR_INJECT=m
@@ -6019,7 +6024,7 @@ CONFIG_CRYPTO_ABLK_HELPER=m
#
CONFIG_CRYPTO_CCM=m
CONFIG_CRYPTO_GCM=m
-# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
+CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_SEQIV=y
CONFIG_CRYPTO_ECHAINIV=m
@@ -6050,7 +6055,7 @@ CONFIG_CRYPTO_CRC32C=y
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRCT10DIF=y
CONFIG_CRYPTO_GHASH=m
-# CONFIG_CRYPTO_POLY1305 is not set
+CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -6080,7 +6085,7 @@ CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_SALSA20=m
-# CONFIG_CRYPTO_CHACHA20 is not set
+CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_TEA=m
@@ -6111,7 +6116,7 @@ CONFIG_CRYPTO_USER_API=m
CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
# CONFIG_CRYPTO_USER_API_RNG is not set
-# CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_OMAP_SHAM=m
CONFIG_CRYPTO_DEV_OMAP_AES=m
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index 42fcc206ff2183461ffa102e9618558395ae42f0..6f170f71d25dfad66f3c9f691769218d8b2fe245 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.5.0-rc3 Kernel Configuration
+# Linux/arm 4.5.0-rc4 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2449,9 +2449,9 @@ 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_OMAP5_DSS_HDMI=y
+CONFIG_FB_OMAP2_DSS_SDI=y
+CONFIG_FB_OMAP2_DSS_DSI=y
CONFIG_FB_OMAP2_DSS_MIN_FCK_PER_PCK=0
CONFIG_FB_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
@@ -2459,19 +2459,19 @@ 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_OMAP2_ENCODER_TFP410=m
+CONFIG_FB_OMAP2_ENCODER_TPD12S015=m
+CONFIG_FB_OMAP2_CONNECTOR_DVI=m
+CONFIG_FB_OMAP2_CONNECTOR_HDMI=m
+CONFIG_FB_OMAP2_CONNECTOR_ANALOG_TV=m
+CONFIG_FB_OMAP2_PANEL_DPI=m
+CONFIG_FB_OMAP2_PANEL_DSI_CM=m
+CONFIG_FB_OMAP2_PANEL_SONY_ACX565AKM=m
+CONFIG_FB_OMAP2_PANEL_LGPHILIPS_LB035Q02=m
+CONFIG_FB_OMAP2_PANEL_SHARP_LS037V7DW01=m
+CONFIG_FB_OMAP2_PANEL_TPO_TD028TTEC1=m
+CONFIG_FB_OMAP2_PANEL_TPO_TD043MTEA1=m
+CONFIG_FB_OMAP2_PANEL_NEC_NL8048HL11=m
# CONFIG_FB_SSD1307 is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
@@ -3620,7 +3620,6 @@ 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
@@ -3958,6 +3957,7 @@ CONFIG_PROVE_RCU=y
CONFIG_RCU_CPU_STALL_TIMEOUT=21
# CONFIG_RCU_TRACE is not set
# CONFIG_RCU_EQS_DEBUG is not set
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
# CONFIG_FAULT_INJECTION is not set
diff --git a/version.sh b/version.sh
index 1fb78e6bfecb8030fc0ed6997d8fb294d3980868..fe8e3d4aebc6d49356238cee9a9a91360bb797d0 100644
--- a/version.sh
+++ b/version.sh
@@ -24,7 +24,7 @@ toolchain="gcc_linaro_gnueabihf_5"
#Kernel/Build
KERNEL_REL=4.5
-KERNEL_TAG=${KERNEL_REL}-rc3
+KERNEL_TAG=${KERNEL_REL}-rc4
BUILD=${build_prefix}2
kernel_rt=".X-rtY"