Commit 2b7178afce59f71e95da657273f4132012098c1f
1 parent
f82518d7f4
Exists in
master
and in
55 other branches
at91: move usb driver to drivers/usb
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Showing 9 changed files with 86 additions and 81 deletions Side-by-side Diff
cpu/arm926ejs/at91/Makefile
cpu/arm926ejs/at91/usb.c
| 1 | -/* | |
| 2 | - * (C) Copyright 2006 | |
| 3 | - * DENX Software Engineering <mk@denx.de> | |
| 4 | - * | |
| 5 | - * See file CREDITS for list of people who contributed to this | |
| 6 | - * project. | |
| 7 | - * | |
| 8 | - * This program is free software; you can redistribute it and/or | |
| 9 | - * modify it under the terms of the GNU General Public License as | |
| 10 | - * published by the Free Software Foundation; either version 2 of | |
| 11 | - * the License, or (at your option) any later version. | |
| 12 | - * | |
| 13 | - * This program is distributed in the hope that it will be useful, | |
| 14 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 16 | - * GNU General Public License for more details. | |
| 17 | - * | |
| 18 | - * You should have received a copy of the GNU General Public License | |
| 19 | - * along with this program; if not, write to the Free Software | |
| 20 | - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | |
| 21 | - * MA 02111-1307 USA | |
| 22 | - */ | |
| 23 | - | |
| 24 | -#include <common.h> | |
| 25 | - | |
| 26 | -#if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT) | |
| 27 | - | |
| 28 | -#include <asm/arch/hardware.h> | |
| 29 | -#include <asm/arch/io.h> | |
| 30 | -#include <asm/arch/at91_pmc.h> | |
| 31 | - | |
| 32 | -int usb_cpu_init(void) | |
| 33 | -{ | |
| 34 | - | |
| 35 | -#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \ | |
| 36 | - defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) | |
| 37 | - /* Enable PLLB */ | |
| 38 | - at91_sys_write(AT91_CKGR_PLLBR, CONFIG_SYS_AT91_PLLB); | |
| 39 | - while ((at91_sys_read(AT91_PMC_SR) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB) | |
| 40 | - ; | |
| 41 | -#endif | |
| 42 | - | |
| 43 | - /* Enable USB host clock. */ | |
| 44 | - at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_UHP); | |
| 45 | -#ifdef CONFIG_AT91SAM9261 | |
| 46 | - at91_sys_write(AT91_PMC_SCER, AT91_PMC_UHP | AT91_PMC_HCK0); | |
| 47 | -#else | |
| 48 | - at91_sys_write(AT91_PMC_SCER, AT91_PMC_UHP); | |
| 49 | -#endif | |
| 50 | - | |
| 51 | - return 0; | |
| 52 | -} | |
| 53 | - | |
| 54 | -int usb_cpu_stop(void) | |
| 55 | -{ | |
| 56 | - /* Disable USB host clock. */ | |
| 57 | - at91_sys_write(AT91_PMC_PCDR, 1 << AT91_ID_UHP); | |
| 58 | -#ifdef CONFIG_AT91SAM9261 | |
| 59 | - at91_sys_write(AT91_PMC_SCDR, AT91_PMC_UHP | AT91_PMC_HCK0); | |
| 60 | -#else | |
| 61 | - at91_sys_write(AT91_PMC_SCDR, AT91_PMC_UHP); | |
| 62 | -#endif | |
| 63 | - | |
| 64 | -#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \ | |
| 65 | - defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) | |
| 66 | - /* Disable PLLB */ | |
| 67 | - at91_sys_write(AT91_CKGR_PLLBR, 0); | |
| 68 | - while ((at91_sys_read(AT91_PMC_SR) & AT91_PMC_LOCKB) != 0) | |
| 69 | - ; | |
| 70 | -#endif | |
| 71 | - | |
| 72 | - return 0; | |
| 73 | -} | |
| 74 | - | |
| 75 | -int usb_cpu_init_fail(void) | |
| 76 | -{ | |
| 77 | - return usb_cpu_stop(); | |
| 78 | -} | |
| 79 | - | |
| 80 | -#endif /* defined(CONFIG_USB_OHCI) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT) */ |
drivers/usb/Makefile
| ... | ... | @@ -31,6 +31,7 @@ |
| 31 | 31 | COBJS-$(CONFIG_USB_EHCI) += usb_ehci_core.o |
| 32 | 32 | |
| 33 | 33 | # host |
| 34 | +COBJS-$(CONFIG_USB_ATMEL) += atmel_usb.o | |
| 34 | 35 | COBJS-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o |
| 35 | 36 | COBJS-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o |
| 36 | 37 | COBJS-$(CONFIG_USB_S3C64XX) += s3c64xx_usb.o |
drivers/usb/atmel_usb.c
| 1 | +/* | |
| 2 | + * (C) Copyright 2006 | |
| 3 | + * DENX Software Engineering <mk@denx.de> | |
| 4 | + * | |
| 5 | + * See file CREDITS for list of people who contributed to this | |
| 6 | + * project. | |
| 7 | + * | |
| 8 | + * This program is free software; you can redistribute it and/or | |
| 9 | + * modify it under the terms of the GNU General Public License as | |
| 10 | + * published by the Free Software Foundation; either version 2 of | |
| 11 | + * the License, or (at your option) any later version. | |
| 12 | + * | |
| 13 | + * This program is distributed in the hope that it will be useful, | |
| 14 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 16 | + * GNU General Public License for more details. | |
| 17 | + * | |
| 18 | + * You should have received a copy of the GNU General Public License | |
| 19 | + * along with this program; if not, write to the Free Software | |
| 20 | + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | |
| 21 | + * MA 02111-1307 USA | |
| 22 | + */ | |
| 23 | + | |
| 24 | +#include <common.h> | |
| 25 | + | |
| 26 | +#if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT) | |
| 27 | + | |
| 28 | +#include <asm/arch/hardware.h> | |
| 29 | +#include <asm/arch/io.h> | |
| 30 | +#include <asm/arch/at91_pmc.h> | |
| 31 | + | |
| 32 | +int usb_cpu_init(void) | |
| 33 | +{ | |
| 34 | + | |
| 35 | +#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \ | |
| 36 | + defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) | |
| 37 | + /* Enable PLLB */ | |
| 38 | + at91_sys_write(AT91_CKGR_PLLBR, CONFIG_SYS_AT91_PLLB); | |
| 39 | + while ((at91_sys_read(AT91_PMC_SR) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB) | |
| 40 | + ; | |
| 41 | +#endif | |
| 42 | + | |
| 43 | + /* Enable USB host clock. */ | |
| 44 | + at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_UHP); | |
| 45 | +#ifdef CONFIG_AT91SAM9261 | |
| 46 | + at91_sys_write(AT91_PMC_SCER, AT91_PMC_UHP | AT91_PMC_HCK0); | |
| 47 | +#else | |
| 48 | + at91_sys_write(AT91_PMC_SCER, AT91_PMC_UHP); | |
| 49 | +#endif | |
| 50 | + | |
| 51 | + return 0; | |
| 52 | +} | |
| 53 | + | |
| 54 | +int usb_cpu_stop(void) | |
| 55 | +{ | |
| 56 | + /* Disable USB host clock. */ | |
| 57 | + at91_sys_write(AT91_PMC_PCDR, 1 << AT91_ID_UHP); | |
| 58 | +#ifdef CONFIG_AT91SAM9261 | |
| 59 | + at91_sys_write(AT91_PMC_SCDR, AT91_PMC_UHP | AT91_PMC_HCK0); | |
| 60 | +#else | |
| 61 | + at91_sys_write(AT91_PMC_SCDR, AT91_PMC_UHP); | |
| 62 | +#endif | |
| 63 | + | |
| 64 | +#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \ | |
| 65 | + defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) | |
| 66 | + /* Disable PLLB */ | |
| 67 | + at91_sys_write(AT91_CKGR_PLLBR, 0); | |
| 68 | + while ((at91_sys_read(AT91_PMC_SR) & AT91_PMC_LOCKB) != 0) | |
| 69 | + ; | |
| 70 | +#endif | |
| 71 | + | |
| 72 | + return 0; | |
| 73 | +} | |
| 74 | + | |
| 75 | +int usb_cpu_init_fail(void) | |
| 76 | +{ | |
| 77 | + return usb_cpu_stop(); | |
| 78 | +} | |
| 79 | + | |
| 80 | +#endif /* defined(CONFIG_USB_OHCI) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT) */ |
include/configs/afeb9260.h
include/configs/at91cap9adk.h
include/configs/at91sam9260ek.h
include/configs/at91sam9261ek.h
include/configs/at91sam9263ek.h