 @@ -1,14 +1,14 @@
-/*	$NetBSD: gxio.c,v 1.12 2009/11/22 12:00:56 kiyohara Exp $ */
+/*	$NetBSD: gxio.c,v 1.13 2009/12/02 13:05:09 kiyohara Exp $ */
 /*
  * Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation.
  * All rights reserved.
+ *
  * Written by Takashi Kiyohara and Susumu Miki for WIDE Project and SOUM
  * Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -21,27 +21,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT and SOUM CORPORATION ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT AND SOUM CORPORATION
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gxio.c,v 1.12 2009/11/22 12:00:56 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gxio.c,v 1.13 2009/12/02 13:05:09 kiyohara Exp $");
 #include "opt_gxio.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <machine/bootconfig.h>
 #include <arm/xscale/pxa2x0cpu.h>
 @@ -113,26 +113,27 @@ static struct pxa2x0_gpioconf pxa255dep_
 	{ 48, GPIO_ALT_FN_1_OUT },	/* HWTXD */
 	{ 49, GPIO_ALT_FN_1_IN },	/* HWRXD */
 	{ 50, GPIO_ALT_FN_1_IN },	/* HWCTS */
 	{ 51, GPIO_ALT_FN_1_OUT },	/* HWRTS */
 #endif
 	{ -1 }
 };
 #endif
 #if defined(CPU_XSCALE_PXA270)
 static struct pxa2x0_gpioconf verdexdep_gpioconf[] = {
 	/* Bluetooth module configuration */
 	{   9, GPIO_ALT_FN_3_OUT },	/* CHOUT<0> */
 	{  12, GPIO_OUT | GPIO_SET },
 	/* LCD configuration */
 	{  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 */
 	{  43, GPIO_ALT_FN_2_OUT },	/* BTTXD */
 @@ -268,27 +269,31 @@ gxio_config_pin(void)
 		pxa27x_com_ffuart_gpioconf,
 		pxa27x_com_stuart_gpioconf,
 		pxa27x_com_btuart_gpioconf,
 		pxa27x_i2c_gpioconf,
 		pxa27x_pxaacu_gpioconf,
 		pxa27x_pxamci_gpioconf,
 		pxa27x_ohci_gpioconf,
 		verdexdep_gpioconf,
 		NULL
 	};
 #endif
 	/* XXX: turn off for power of bluetooth module */
 #if defined(CPU_XSCALE_PXA250)
 	pxa2x0_gpio_set_function(7, GPIO_OUT | GPIO_CLR);
 #elif defined(CPU_XSCALE_PXA270)
 	pxa2x0_gpio_set_function(12, GPIO_OUT | GPIO_CLR);
 #endif
 	delay(100);
 #if defined(CPU_XSCALE_PXA270) && defined(CPU_XSCALE_PXA250)
 	pxa2x0_gpio_config(
 	    (CPU_IS_PXA250) ? gumstix_gpioconf : verdex_gpioconf);
 #else
 #if defined(CPU_XSCALE_PXA270)
 	pxa2x0_gpio_config(verdex_gpioconf);
 #else
 	pxa2x0_gpio_config(gumstix_gpioconf);
 #endif
 #endif
+}