[PATCH v2 5/8] arm/tegra: add new fields to struct tegra_pingroup_desc

Olof Johansson olof at lixom.net
Fri Nov 4 17:06:29 EDT 2011


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 at 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




More information about the linux-arm-kernel mailing list