Commit ab05be05 authored by Stephen Warren's avatar Stephen Warren Committed by Russell King

ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h

This centralizes all GPIO naming in one header.
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cc890cd7
...@@ -24,12 +24,10 @@ ...@@ -24,12 +24,10 @@
#include <mach/pinmux.h> #include <mach/pinmux.h>
#include "board.h" #include "board.h"
#include "board-harmony.h"
#ifdef CONFIG_TEGRA_PCI #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) static int __init harmony_pcie_init(void)
{ {
struct regulator *regulator = NULL; struct regulator *regulator = NULL;
...@@ -38,11 +36,11 @@ static int __init harmony_pcie_init(void) ...@@ -38,11 +36,11 @@ static int __init harmony_pcie_init(void)
if (!machine_is_harmony()) if (!machine_is_harmony())
return 0; 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) if (err)
return 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"); regulator = regulator_get(NULL, "pex_clk");
if (IS_ERR_OR_NULL(regulator)) if (IS_ERR_OR_NULL(regulator))
...@@ -68,7 +66,7 @@ static int __init harmony_pcie_init(void) ...@@ -68,7 +66,7 @@ static int __init harmony_pcie_init(void)
regulator_disable(regulator); regulator_disable(regulator);
regulator_put(regulator); regulator_put(regulator);
err_reg: err_reg:
gpio_free(EN_VDD_1V05_GPIO); gpio_free(TEGRA_GPIO_EN_VDD_1V05_GPIO);
return err; return err;
} }
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#define TEGRA_GPIO_HP_DET TEGRA_GPIO_PW2 #define TEGRA_GPIO_HP_DET TEGRA_GPIO_PW2
#define TEGRA_GPIO_INT_MIC_EN TEGRA_GPIO_PX0 #define TEGRA_GPIO_INT_MIC_EN TEGRA_GPIO_PX0
#define TEGRA_GPIO_EXT_MIC_EN TEGRA_GPIO_PX1 #define TEGRA_GPIO_EXT_MIC_EN TEGRA_GPIO_PX1
#define TEGRA_GPIO_EN_VDD_1V05_GPIO HARMONY_GPIO_TPS6586X(2)
void harmony_pinmux_init(void); void harmony_pinmux_init(void);
int harmony_regulator_init(void); int harmony_regulator_init(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment