diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2013-01-17 18:26:12 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:07:43 -0700 |
| commit | c81ae6d9b6b579b1050d099a88cfcc21794542dd (patch) | |
| tree | cb7de9923413bdc382423627b90296dfe960c790 /arch | |
| parent | f81b6822d43ef4f62cc7e7b0e9e7d246bb1b24d5 (diff) | |
gpio: tegra: Fix definition of TEGRA_GPIO_INVALID
Make the TEGRA_GPIO_INVALID is -ve so that gpio_is_valid() return false
with this argument.
bug 1214078
(Cherrypicked commit
009d7eb3fa5945f4521a53eaa2234eba754eccaf)
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/192051
Change-Id: I9446427d1d7ba2341d0ee79a419b3f8261450e82
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/217814
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/gpio-names.h | 6 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/pinmux-t11-tables.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/pinmux-t14-tables.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/pinmux-tegra20-tables.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/pinmux-tegra30-tables.c | 4 |
5 files changed, 17 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/gpio-names.h b/arch/arm/mach-tegra/gpio-names.h index 2ea1f619dac4..9467847982c9 100644 --- a/arch/arm/mach-tegra/gpio-names.h +++ b/arch/arm/mach-tegra/gpio-names.h @@ -20,6 +20,9 @@ #ifndef __MACH_TEGRA_GPIO_NAMES_H #define __MACH_TEGRA_GPIO_NAMES_H +#include <mach/gpio-tegra.h> + +#define TEGRA_GPIO_INVALID -1 #define TEGRA_GPIO_PA0 0 #define TEGRA_GPIO_PA1 1 #define TEGRA_GPIO_PA2 2 @@ -266,6 +269,5 @@ #define TEGRA_GPIO_PEE3 243 #define TEGRA_GPIO_PEE4 244 #define TEGRA_GPIO_PEE5 245 -#define TEGRA_GPIO_INVALID 246 -#define TEGRA_MAX_GPIO 247 +#define TEGRA_MAX_GPIO TEGRA_NR_GPIOS #endif diff --git a/arch/arm/mach-tegra/pinmux-t11-tables.c b/arch/arm/mach-tegra/pinmux-t11-tables.c index cbb0a781d45a..bf5945ed724d 100644 --- a/arch/arm/mach-tegra/pinmux-t11-tables.c +++ b/arch/arm/mach-tegra/pinmux-t11-tables.c @@ -345,10 +345,13 @@ const struct tegra_pingroup_desc tegra_soc_pingroups[TEGRA_MAX_PINGROUP] = { #undef PINGROUP +#undef TEGRA_GPIO_INVALID +#define TEGRA_GPIO_INVALID TEGRA_MAX_GPIO + #define PINGROUP(pg_name, gpio_nr, vdd, f0, f1, f2, f3, fs, iod, reg) \ [TEGRA_GPIO_##gpio_nr] = TEGRA_PINGROUP_ ##pg_name\ -const int gpio_to_pingroup[TEGRA_MAX_GPIO] = { +const int gpio_to_pingroup[TEGRA_MAX_GPIO + 1] = { PINGROUPS }; diff --git a/arch/arm/mach-tegra/pinmux-t14-tables.c b/arch/arm/mach-tegra/pinmux-t14-tables.c index 76406c3f433c..e9e7bea80860 100644 --- a/arch/arm/mach-tegra/pinmux-t14-tables.c +++ b/arch/arm/mach-tegra/pinmux-t14-tables.c @@ -272,11 +272,13 @@ const struct tegra_pingroup_desc tegra_soc_pingroups[TEGRA_MAX_PINGROUP] = { }; #undef PINGROUP +#undef TEGRA_GPIO_INVALID +#define TEGRA_GPIO_INVALID TEGRA_MAX_GPIO #define PINGROUP(pg_name, gpio_nr, vdd, f0, f1, f2, f3, fs, iod, reg) \ [TEGRA_GPIO_##gpio_nr] = TEGRA_PINGROUP_ ##pg_name\ -const int gpio_to_pingroup[TEGRA_MAX_GPIO] = { +const int gpio_to_pingroup[TEGRA_MAX_GPIO + 1] = { PINGROUPS }; diff --git a/arch/arm/mach-tegra/pinmux-tegra20-tables.c b/arch/arm/mach-tegra/pinmux-tegra20-tables.c index 366018b4e98b..9c567f805591 100644 --- a/arch/arm/mach-tegra/pinmux-tegra20-tables.c +++ b/arch/arm/mach-tegra/pinmux-tegra20-tables.c @@ -266,12 +266,14 @@ static const struct tegra_pingroup_desc tegra_soc_pingroups[TEGRA_MAX_PINGROUP] }; #undef PINGROUP +#undef TEGRA_GPIO_INVALID +#define TEGRA_GPIO_INVALID TEGRA_MAX_GPIO #define PINGROUP(pg_name, gpio_nr, vdd, f0, f1, f2, f3, f_safe, \ tri_r, tri_b, mux_r, mux_b, pupd_r, pupd_b) \ [TEGRA_GPIO_##gpio_nr] = TEGRA_PINGROUP_ ##pg_name\ -static const int gpio_to_pingroup[TEGRA_MAX_GPIO] = { +static const int gpio_to_pingroup[TEGRA_MAX_GPIO + 1] = { PINGROUPS }; diff --git a/arch/arm/mach-tegra/pinmux-tegra30-tables.c b/arch/arm/mach-tegra/pinmux-tegra30-tables.c index 2233ce5b5e4f..a81c32635dac 100644 --- a/arch/arm/mach-tegra/pinmux-tegra30-tables.c +++ b/arch/arm/mach-tegra/pinmux-tegra30-tables.c @@ -416,11 +416,13 @@ static const struct tegra_pingroup_desc tegra_soc_pingroups[TEGRA_MAX_PINGROUP] }; #undef PINGROUP +#undef TEGRA_GPIO_INVALID +#define TEGRA_GPIO_INVALID TEGRA_MAX_GPIO #define PINGROUP(pg_name, gpio_nr, vdd, f0, f1, f2, f3, fs, iod, reg) \ [TEGRA_GPIO_##gpio_nr] = TEGRA_PINGROUP_ ##pg_name\ -static const int gpio_to_pingroup[TEGRA_MAX_GPIO] = { +static const int gpio_to_pingroup[TEGRA_MAX_GPIO + 1] = { PINGROUPS }; |