From owner-svn-soc-all@FreeBSD.ORG  Sat Aug 18 14:05:19 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 64785106564A
	for <svn-soc-all@FreeBSD.org>; Sat, 18 Aug 2012 14:05:17 +0000 (UTC)
	(envelope-from aleek@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sat, 18 Aug 2012 14:05:17 +0000
Date: Sat, 18 Aug 2012 14:05:17 +0000
From: aleek@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120818140517.64785106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r240495 -
	soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2012 14:05:19 -0000

Author: aleek
Date: Sat Aug 18 14:05:16 2012
New Revision: 240495
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240495

Log:
  workaround for the I2C bug. It turns out, that there is bug in SCM, so the pin muxing is being done wrong. Fortunately, u-boot configures everything so we rely on it until SCM module is not fixed

Modified:
  soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts

Modified: soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts	Sat Aug 18 12:37:07 2012	(r240494)
+++ soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts	Sat Aug 18 14:05:16 2012	(r240495)
@@ -63,7 +63,7 @@
 			compatible = "ti,scm";
 			reg =	< 0x48002000 0x2000 >;
 			/* Set of triplets < padname, muxname, padstate> */
-			scm-pad-config =
+			/*scm-pad-config =*/
 				/* USB OTG */
 				/*
 				"af10",		"hsusb1_stp",	"output",
@@ -81,6 +81,7 @@
 				*/
 
 				/* USB HS */
+				/*
 				"af7", "hsusb2_stp", "output",
 				"ag7", "hsusb2_dir", "input_pulldown",
 				"ah7", "hsusb2_nxt", "input_pulldown",
@@ -93,11 +94,13 @@
 				"y4", "hsusb2_data6", "input_pulldown",
 				"aa3", "hsusb2_data7", "input_pulldown",
 				"ad25", "gpio_147", "output",
-				"ae7", "hsusb2_clk", "output",
+				"ae7", "hsusb2_clk", "output"; */
 
 				/* i2c */
-				"ic11",		"i2c1_scl", "output",
-				"ic12",		"i2c1_sda", "output";
+				/* ths needs to be fixed. The gpio pins are configured by u-boot
+				so they work even without SCM configuration. It is need to be fixed */
+				/*"ic11",		"i2c1_scl", "input_pullup_inact",
+				"ic12",		"i2c1_sda", "input_pullup_inact";*/
 
 
 		};
@@ -179,7 +182,7 @@
 			
 			twl4030@48 {
 				compatible = "ti,twl4030";
-				reg = <0x48>;
+				reg = < 0x48 >;
 				voltage-regulators =
 					"vusb1v5", "0",
 					"vusb1v8", "0",
@@ -210,7 +213,7 @@
 			interrupts = < 77 >;
 			interrupt-parent = <&AINTC>;
 		};
-*/
+		*/
 	};
 
 	chosen {