summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Pedro <mapedro@nvidia.com>2012-10-01 11:44:42 -0400
committerMatthew Pedro <mapedro@nvidia.com>2012-10-01 08:53:05 -0700
commitf87537ce06430905a822ff16e75cb51aacac50ee (patch)
tree5e2ab819825e80ba13be7ba8cae9e67826e2c66a
parentdca35e304167aac14110b877cafa68a93d3f0a32 (diff)
ARM: tegra: fix-up tegra_gpio enable/diablse defs
Clean-up the definition of the tegra_gpio enable/disable so that it compares to the l4t r16 rel. Change-Id: Ia8584ada1e2a728d2784d6d57c72ed4b0ee01cf1 Signed-off-by: Matt Pedro <mapedro@nvidia.com> Reviewed-on: http://git-master/r/140648 Reviewed-by: Automatic_Commit_Validation_User
-rw-r--r--arch/arm/mach-tegra/include/mach/gpio.h4
-rw-r--r--drivers/gpio/gpio-tegra.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/include/mach/gpio.h b/arch/arm/mach-tegra/include/mach/gpio.h
index aa0495fc6327..b7357ab0c4dd 100644
--- a/arch/arm/mach-tegra/include/mach/gpio.h
+++ b/arch/arm/mach-tegra/include/mach/gpio.h
@@ -71,8 +71,8 @@ struct tegra_gpio_table {
};
void tegra_gpio_config(struct tegra_gpio_table *table, int num);
-static void tegra_gpio_enable(int gpio);
-static void tegra_gpio_disable(int gpio);
+void tegra_gpio_enable(int gpio);
+void tegra_gpio_disable(int gpio);
int tegra_gpio_resume_init(void);
void tegra_gpio_init_configure(unsigned gpio, bool is_input, int value);
void tegra_gpio_set_tristate(int gpio, enum tegra_tristate ts);
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index b7662ae32fd1..c1a80fb8578d 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -142,7 +142,7 @@ int tegra_gpio_get_bank_int_nr(int gpio)
return irq;
}
-static void tegra_gpio_enable(int gpio)
+void tegra_gpio_enable(int gpio)
{
if (gpio >= TEGRA_NR_GPIOS) {
pr_warn("%s : Invalid gpio ID - %d\n", __func__, gpio);
@@ -150,8 +150,9 @@ static void tegra_gpio_enable(int gpio)
}
tegra_gpio_mask_write(GPIO_MSK_CNF(gpio), gpio, 1);
}
+EXPORT_SYMBOL_GPL(tegra_gpio_enable);
-static void tegra_gpio_disable(int gpio)
+void tegra_gpio_disable(int gpio)
{
if (gpio >= TEGRA_NR_GPIOS) {
pr_warn("%s : Invalid gpio ID - %d\n", __func__, gpio);
@@ -159,6 +160,7 @@ static void tegra_gpio_disable(int gpio)
}
tegra_gpio_mask_write(GPIO_MSK_CNF(gpio), gpio, 0);
}
+EXPORT_SYMBOL_GPL(tegra_gpio_disable);
void tegra_gpio_init_configure(unsigned gpio, bool is_input, int value)
{