Merge git://git.denx.de/u-boot-arc

2015-12-21 18:25:10 -05:00 · 2015-12-21 18:25:10 -05:00 · 5a4672bb4f
commit 5a4672bb4f
parent edf5dd835e d0602bd467
3 changed files with 13 additions and 2 deletions
--- a/arch/arc/dts/axs10x.dts
+++ b/arch/arc/dts/axs10x.dts
@ -48,4 +48,10 @@
 		reg = < 0xe0040000 0x100 >;
 		interrupts = < 8 >;
 	};
+
+	ohci@0xe0060000 {
+		compatible = "generic-ohci";
+		reg = < 0xe0060000 0x100 >;
+		interrupts = < 8 >;
+	};
 };
--- a/configs/axs103_defconfig
+++ b/configs/axs103_defconfig
@ -21,7 +21,6 @@ CONFIG_ETH_DESIGNWARE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_OHCI_GENERIC=y
 CONFIG_USB_STORAGE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
--- a/include/configs/axs101.h
+++ b/include/configs/axs101.h
@ -104,6 +104,12 @@
 */
 #define CONFIG_DW_AUTONEG

+/*
+ * USB 1.1 configuration
+ */
+#define CONFIG_USB_OHCI_NEW
+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
+
 /*
 * Commands still not supported in Kconfig
 */