0002-am335x-olimex-som-no-regulator-for-voltdm.patch

From 14ed2526aeb35cc7a9b289dff20601f45dc263cd Mon Sep 17 00:00:00 2001
From: Robert Nelson <[email protected]>
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 <[email protected]>
---
 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..0f77633 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