arm/tegra: add new fields to struct tegra_pingroup_desc

Add new fields to struct tegra_pingroup_desc to support new hardware features
introduced in the tegra30 SoC. The pinmux driver won't use those fields yet,
but the tegra30 pinmux tables will already provide the necessary data.

Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Colin Cross <ccross@android.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/mach-tegra/include/mach/pinmux.h b/arch/arm/mach-tegra/include/mach/pinmux.h
index 35999ce7c9b2362aa75c6f6ec31459988c2b5409..988c6c5ec9eca2d1046988f5ce0de7a8fa61db5d 100644 (file)
--- a/arch/arm/mach-tegra/include/mach/pinmux.h
+++ b/arch/arm/mach-tegra/include/mach/pinmux.h
@@ -2,6 +2,7 @@
  * linux/arch/arm/mach-tegra/include/mach/pinmux.h
  *
  * Copyright (C) 2010 Google, Inc.
+ * Copyright (C) 2010,2011 Nvidia, Inc.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -99,6 +100,11 @@ enum tegra_tristate {
        TEGRA_TRI_TRISTATE = 1,
 };
 
+enum tegra_pin_io {
+       TEGRA_PIN_OUTPUT = 0,
+       TEGRA_PIN_INPUT = 1,
+};
+
 enum tegra_vddio {
        TEGRA_VDDIO_BB = 0,
        TEGRA_VDDIO_LCD,
@@ -202,6 +208,7 @@ struct tegra_pingroup_desc {
        int funcs[4];
        int func_safe;
        int vddio;
+       enum tegra_pin_io io_default;
        s16 tri_bank;   /* Register bank the tri_reg exists within */
        s16 mux_bank;   /* Register bank the mux_reg exists within */
        s16 pupd_bank;  /* Register bank the pupd_reg exists within */
@@ -211,6 +218,9 @@ struct tegra_pingroup_desc {
        s8 tri_bit;     /* offset into the TRISTATE_REG_* register bit */
        s8 mux_bit;     /* offset into the PIN_MUX_CTL_* register bit */
        s8 pupd_bit;    /* offset into the PULL_UPDOWN_REG_* register bit */
+       s8 lock_bit;    /* offset of the LOCK bit into mux register bit */
+       s8 od_bit;      /* offset of the OD bit into mux register bit */
+       s8 ioreset_bit; /* offset of the IO_RESET bit into mux register bit */
 };
 
 typedef void (*pinmux_init) (const struct tegra_pingroup_desc **pg,

diff --git a/arch/arm/mach-tegra/pinmux-tegra20-tables.c b/arch/arm/mach-tegra/pinmux-tegra20-tables.c
index efe6aeeea474fbc14b7428527bae967fe7ea695e..0fe533573567cad6d9a23ed4f2d6668bd37c84e0 100644 (file)
--- a/arch/arm/mach-tegra/pinmux-tegra20-tables.c
+++ b/arch/arm/mach-tegra/pinmux-tegra20-tables.c
@@ -106,6 +106,10 @@ static const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MA
                .pupd_bank = 2,                         \
                .pupd_reg = ((pupd_r) - PULLUPDOWN_REG_A),      \
                .pupd_bit = pupd_b,                             \
+               .lock_bit = -1,                                 \
+               .od_bit = -1,                                   \
+               .ioreset_bit = -1,                              \
+               .io_default = -1,                               \
        }
 
 static const struct tegra_pingroup_desc tegra_soc_pingroups[TEGRA_MAX_PINGROUP] = {