plat-orion: make ehci-orion available for all Orion families

Signed-off-by: NLennert Buytenhek <buytenh@marvell.com>
Reviewed-by: NTzachi Perelstein <tzachi@marvell.com>
Acked-by: NRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: NNicolas Pitre <nico@marvell.com>

arch/arm/mach-orion/common.c

@@ -27,6 +27,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/orion.h>
 #include <asm/arch/platform.h>
+#include <asm/plat-orion/ehci-orion.h>
 #include <asm/plat-orion/time.h>
 #include "common.h"
 

drivers/usb/host/ehci-hcd.c

@@ -1033,7 +1033,7 @@ MODULE_LICENSE ("GPL");
 #define OF_PLATFORM_DRIVER	ehci_hcd_ppc_of_driver
 #endif
 
-#ifdef CONFIG_ARCH_ORION
+#ifdef CONFIG_PLAT_ORION
 #include "ehci-orion.c"
 #define	PLATFORM_DRIVER		ehci_orion_driver
 #endif

drivers/usb/host/ehci-orion.c

@@ -12,8 +12,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/mbus.h>
-#include <asm/arch/orion.h>
-#include <asm/arch/platform.h>
+#include <asm/plat-orion/ehci-orion.h>
 
 #define rdl(off)	__raw_readl(hcd->regs + (off))
 #define wrl(off, val)	__raw_writel((val), hcd->regs + (off))

include/asm-arm/arch-orion/platform.h

@@ -11,14 +11,6 @@
 #ifndef __ASM_ARCH_PLATFORM_H__
 #define __ASM_ARCH_PLATFORM_H__
 
-/*
- * Orion EHCI platform driver data.
- */
-struct orion_ehci_data {
-	struct mbus_dram_target_info	*dram;
-};
-
-
 /*
  * Device bus NAND private data
  */

include/asm-arm/plat-orion/ehci-orion.h

+/*
+ * include/asm-arm/plat-orion/ehci-orion.h
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#ifndef __ASM_PLAT_ORION_EHCI_ORION_H
+#define __ASM_PLAT_ORION_EHCI_ORION_H
+
+#include <linux/mbus.h>
+
+struct orion_ehci_data {
+	struct mbus_dram_target_info	*dram;
+};
+
+
+#endif