Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Reviewed-by: Tzachi Perelstein <tzachi@marvell.com>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Nicolas Pitre <nico@marvell.com>

authored by

Lennert Buytenhek and committed by
Nicolas Pitre
705a7521 2bac1de2

+22 -11
+1
arch/arm/mach-orion/common.c
··· 27 27 #include <asm/arch/hardware.h> 28 28 #include <asm/arch/orion.h> 29 29 #include <asm/arch/platform.h> 30 + #include <asm/plat-orion/ehci-orion.h> 30 31 #include <asm/plat-orion/time.h> 31 32 #include "common.h" 32 33
+1 -1
drivers/usb/host/ehci-hcd.c
··· 1033 1033 #define OF_PLATFORM_DRIVER ehci_hcd_ppc_of_driver 1034 1034 #endif 1035 1035 1036 - #ifdef CONFIG_ARCH_ORION 1036 + #ifdef CONFIG_PLAT_ORION 1037 1037 #include "ehci-orion.c" 1038 1038 #define PLATFORM_DRIVER ehci_orion_driver 1039 1039 #endif
+1 -2
drivers/usb/host/ehci-orion.c
··· 12 12 #include <linux/module.h> 13 13 #include <linux/platform_device.h> 14 14 #include <linux/mbus.h> 15 - #include <asm/arch/orion.h> 16 - #include <asm/arch/platform.h> 15 + #include <asm/plat-orion/ehci-orion.h> 17 16 18 17 #define rdl(off) __raw_readl(hcd->regs + (off)) 19 18 #define wrl(off, val) __raw_writel((val), hcd->regs + (off))
-8
include/asm-arm/arch-orion/platform.h
··· 12 12 #define __ASM_ARCH_PLATFORM_H__ 13 13 14 14 /* 15 - * Orion EHCI platform driver data. 16 - */ 17 - struct orion_ehci_data { 18 - struct mbus_dram_target_info *dram; 19 - }; 20 - 21 - 22 - /* 23 15 * Device bus NAND private data 24 16 */ 25 17 struct orion_nand_data {
+19
include/asm-arm/plat-orion/ehci-orion.h
··· 1 + /* 2 + * include/asm-arm/plat-orion/ehci-orion.h 3 + * 4 + * This file is licensed under the terms of the GNU General Public 5 + * License version 2. This program is licensed "as is" without any 6 + * warranty of any kind, whether express or implied. 7 + */ 8 + 9 + #ifndef __ASM_PLAT_ORION_EHCI_ORION_H 10 + #define __ASM_PLAT_ORION_EHCI_ORION_H 11 + 12 + #include <linux/mbus.h> 13 + 14 + struct orion_ehci_data { 15 + struct mbus_dram_target_info *dram; 16 + }; 17 + 18 + 19 + #endif