aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRonen Shitrit <rshitrit@marvell.com>2008-09-17 03:08:05 -0400
committerNicolas Pitre <nico@cam.org>2008-12-04 01:28:14 -0500
commitfb6f552930e52699c8ac452c5a79ec3e97e6fc73 (patch)
tree77bbbfc5168695ec20c525eb53094d6d0b45e0ce /arch/arm
parent061e41fdb5047b1fb161e89664057835935ca1d2 (diff)
[ARM] Orion: add the option to support different ehci phy initialization
The Orion ehci driver serves the Orion, kirkwood and DD Soc families. Since each of those integrate a different USB phy we should have the ability to use few initialization sequences or to leave the boot loader phy settings as is. Signed-off-by: Ronen Shitrit <rshitrit@marvell.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-kirkwood/common.c1
-rw-r--r--arch/arm/mach-mv78xx0/common.c1
-rw-r--r--arch/arm/mach-orion5x/common.c1
-rw-r--r--arch/arm/plat-orion/include/plat/ehci-orion.h8
4 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 0bb1fbd84ccb..b5c684d96e4e 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -57,6 +57,7 @@ void __init kirkwood_map_io(void)
57 ****************************************************************************/ 57 ****************************************************************************/
58static struct orion_ehci_data kirkwood_ehci_data = { 58static struct orion_ehci_data kirkwood_ehci_data = {
59 .dram = &kirkwood_mbus_dram_info, 59 .dram = &kirkwood_mbus_dram_info,
60 .phy_version = EHCI_PHY_NA,
60}; 61};
61 62
62static u64 ehci_dmamask = 0xffffffffUL; 63static u64 ehci_dmamask = 0xffffffffUL;
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index 238a2f8c2d52..b0e4e0d8f506 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -167,6 +167,7 @@ void __init mv78xx0_map_io(void)
167 ****************************************************************************/ 167 ****************************************************************************/
168static struct orion_ehci_data mv78xx0_ehci_data = { 168static struct orion_ehci_data mv78xx0_ehci_data = {
169 .dram = &mv78xx0_mbus_dram_info, 169 .dram = &mv78xx0_mbus_dram_info,
170 .phy_version = EHCI_PHY_NA,
170}; 171};
171 172
172static u64 ehci_dmamask = 0xffffffffUL; 173static u64 ehci_dmamask = 0xffffffffUL;
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 437065c25c9c..0a623379789f 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -72,6 +72,7 @@ void __init orion5x_map_io(void)
72 ****************************************************************************/ 72 ****************************************************************************/
73static struct orion_ehci_data orion5x_ehci_data = { 73static struct orion_ehci_data orion5x_ehci_data = {
74 .dram = &orion5x_mbus_dram_info, 74 .dram = &orion5x_mbus_dram_info,
75 .phy_version = EHCI_PHY_ORION,
75}; 76};
76 77
77static u64 ehci_dmamask = 0xffffffffUL; 78static u64 ehci_dmamask = 0xffffffffUL;
diff --git a/arch/arm/plat-orion/include/plat/ehci-orion.h b/arch/arm/plat-orion/include/plat/ehci-orion.h
index 64343051095a..4ec668e77460 100644
--- a/arch/arm/plat-orion/include/plat/ehci-orion.h
+++ b/arch/arm/plat-orion/include/plat/ehci-orion.h
@@ -11,8 +11,16 @@
11 11
12#include <linux/mbus.h> 12#include <linux/mbus.h>
13 13
14enum orion_ehci_phy_ver {
15 EHCI_PHY_ORION,
16 EHCI_PHY_DD,
17 EHCI_PHY_KW,
18 EHCI_PHY_NA,
19};
20
14struct orion_ehci_data { 21struct orion_ehci_data {
15 struct mbus_dram_target_info *dram; 22 struct mbus_dram_target_info *dram;
23 enum orion_ehci_phy_ver phy_version;
16}; 24};
17 25
18 26