From owner-svn-soc-all@FreeBSD.ORG Sun Sep 2 15:29:42 2012 Return-Path: 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 E35B51065673 for ; Sun, 2 Sep 2012 15:29:39 +0000 (UTC) (envelope-from aleek@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sun, 02 Sep 2012 15:29:39 +0000 Date: Sun, 02 Sep 2012 15:29:39 +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: <20120902152939.E35B51065673@hub.freebsd.org> Cc: Subject: socsvn commit: r241179 - in soc2012/aleek/beaglexm-armv6/sys: arm/conf arm/ti 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Sep 2012 15:29:42 -0000 Author: aleek Date: Sun Sep 2 15:29:37 2012 New Revision: 241179 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=241179 Log: Added reseting usb hub. It is done via DTS file - first, voltages are set to 0, which causes disabling voltage regulator, and then the same voltage regulators are set to proper volates which causes enabling regulators and setting them to proper values Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_machdep.c soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Sun Sep 2 14:56:04 2012 (r241178) +++ soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Sun Sep 2 15:29:37 2012 (r241179) @@ -60,7 +60,7 @@ #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed #options DIAGNOSTIC -#options DEBUG +options DEBUG # MMC/SD/SDIO card slot support Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_machdep.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_machdep.c Sun Sep 2 14:56:04 2012 (r241178) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_machdep.c Sun Sep 2 15:29:37 2012 (r241179) @@ -334,6 +334,7 @@ kmdp = preload_search_by_type("elf kernel"); if (kmdp != NULL) { boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); + boothowto |= RB_SINGLE; kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *); dtbp = MD_FETCH(kmdp, MODINFOMD_DTBP, vm_offset_t); lastaddr = MD_FETCH(kmdp, MODINFOMD_KERNEND, @@ -349,6 +350,7 @@ /* Fall back to hardcoded metadata. */ lastaddr = fake_preload_metadata(); } + boothowto |= RB_SINGLE; #if defined(FDT_DTB_STATIC) /* Modified: soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Sun Sep 2 14:56:04 2012 (r241178) +++ soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Sun Sep 2 15:29:37 2012 (r241179) @@ -124,14 +124,13 @@ compatible = "ti,twl4030"; reg = < 0x48 >; voltage-regulators = - "vaux2", "0", + "vusb1v5", "0", + "vusb1v8", "0", + "vusb3v1", "0", "vusb1v5", "1500", "vusb1v8", "1800", "vusb3v1", "3100", - "vaux2", "1800", - "vusb1v5", "0", - "vusb1v8", "0", - "vusb3v1", "0"; + "vaux2", "1800"; }; }; @@ -193,7 +192,7 @@ mmchs-device-id = <1>; }; -/* + ehci@48064800 { compatible = "ti,ehci"; /* @@ -206,16 +205,16 @@ * * reset indicates (if non-zero) if port reset is required * gpio_pin - GPIO pin that is used to perform reset - * + */ phy-config = < 1 0 0 1 1 147 0 0 0>; - reg = < 0x48064800 0x400 /* EHCI * - 0x48064000 0x400 /* UHH * - 0x48062000 0x1000 /* TLL * >; + reg = < 0x48064800 0x400 /* EHCI */ + 0x48064000 0x400 /* UHH */ + 0x48062000 0x1000 /* TLL */ >; interrupts = < 77 >; interrupt-parent = <&AINTC>; - };*/ + }; }; chosen {