Patchwork [U-Boot,3/4] orion5x: add USB host ehci-marvell support

login
register
mail settings
Submitter Albert ARIBAUD
Date Jan. 16, 2012, 8:08 a.m.
Message ID <1326701321-28185-4-git-send-email-albert.u.boot@aribaud.net>
Download mbox | patch
Permalink /patch/136253/
State Accepted
Commit 805ad7ee2d45dcc25c8f0f6b14e72b9fd812ff1a
Delegated to: Albert ARIBAUD
Headers show

Comments

Albert ARIBAUD - Jan. 16, 2012, 8:08 a.m.
Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
---
 arch/arm/include/asm/arch-orion5x/orion5x.h |   12 ++++++++++++
 drivers/usb/host/ehci-marvell.c             |    5 +++++
 2 files changed, 17 insertions(+), 0 deletions(-)

Patch

diff --git a/arch/arm/include/asm/arch-orion5x/orion5x.h b/arch/arm/include/asm/arch-orion5x/orion5x.h
index 18225b9..b0d3368 100644
--- a/arch/arm/include/asm/arch-orion5x/orion5x.h
+++ b/arch/arm/include/asm/arch-orion5x/orion5x.h
@@ -58,6 +58,18 @@ 
 #define MAX_MVGBE_DEVS	1
 #define MVGBE0_BASE	ORION5X_EGIGA_BASE
 
+/* Orion5x USB Host controller is port 1 */
+#define MVUSB0_BASE			ORION5X_USB20_HOST_PORT_BASE
+#define MVUSB0_CPU_ATTR_DRAM_CS0	ORION5X_ATTR_DRAM_CS0
+#define MVUSB0_CPU_ATTR_DRAM_CS1	ORION5X_ATTR_DRAM_CS1
+#define MVUSB0_CPU_ATTR_DRAM_CS2	ORION5X_ATTR_DRAM_CS2
+#define MVUSB0_CPU_ATTR_DRAM_CS3	ORION5X_ATTR_DRAM_CS3
+
+/* Kirkwood CPU memory windows */
+#define MVCPU_WIN_CTRL_DATA	ORION5X_CPU_WIN_CTRL_DATA
+#define MVCPU_WIN_ENABLE	ORION5X_WIN_ENABLE
+#define MVCPU_WIN_DISABLE	ORION5X_WIN_DISABLE
+
 #define CONFIG_MAX_RAM_BANK_SIZE		(64*1024*1024)
 
 /* include here SoC variants. 5181, 5281, 6183 should go here when
diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index e342d78..89c8af7 100644
--- a/drivers/usb/host/ehci-marvell.c
+++ b/drivers/usb/host/ehci-marvell.c
@@ -28,7 +28,12 @@ 
 #include "ehci.h"
 #include "ehci-core.h"
 #include <asm/arch/cpu.h>
+
+#if defined(CONFIG_KIRKWOOD)
 #include <asm/arch/kirkwood.h>
+#elif defined(CONFIG_ORION5X)
+#include <asm/arch/orion5x.h>
+#endif
 
 DECLARE_GLOBAL_DATA_PTR;