On Tue, May 22, 2012 at 3:19 PM, Tom Warren <twarren.nvi...@gmail.com>wrote:
> In anticipation of Tegra3 support, continue removing/renaming
> Tegra2-specific files. No functional changes (yet).
> Updated copyrights to 2012.
>
> Signed-off-by: Tom Warren <twar...@nvidia.com>
>
Acked-by: Simon Glass <s...@chromium.org>
> ---
> arch/arm/include/asm/arch-tegra2/gpio.h | 7 ++++---
> drivers/gpio/Makefile | 2 +-
> drivers/gpio/{tegra2_gpio.c => tegra_gpio.c} | 2 +-
> include/configs/tegra2-common.h | 4 ++--
> 4 files changed, 8 insertions(+), 7 deletions(-)
> rename drivers/gpio/{tegra2_gpio.c => tegra_gpio.c} (99%)
>
> diff --git a/arch/arm/include/asm/arch-tegra2/gpio.h
> b/arch/arm/include/asm/arch-tegra2/gpio.h
> index 41e66fe..40ddb02 100644
> --- a/arch/arm/include/asm/arch-tegra2/gpio.h
> +++ b/arch/arm/include/asm/arch-tegra2/gpio.h
> @@ -2,6 +2,7 @@
> * Copyright (c) 2011, Google Inc. All rights reserved.
> * See file CREDITS for list of people who contributed to this
> * project.
> + * Portions Copyright 2011-2012 NVIDIA Corporation
> *
> * This program is free software; you can redistribute it and/or
> * modify it under the terms of the GNU General Public License as
> @@ -19,8 +20,8 @@
> * MA 02111-1307 USA
> */
>
> -#ifndef _TEGRA2_GPIO_H_
> -#define _TEGRA2_GPIO_H_
> +#ifndef _TEGRA_GPIO_H_
> +#define _TEGRA_GPIO_H_
>
> /*
> * The Tegra 2x GPIO controller has 224 GPIOs arranged in 7 banks of 4
> ports,
> @@ -286,4 +287,4 @@ enum gpio_pin {
> void gpio_info(void);
>
> #define gpio_status() gpio_info()
> -#endif /* TEGRA2_GPIO_H_ */
> +#endif /* TEGRA_GPIO_H_ */
> diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
> index fb3b09a..5ae68d5 100644
> --- a/drivers/gpio/Makefile
> +++ b/drivers/gpio/Makefile
> @@ -35,7 +35,7 @@ COBJS-$(CONFIG_PCA953X) += pca953x.o
> COBJS-$(CONFIG_PCA9698) += pca9698.o
> COBJS-$(CONFIG_S5P) += s5p_gpio.o
> COBJS-$(CONFIG_SANDBOX_GPIO) += sandbox.o
> -COBJS-$(CONFIG_TEGRA2_GPIO) += tegra2_gpio.o
> +COBJS-$(CONFIG_TEGRA_GPIO) += tegra_gpio.o
> COBJS-$(CONFIG_DA8XX_GPIO) += da8xx_gpio.o
> COBJS-$(CONFIG_ALTERA_PIO) += altera_pio.o
> COBJS-$(CONFIG_MPC83XX_GPIO) += mpc83xx_gpio.o
> diff --git a/drivers/gpio/tegra2_gpio.c b/drivers/gpio/tegra_gpio.c
> similarity index 99%
> rename from drivers/gpio/tegra2_gpio.c
> rename to drivers/gpio/tegra_gpio.c
> index 70ca46f..60ec6e3 100644
> --- a/drivers/gpio/tegra2_gpio.c
> +++ b/drivers/gpio/tegra_gpio.c
> @@ -1,6 +1,6 @@
> /*
> * NVIDIA Tegra2 GPIO handling.
> - * (C) Copyright 2010,2011
> + * (C) Copyright 2010-2012
> * NVIDIA Corporation <www.nvidia.com>
> *
> * See file CREDITS for list of people who contributed to this
> diff --git a/include/configs/tegra2-common.h
> b/include/configs/tegra2-common.h
> index 1931179..08fdbe3 100644
> --- a/include/configs/tegra2-common.h
> +++ b/include/configs/tegra2-common.h
> @@ -1,5 +1,5 @@
> /*
> - * (C) Copyright 2010,2011
> + * (C) Copyright 2010-2012
> * NVIDIA Corporation <www.nvidia.com>
> *
> * See file CREDITS for list of people who contributed to this
> @@ -191,6 +191,6 @@
> CONFIG_SYS_INIT_RAM_SIZE - \
> GENERATED_GBL_DATA_SIZE)
>
> -#define CONFIG_TEGRA2_GPIO
> +#define CONFIG_TEGRA_GPIO
> #define CONFIG_CMD_GPIO
> #endif /* __TEGRA2_COMMON_H */
> --
> 1.7.0.4
>
>
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
