Module Name: src Committed By: jmcneill Date: Sat Feb 28 22:53:25 UTC 2015
Modified Files: src/sys/arch/arm/amlogic: amlogic_board.c Log Message: invert gpio OEN bit logic, now usb works To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/amlogic/amlogic_board.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arm/amlogic/amlogic_board.c diff -u src/sys/arch/arm/amlogic/amlogic_board.c:1.4 src/sys/arch/arm/amlogic/amlogic_board.c:1.5 --- src/sys/arch/arm/amlogic/amlogic_board.c:1.4 Sat Feb 28 18:50:57 2015 +++ src/sys/arch/arm/amlogic/amlogic_board.c Sat Feb 28 22:53:25 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: amlogic_board.c,v 1.4 2015/02/28 18:50:57 jmcneill Exp $ */ +/* $NetBSD: amlogic_board.c,v 1.5 2015/02/28 22:53:25 jmcneill Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca> @@ -29,7 +29,7 @@ #include "opt_amlogic.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: amlogic_board.c,v 1.4 2015/02/28 18:50:57 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amlogic_board.c,v 1.5 2015/02/28 22:53:25 jmcneill Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -224,7 +224,7 @@ amlogic_usbphy_init(int port) if (gpio_power) { gpioao = bus_space_read_4(bst, bsh, gpioao_reg); - gpioao |= __BIT(pin); /* OEN */ + gpioao &= ~__BIT(pin); /* OEN */ bus_space_write_4(bst, bsh, gpioao_reg, gpioao); if (pol) { gpioao |= __BIT(pin + 16); /* OUT */ @@ -278,7 +278,7 @@ amlogic_usbphy_init(int port) if (gpio_reset) { /* Reset */ gpioao = bus_space_read_4(bst, bsh, gpioao_reg); - gpioao |= __BIT(pin); /* OEN */ + gpioao &= ~__BIT(pin); /* OEN */ bus_space_write_4(bst, bsh, gpioao_reg, gpioao); if (pol) { gpioao |= __BIT(pin + 16); /* OUT */