Merge branch 'master' of git://git.denx.de/u-boot-tegra

[u-boot] / arch / arm / include / asm / arch-tegra / gp_padctrl.h

diff --git a/arch/arm/include/asm/arch-tegra/gp_padctrl.h b/arch/arm/include/asm/arch-tegra/gp_padctrl.h
index 209abf160a3cb78e1c861c2b1f75c231a0aa317e..695f3e6fba82f27a476e385db0905f0667031944 100644 (file)
--- a/arch/arm/include/asm/arch-tegra/gp_padctrl.h
+++ b/arch/arm/include/asm/arch-tegra/gp_padctrl.h
@@ -1,24 +1,8 @@
 /*
- *  (C) Copyright 2010-2012
+ *  (C) Copyright 2010-2015
  *  NVIDIA Corporation <www.nvidia.com>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _TEGRA_GP_PADCTRL_H_
@@ -36,5 +20,7 @@
 #define CHIPID_TEGRA20                 0x20
 #define CHIPID_TEGRA30                 0x30
 #define CHIPID_TEGRA114                        0x35
+#define CHIPID_TEGRA124                        0x40
+#define CHIPID_TEGRA210                        0x21
 
 #endif /* _TEGRA_GP_PADCTRL_H_ */