Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 705a7521 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Nicolas Pitre
Browse files

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



Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Reviewed-by: default avatarTzachi Perelstein <tzachi@marvell.com>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarNicolas Pitre <nico@marvell.com>
parent 2bac1de2

arch/arm/mach-orion/common.c

+1 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −2
Original line number Diff line number Diff line
@@ -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

+0 −8
Original line number Diff line number Diff line
@@ -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

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * 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