Update from 2013.01 to 2013.07

[karo-tx-uboot.git] / arch / arm / cpu / tegra20-common / pmu.c

diff --git a/arch/arm/cpu/tegra20-common/pmu.c b/arch/arm/cpu/tegra20-common/pmu.c
index 228295303ca69022d7d2fb39672e6fe1551500ce..c595f70e939931359f08d7b8f0184c054baeab8d 100644 (file)
--- a/arch/arm/cpu/tegra20-common/pmu.c
+++ b/arch/arm/cpu/tegra20-common/pmu.c
@@ -2,23 +2,7 @@
  * Copyright (c) 2011 The Chromium OS Authors.
  * (C) Copyright 2010,2011 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+
  */
 
 #include <common.h>
@@ -44,7 +28,7 @@ int pmu_set_nominal(void)
        int core, cpu, bus;
 
        /* by default, the table has been filled with T25 settings */
-       switch (tegra_get_chip_type()) {
+       switch (tegra_get_chip_sku()) {
        case TEGRA_SOC_T20:
                core = VDD_CORE_NOMINAL_T20;
                cpu = VDD_CPU_NOMINAL_T20;
@@ -54,7 +38,7 @@ int pmu_set_nominal(void)
                cpu = VDD_CPU_NOMINAL_T25;
                break;
        default:
-               debug("%s: Unknown chip type\n", __func__);
+               debug("%s: Unknown SKU id\n", __func__);
                return -1;
        }