summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Klotzbuecher <mk@denx.de>2007-06-06 11:49:43 +0200
committerMarkus Klotzbuecher <mk@pollux.denx.de>2007-06-06 11:49:43 +0200
commit72657570b61635c74fa0c3f0e9e7d0671a9d08df (patch)
tree6cecd69395737972dfe231a30ee1a0c06a2034eb
parentfc43be478f2aa37ce38acd85355038866e4162af (diff)
downloadu-boot-imx-72657570b61635c74fa0c3f0e9e7d0671a9d08df.zip
u-boot-imx-72657570b61635c74fa0c3f0e9e7d0671a9d08df.tar.gz
u-boot-imx-72657570b61635c74fa0c3f0e9e7d0671a9d08df.tar.bz2
USB: ohci fixes and cleanup for mpc5xxx and IceCube board config
-rw-r--r--cpu/mpc5xxx/usb.c54
-rw-r--r--include/configs/IceCube.h9
2 files changed, 56 insertions, 7 deletions
diff --git a/cpu/mpc5xxx/usb.c b/cpu/mpc5xxx/usb.c
new file mode 100644
index 0000000..ce709fc
--- /dev/null
+++ b/cpu/mpc5xxx/usb.c
@@ -0,0 +1,54 @@
+/*
+ * (C) Copyright 2007
+ * Markus Klotzbuecher, DENX Software Engineering <mk@denx.de>
+ *
+ * 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>
+
+#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT)
+
+#include <mpc5xxx.h>
+
+int usb_cpu_init()
+{
+ /* Set the USB Clock */
+ *(vu_long *)MPC5XXX_CDM_48_FDC = CONFIG_USB_CLOCK;
+
+ /* remove all USB bits first before ORing in ours */
+ *(vu_long *)MPC5XXX_GPS_PORT_CONFIG &= ~0x00807000;
+
+ /* Activate USB port */
+ *(vu_long *)MPC5XXX_GPS_PORT_CONFIG |= CONFIG_USB_CONFIG;
+
+ return 0;
+}
+
+int usb_cpu_stop()
+{
+ return 0;
+}
+
+int usb_cpu_init_fail()
+{
+ return 0;
+}
+
+#endif /* defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT) */
diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 4132f4a..551a609 100644
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -93,21 +93,16 @@
#define CONFIG_ISO_PARTITION
/* USB */
-#if 1
#define CONFIG_USB_OHCI_NEW
#define ADD_USB_CMD CFG_CMD_USB | CFG_CMD_FAT
#define CONFIG_USB_STORAGE
-
+#define CFG_OHCI_BE_CONTROLLER
#undef CFG_USB_OHCI_BOARD_INIT
-#define CFG_USB_OHCI_CPU_INIT
+#define CFG_USB_OHCI_CPU_INIT 1
#define CFG_USB_OHCI_REGS_BASE MPC5XXX_USB
#define CFG_USB_OHCI_SLOT_NAME "mpc5200"
#define CFG_USB_OHCI_MAX_ROOT_PORTS 15
-#else
-#define ADD_USB_CMD 0
-#endif
-
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
/*