diff options
Diffstat (limited to 'arch/arm/mach-tegra/board-dt-tegra20.c')
-rw-r--r-- | arch/arm/mach-tegra/board-dt-tegra20.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c index 9537f20384fc..777138611c77 100644 --- a/arch/arm/mach-tegra/board-dt-tegra20.c +++ b/arch/arm/mach-tegra/board-dt-tegra20.c | |||
@@ -109,6 +109,23 @@ static void __init trimslice_init(void) | |||
109 | } | 109 | } |
110 | #endif | 110 | #endif |
111 | 111 | ||
112 | #ifdef CONFIG_MACH_HARMONY | ||
113 | static void __init harmony_init(void) | ||
114 | { | ||
115 | int ret; | ||
116 | |||
117 | ret = harmony_regulator_init(); | ||
118 | if (ret) { | ||
119 | pr_err("harmony_regulator_init() failed: %d\n", ret); | ||
120 | return; | ||
121 | } | ||
122 | |||
123 | ret = harmony_pcie_init(); | ||
124 | if (ret) | ||
125 | pr_err("harmony_pcie_init() failed: %d\n", ret); | ||
126 | } | ||
127 | #endif | ||
128 | |||
112 | static struct { | 129 | static struct { |
113 | char *machine; | 130 | char *machine; |
114 | void (*init)(void); | 131 | void (*init)(void); |
@@ -116,6 +133,9 @@ static struct { | |||
116 | #ifdef CONFIG_MACH_TRIMSLICE | 133 | #ifdef CONFIG_MACH_TRIMSLICE |
117 | { "compulab,trimslice", trimslice_init }, | 134 | { "compulab,trimslice", trimslice_init }, |
118 | #endif | 135 | #endif |
136 | #ifdef CONFIG_MACH_HARMONY | ||
137 | { "nvidia,harmony", harmony_init }, | ||
138 | #endif | ||
119 | }; | 139 | }; |
120 | 140 | ||
121 | static void __init tegra_dt_init_late(void) | 141 | static void __init tegra_dt_init_late(void) |