Sun Mar 1 15:06:09 2015 UTC ()
remove debug printf


(jmcneill)
diff -r1.5 -r1.6 src/sys/arch/arm/amlogic/amlogic_board.c
cvs diff -r1.5 -r1.6 src/sys/arch/arm/amlogic/Attic/amlogic_board.c (expand / switch to unified diff)

--- src/sys/arch/arm/amlogic/Attic/amlogic_board.c 2015/02/28 22:53:25 1.5
+++ src/sys/arch/arm/amlogic/Attic/amlogic_board.c 2015/03/01 15:06:09 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: amlogic_board.c,v 1.5 2015/02/28 22:53:25 jmcneill Exp $ */ 1/* $NetBSD: amlogic_board.c,v 1.6 2015/03/01 15:06:09 jmcneill Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2015 Jared D. McNeill <jmcneill@invisible.ca> 4 * Copyright (c) 2015 Jared D. McNeill <jmcneill@invisible.ca>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -19,27 +19,27 @@ @@ -19,27 +19,27 @@
19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
21 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
24 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include "opt_amlogic.h" 29#include "opt_amlogic.h"
30 30
31#include <sys/cdefs.h> 31#include <sys/cdefs.h>
32__KERNEL_RCSID(0, "$NetBSD: amlogic_board.c,v 1.5 2015/02/28 22:53:25 jmcneill Exp $"); 32__KERNEL_RCSID(0, "$NetBSD: amlogic_board.c,v 1.6 2015/03/01 15:06:09 jmcneill Exp $");
33 33
34#define _ARM32_BUS_DMA_PRIVATE 34#define _ARM32_BUS_DMA_PRIVATE
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/bus.h> 36#include <sys/bus.h>
37#include <sys/cpu.h> 37#include <sys/cpu.h>
38#include <sys/device.h> 38#include <sys/device.h>
39 39
40#include <uvm/uvm_extern.h> 40#include <uvm/uvm_extern.h>
41 41
42#include <arm/bootconfig.h> 42#include <arm/bootconfig.h>
43#include <arm/cpufunc.h> 43#include <arm/cpufunc.h>
44 44
45#include <arm/amlogic/amlogic_reg.h> 45#include <arm/amlogic/amlogic_reg.h>
@@ -247,28 +247,26 @@ amlogic_usbphy_init(int port) @@ -247,28 +247,26 @@ amlogic_usbphy_init(int port)
247 ctrl |= PREI_USB_PHY_CTRL_POR; 247 ctrl |= PREI_USB_PHY_CTRL_POR;
248 CBUS_WRITE(ctrl_reg, ctrl); 248 CBUS_WRITE(ctrl_reg, ctrl);
249 249
250 delay(1000); 250 delay(1000);
251 251
252 ctrl = CBUS_READ(ctrl_reg); 252 ctrl = CBUS_READ(ctrl_reg);
253 ctrl &= ~PREI_USB_PHY_CTRL_POR; 253 ctrl &= ~PREI_USB_PHY_CTRL_POR;
254 CBUS_WRITE(ctrl_reg, ctrl); 254 CBUS_WRITE(ctrl_reg, ctrl);
255 255
256 delay(50000); 256 delay(50000);
257 257
258 ctrl = CBUS_READ(ctrl_reg); 258 ctrl = CBUS_READ(ctrl_reg);
259 259
260 printf("USBPHY: port %d, ctrl %#x\n", port, ctrl); 
261 
262 if ((ctrl & PREI_USB_PHY_CTRL_CLK_DET) == 0) 260 if ((ctrl & PREI_USB_PHY_CTRL_CLK_DET) == 0)
263 printf("WARNING: USB PHY port %d clock not detected\n", port); 261 printf("WARNING: USB PHY port %d clock not detected\n", port);
264 262
265 if (aca_enable) { 263 if (aca_enable) {
266 adp_bc = CBUS_READ(adp_bc_reg); 264 adp_bc = CBUS_READ(adp_bc_reg);
267 adp_bc |= PREI_USB_PHY_ADP_BC_ACA_ENABLE; 265 adp_bc |= PREI_USB_PHY_ADP_BC_ACA_ENABLE;
268 CBUS_WRITE(adp_bc_reg, adp_bc); 266 CBUS_WRITE(adp_bc_reg, adp_bc);
269 267
270 delay(1000); 268 delay(1000);
271 269
272 adp_bc = CBUS_READ(adp_bc_reg); 270 adp_bc = CBUS_READ(adp_bc_reg);
273 if (adp_bc & PREI_USB_PHY_ADP_BC_ACA_FLOATING) 271 if (adp_bc & PREI_USB_PHY_ADP_BC_ACA_FLOATING)
274 printf("WARNING: USB PHY port %d failed to enable " 272 printf("WARNING: USB PHY port %d failed to enable "