CVS commit: src/sys/arch/evbarm/gumstix

[KIYOHARA Takashi]

Module Name:    src
Committed By:   kiyohara
Date:           Mon Mar 15 13:16:56 UTC 2010

Modified Files:
        src/sys/arch/evbarm/gumstix: gxio.c

Log Message:
XXXX: More power is necessary for NIC and USB?  (no document.  from Linux)
  tested on verdex + console-vx + netCF-vx
  and verdex-pro + netpro-vx + consoleLCD-vx.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/gumstix/gxio.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/evbarm/gumstix/gxio.c
diff -u src/sys/arch/evbarm/gumstix/gxio.c:1.13 src/sys/arch/evbarm/gumstix/gxio.c:1.14
--- src/sys/arch/evbarm/gumstix/gxio.c:1.13	Wed Dec  2 13:05:09 2009
+++ src/sys/arch/evbarm/gumstix/gxio.c	Mon Mar 15 13:16:56 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: gxio.c,v 1.13 2009/12/02 13:05:09 kiyohara Exp $ */
+/*	$NetBSD: gxio.c,v 1.14 2010/03/15 13:16:56 kiyohara Exp $ */
 /*
  * Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation.
  * All rights reserved.
@@ -31,7 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gxio.c,v 1.13 2009/12/02 13:05:09 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gxio.c,v 1.14 2010/03/15 13:16:56 kiyohara Exp $");
 
 #include "opt_gxio.h"
 
@@ -70,6 +70,7 @@
 static void cfstix_config(void);
 static void etherstix_config(void);
 static void netcf_config(void);
+static void netcf_vx_config(void);
 static void netduommc_config(void);
 static void netduo_config(void);
 static void netmicrosd_config(void);
@@ -129,10 +130,8 @@
 	{  17, GPIO_IN },		/* backlight on */
 
 	/* FFUART configuration */
-	{  27, GPIO_ALT_FN_3_OUT },	/* FFRTS */
 	{  34, GPIO_ALT_FN_1_IN },	/* FFRXD */
 	{  39, GPIO_ALT_FN_2_OUT },	/* FFTXD */
-	{ 100, GPIO_ALT_FN_3_IN },	/* FFCTS */
 
 	/* BTUART configuration */
 	{  42, GPIO_ALT_FN_1_IN },	/* BTRXD */
@@ -152,7 +151,7 @@
 	{ "cfstix",		cfstix_config },
 	{ "etherstix",		etherstix_config },
 	{ "netcf",		netcf_config },
-	{ "netcf-vx",		netcf_config },
+	{ "netcf-vx",		netcf_vx_config },
 	{ "netduo-mmc",		netduommc_config },
 	{ "netduo",		netduo_config },
 	{ "netmicrosd",		netmicrosd_config },
@@ -439,6 +438,23 @@
 
 	etherstix_config();
 	cfstix_config();
+}
+
+static void
+netcf_vx_config(void)
+{
+
+	/*
+	 * XXXX: More power is necessary for NIC and USB???
+	 * (no document.  from Linux)
+	 */
+
+	pxa2x0_gpio_set_function(27, GPIO_IN);
+	pxa2x0_gpio_set_function(107, GPIO_OUT | GPIO_CLR);
+	pxa2x0_gpio_set_function(118, GPIO_ALT_FN_1_IN | GPIO_CLR);
+
+	etherstix_config();
+	cfstix_config();
 	if (CPU_IS_PXA270) {
 		/* Overwrite */
 		gxpcic_slot_irqs[0].cd = 104;