From b980958c54e8b198c2d38cb6a87513af2911c9d9 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 21 Dec 2015 13:58:23 -0600
Subject: [PATCH] am335x-olimex-som: we cant dynamicly control the regulator
 from voltdm, so just disable voltdm

fixes: https://github.com/beagleboard/linux/pull/54
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 patch.sh                                      |  1 +
 ...x-olimex-som-no-regulator-for-voltdm.patch | 49 +++++++++++++++++++
 version.sh                                    |  2 +-
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 patches/beaglebone/am335x_olimex_som/0002-am335x-olimex-som-no-regulator-for-voltdm.patch

diff --git a/patch.sh b/patch.sh
index 9ff8b2e8c..1fe88dc21 100644
--- a/patch.sh
+++ b/patch.sh
@@ -568,6 +568,7 @@ beaglebone () {
 	fi
 
 	${git} "${DIR}/patches/beaglebone/am335x_olimex_som/0001-ARM-dts-Add-support-for-Olimex-AM3352-SOM.patch"
+	${git} "${DIR}/patches/beaglebone/am335x_olimex_som/0002-am335x-olimex-som-no-regulator-for-voltdm.patch"
 
 	if [ "x${regenerate}" = "xenable" ] ; then
 		number=1
diff --git a/patches/beaglebone/am335x_olimex_som/0002-am335x-olimex-som-no-regulator-for-voltdm.patch b/patches/beaglebone/am335x_olimex_som/0002-am335x-olimex-som-no-regulator-for-voltdm.patch
new file mode 100644
index 000000000..8d3735fb1
--- /dev/null
+++ b/patches/beaglebone/am335x_olimex_som/0002-am335x-olimex-som-no-regulator-for-voltdm.patch
@@ -0,0 +1,49 @@
+From 3b27486431acb94f508c7a3ce8d60ae9c3c8f1bd Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Sun, 20 Dec 2015 18:06:19 -0600
+Subject: [PATCH 2/2] am335x-olimex-som: no regulator for voltdm
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/am335x-olimex-som.dts | 2 +-
+ arch/arm/mach-omap2/opp33xx_data.c      | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/am335x-olimex-som.dts b/arch/arm/boot/dts/am335x-olimex-som.dts
+index 63879e4..e7ee978 100644
+--- a/arch/arm/boot/dts/am335x-olimex-som.dts
++++ b/arch/arm/boot/dts/am335x-olimex-som.dts
+@@ -12,7 +12,7 @@
+ 
+ / {
+ 	model = "Olimex AM335x SOM";
+-	compatible = "ti,am33xx";
++	compatible = "ti,am335x-olimex-som", "ti,am33xx";
+ };
+ 
+ &ldo3_reg {
+diff --git a/arch/arm/mach-omap2/opp33xx_data.c b/arch/arm/mach-omap2/opp33xx_data.c
+index c4f5e1e..1f8c772 100644
+--- a/arch/arm/mach-omap2/opp33xx_data.c
++++ b/arch/arm/mach-omap2/opp33xx_data.c
+@@ -14,6 +14,7 @@
+  */
+ #include <linux/io.h>
+ #include <linux/module.h>
++#include <linux/of.h>
+ 
+ #include "control.h"
+ #include "omap_opp_data.h"
+@@ -82,6 +83,9 @@ int __init am33xx_opp_init(void)
+ 	if (WARN(!soc_is_am33xx(), "Cannot init OPPs: unsupported SoC.\n"))
+ 		return r;
+ 
++	if (of_machine_is_compatible("ti,am335x-olimex-som"))
++		return r;
++
+ 	rev = omap_rev();
+ 
+ 	switch (rev) {
+-- 
+2.6.4
+
diff --git a/version.sh b/version.sh
index 4ec15cc90..557262296 100644
--- a/version.sh
+++ b/version.sh
@@ -24,7 +24,7 @@ toolchain="gcc_linaro_gnueabihf_4_9"
 #Kernel/Build
 KERNEL_REL=4.1
 KERNEL_TAG=${KERNEL_REL}.13
-BUILD=${build_prefix}-r36.1
+BUILD=${build_prefix}-r36.2
 kernel_rt=".12-rt13"
 
 #v4.X-rcX + upto SHA