socsvn commit: r240535 - soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl

[aleek at FreeBSD.org]

Author: aleek
Date: Sun Aug 19 17:03:02 2012
New Revision: 240535
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240535

Log:
   minor fixes

Modified:
  soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c

Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c	Sun Aug 19 16:18:43 2012	(r240534)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c	Sun Aug 19 17:03:02 2012	(r240535)
@@ -831,7 +831,8 @@
  *
  *	RETURNS:
  *	Zero on success otherwise EINVAL.
- * */
+ */
+#if 0
 static int
 twl_vreg_led_set( struct twl_vreg_softc *sc, uint8_t led )
 {
@@ -852,6 +853,7 @@
 	}
 	return 0;
 }
+#endif
 
 /**
  *	twl_add_regulator - adds single voltage regulator sysctls for the device
@@ -941,6 +943,7 @@
 		 * by writing proper values to PROTECT_KEY register
 		 */
 		
+		/*
 		val = 0xC0;
 		if( twl_write( sc->sc_pdev, 3, 0x44, &val, 1 ) != 0 )
 		{
@@ -952,7 +955,7 @@
 		{
 			device_printf( sc->sc_dev, "Unable to unlock PROTECT_KEY\n" );
 			return 0;
-		}
+		}*/
 
 		val = 0x01;
 		if( twl_write( sc->sc_pdev, 0, 0xFD, &val, 1 ) != 0 )
@@ -974,10 +977,11 @@
 		}
 
 		// if we have BeagleBoard-xM, we need to repower HUB
-		val = ~(TWL4030_LEDEN_LEDAON || TWL4030_LEDEN_LEDBON);
-		twl_vreg_led_set( sc, val );
-		val = (TWL4030_LEDEN_LEDAON || TWL4030_LEDEN_LEDBON);
+		/* 
+		val = ~(TWL4030_LEDEN_LEDAON | TWL4030_LEDEN_LEDBON);
 		twl_vreg_led_set( sc, val );
+		val = (TWL4030_LEDEN_LEDAON | TWL4030_LEDEN_LEDBON);
+		twl_vreg_led_set( sc, val );*/
 	}