diff options
| -rw-r--r-- | board/atmel/at91sam9263ek/at91sam9263ek.c | 11 | ||||
| -rw-r--r-- | cpu/arm926ejs/at91/Makefile | 1 | ||||
| -rw-r--r-- | cpu/arm926ejs/at91/at91sam9263_usb.c | 35 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/at91_common.h | 1 |
4 files changed, 38 insertions, 10 deletions
diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c index 1a3e39cf319..59ace177cb8 100644 --- a/board/atmel/at91sam9263ek/at91sam9263ek.c +++ b/board/atmel/at91sam9263ek/at91sam9263ek.c @@ -154,15 +154,6 @@ static void at91sam9263ek_macb_hw_init(void) } #endif -#ifdef CONFIG_USB_OHCI_NEW -static void at91sam9263ek_uhp_hw_init(void) -{ - /* Enable VBus on UHP ports */ - at91_set_gpio_output(AT91_PIN_PA21, 0); - at91_set_gpio_output(AT91_PIN_PA24, 0); -} -#endif - #ifdef CONFIG_LCD vidinfo_t panel_info = { vl_col: 240, @@ -273,7 +264,7 @@ int board_init(void) at91sam9263ek_macb_hw_init(); #endif #ifdef CONFIG_USB_OHCI_NEW - at91sam9263ek_uhp_hw_init(); + at91_uhp_hw_init(); #endif #ifdef CONFIG_LCD at91sam9263ek_lcd_hw_init(); diff --git a/cpu/arm926ejs/at91/Makefile b/cpu/arm926ejs/at91/Makefile index 95bb59d35a5..15231999c05 100644 --- a/cpu/arm926ejs/at91/Makefile +++ b/cpu/arm926ejs/at91/Makefile @@ -40,6 +40,7 @@ endif ifdef CONFIG_AT91SAM9263 COBJS-y += at91sam9263_serial.o COBJS-$(CONFIG_HAS_DATAFLASH) += at91sam9263_spi.o +COBJS-$(CONFIG_USB_OHCI_NEW) += at91sam9263_usb.o endif ifdef CONFIG_AT91SAM9RL COBJS-y += at91sam9rl_serial.o diff --git a/cpu/arm926ejs/at91/at91sam9263_usb.c b/cpu/arm926ejs/at91/at91sam9263_usb.c new file mode 100644 index 00000000000..ff5593bd531 --- /dev/null +++ b/cpu/arm926ejs/at91/at91sam9263_usb.c @@ -0,0 +1,35 @@ +/* + * (C) Copyright 2007-2008 + * Stelian Pop <stelian.pop@leadtechdesign.com> + * Lead Tech Design <www.leadtechdesign.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <asm/arch/at91_common.h> +#include <asm/arch/gpio.h> +#include <asm/arch/io.h> + +void at91_uhp_hw_init(void) +{ + /* Enable VBus on UHP ports */ + at91_set_gpio_output(AT91_PIN_PA21, 0); + at91_set_gpio_output(AT91_PIN_PA24, 0); +} diff --git a/include/asm-arm/arch-at91/at91_common.h b/include/asm-arm/arch-at91/at91_common.h index 1432f949dae..797854b19a8 100644 --- a/include/asm-arm/arch-at91/at91_common.h +++ b/include/asm-arm/arch-at91/at91_common.h @@ -32,5 +32,6 @@ void at91_serial2_hw_init(void); void at91_serial3_hw_init(void); void at91_spi0_hw_init(unsigned long cs_mask); void at91_spi1_hw_init(unsigned long cs_mask); +void at91_uhp_hw_init(void); #endif /* AT91_COMMON_H */ |