Merge branch 'highbank/soc' into next/soc

Conflicts:
	arch/arm/mach-mxs/include/mach/gpio.h
	arch/arm/mach-omap2/board-generic.c
	arch/arm/plat-mxc/include/mach/gpio.h

1 files changed, 4 insertions, 6 deletions

diff --git a/arch/arm/mach-tegra/board-harmony-pcie.c b/arch/arm/mach-tegra/board-harmony-pcie.c
index 9c27b95b8d86..6db7d699ef1c 100644
--- a/arch/arm/mach-tegra/board-harmony-pcie.c
+++ b/arch/arm/mach-tegra/board-harmony-pcie.c
@@ -24,12 +24,10 @@
 
 #include <mach/pinmux.h>
 #include "board.h"
+#include "board-harmony.h"
 
 #ifdef CONFIG_TEGRA_PCI
 
-/* GPIO 3 of the PMIC */
-#define EN_VDD_1V05_GPIO        (TEGRA_NR_GPIOS + 2)
-
 static int __init harmony_pcie_init(void)
 {
         struct regulator *regulator = NULL;
@@ -38,11 +36,11 @@ static int __init harmony_pcie_init(void)
         if (!machine_is_harmony())
                 return 0;
 
-        err = gpio_request(EN_VDD_1V05_GPIO, "EN_VDD_1V05");
+        err = gpio_request(TEGRA_GPIO_EN_VDD_1V05_GPIO, "EN_VDD_1V05");
         if (err)
                 return err;
 
-        gpio_direction_output(EN_VDD_1V05_GPIO, 1);
+        gpio_direction_output(TEGRA_GPIO_EN_VDD_1V05_GPIO, 1);
 
         regulator = regulator_get(NULL, "pex_clk");
         if (IS_ERR_OR_NULL(regulator))
@@ -68,7 +66,7 @@ err_pcie:
         regulator_disable(regulator);
         regulator_put(regulator);
 err_reg:
-        gpio_free(EN_VDD_1V05_GPIO);
+        gpio_free(TEGRA_GPIO_EN_VDD_1V05_GPIO);
 
         return err;
 }