Update from 2013.01 to 2013.07

[karo-tx-uboot.git] / arch / mips / cpu / xburst / jz4740.c

diff --git a/arch/mips/cpu/xburst/jz4740.c b/arch/mips/cpu/xburst/jz4740.c
index c0b9817ab9765d8e73cb8f27d1e273b347b4fb21..30f35bde7ac4d8d6c727347b0dad114f1524ef68 100644 (file)
--- a/arch/mips/cpu/xburst/jz4740.c
+++ b/arch/mips/cpu/xburst/jz4740.c
@@ -2,20 +2,7 @@
  * Jz4740 common routines
  * Copyright (c) 2006 Ingenic Semiconductor, <jlwei@ingenic.cn>
  *
- * 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 <config.h>
@@ -201,10 +188,10 @@ void calc_clocks(void)
        pllout = __cpm_get_pllout();
 
        gd->cpu_clk = pllout / div[__cpm_get_cdiv()];
-       gd->sys_clk = pllout / div[__cpm_get_hdiv()];
-       gd->per_clk = pllout / div[__cpm_get_pdiv()];
+       gd->arch.sys_clk = pllout / div[__cpm_get_hdiv()];
+       gd->arch.per_clk = pllout / div[__cpm_get_pdiv()];
        gd->mem_clk = pllout / div[__cpm_get_mdiv()];
-       gd->dev_clk = CONFIG_SYS_EXTAL;
+       gd->arch.dev_clk = CONFIG_SYS_EXTAL;
 }
 
 void rtc_init(void)