diff options
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony-pcie.c')
-rw-r--r-- | arch/arm/mach-tegra/board-harmony-pcie.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/board-harmony-pcie.c b/arch/arm/mach-tegra/board-harmony-pcie.c index 9c27b95b8d8..f3db0eeba2c 100644 --- a/arch/arm/mach-tegra/board-harmony-pcie.c +++ b/arch/arm/mach-tegra/board-harmony-pcie.c | |||
@@ -23,6 +23,8 @@ | |||
23 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
24 | 24 | ||
25 | #include <mach/pinmux.h> | 25 | #include <mach/pinmux.h> |
26 | #include <mach/pci.h> | ||
27 | #include "devices.h" | ||
26 | #include "board.h" | 28 | #include "board.h" |
27 | 29 | ||
28 | #ifdef CONFIG_TEGRA_PCI | 30 | #ifdef CONFIG_TEGRA_PCI |
@@ -30,7 +32,14 @@ | |||
30 | /* GPIO 3 of the PMIC */ | 32 | /* GPIO 3 of the PMIC */ |
31 | #define EN_VDD_1V05_GPIO (TEGRA_NR_GPIOS + 2) | 33 | #define EN_VDD_1V05_GPIO (TEGRA_NR_GPIOS + 2) |
32 | 34 | ||
33 | static int __init harmony_pcie_init(void) | 35 | static struct tegra_pci_platform_data harmony_pci_platform_data = { |
36 | .port_status[0] = 1, | ||
37 | .port_status[1] = 1, | ||
38 | .use_dock_detect = 0, | ||
39 | .gpio = 0, | ||
40 | }; | ||
41 | |||
42 | int __init harmony_pcie_init(void) | ||
34 | { | 43 | { |
35 | struct regulator *regulator = NULL; | 44 | struct regulator *regulator = NULL; |
36 | int err; | 45 | int err; |
@@ -54,9 +63,8 @@ static int __init harmony_pcie_init(void) | |||
54 | tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXA, TEGRA_TRI_NORMAL); | 63 | tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXA, TEGRA_TRI_NORMAL); |
55 | tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXK, TEGRA_TRI_NORMAL); | 64 | tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXK, TEGRA_TRI_NORMAL); |
56 | 65 | ||
57 | err = tegra_pcie_init(true, true); | 66 | tegra_pci_device.dev.platform_data = &harmony_pci_platform_data; |
58 | if (err) | 67 | platform_device_register(&tegra_pci_device); |
59 | goto err_pcie; | ||
60 | 68 | ||
61 | return 0; | 69 | return 0; |
62 | 70 | ||
@@ -73,7 +81,4 @@ err_reg: | |||
73 | return err; | 81 | return err; |
74 | } | 82 | } |
75 | 83 | ||
76 | /* PCI should be initialized after I2C, mfd and regulators */ | ||
77 | subsys_initcall_sync(harmony_pcie_init); | ||
78 | |||
79 | #endif | 84 | #endif |