| Message ID | 1320242948-21061-6-git-send-email-pdeschrijver@nvidia.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Wed, Nov 02, 2011 at 04:09:04PM +0200, Peter De Schrijver wrote: > 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> Just a nit below. > --- > arch/arm/mach-tegra/include/mach/pinmux.h | 10 ++++++++++ > arch/arm/mach-tegra/pinmux-tegra20-tables.c | 4 ++++ > 2 files changed, 14 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-tegra/include/mach/pinmux.h b/arch/arm/mach-tegra/include/mach/pinmux.h > index fb101f5..1ea2018 100644 > --- 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, > @@ -211,6 +217,10 @@ 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 */ > + s8 io_default; Shouldn't this be an enum tegra_pin_io? Also, feel free to move it up above the s16/s8 members. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-tegra/include/mach/pinmux.h b/arch/arm/mach-tegra/include/mach/pinmux.h index fb101f5..1ea2018 100644 --- 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, @@ -211,6 +217,10 @@ 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 */ + s8 io_default; }; struct tegra_pinmux_pm { diff --git a/arch/arm/mach-tegra/pinmux-tegra20-tables.c b/arch/arm/mach-tegra/pinmux-tegra20-tables.c index de9d0df..e469229 100644 --- 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] = {
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> --- arch/arm/mach-tegra/include/mach/pinmux.h | 10 ++++++++++ arch/arm/mach-tegra/pinmux-tegra20-tables.c | 4 ++++ 2 files changed, 14 insertions(+), 0 deletions(-)