summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-12-21 18:25:10 -0500
committerTom Rini <trini@konsulko.com>2015-12-21 18:25:10 -0500
commit5a4672bb4f3580ff074ad9023c8b9d5eae17ce54 (patch)
treedab2558e108cd757e5b94c3740af04f2693db3c9
parentedf5dd835e5da2d7dbc91422db204a344dd10e4b (diff)
parentd0602bd4675c4f49e455b3b7a4aebb9a01287d43 (diff)
Merge git://git.denx.de/u-boot-arc
-rw-r--r--arch/arc/dts/axs10x.dts6
-rw-r--r--configs/axs103_defconfig3
-rw-r--r--include/configs/axs101.h6
3 files changed, 13 insertions, 2 deletions
diff --git a/arch/arc/dts/axs10x.dts b/arch/arc/dts/axs10x.dts
index 80e6d6b15d4..391d0671584 100644
--- 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 >;
+ };
};
diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig
index 3c65c834f14..a208a27c214 100644
--- 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
diff --git a/include/configs/axs101.h b/include/configs/axs101.h
index 650d97d17f2..c92cca274fc 100644
--- a/include/configs/axs101.h
+++ b/include/configs/axs101.h
@@ -105,6 +105,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
*/
#define CONFIG_CMD_FAT