Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / m68k / cpu / mcf547x_8x / cpu.c

diff --git a/arch/m68k/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c
index f9a4b64011ca1d6bd57cf81216cfcd146a75e334..59cdfe70e484a38f70e223e77c2b547e512d3774 100644 (file)
--- a/arch/m68k/cpu/mcf547x_8x/cpu.c
+++ b/arch/m68k/cpu/mcf547x_8x/cpu.c
@@ -1,62 +1,50 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *
  * (C) Copyright 2000-2003
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
+ * Copyright (C) 2004-2007, 2012 Freescale Semiconductor, Inc.
  * TsiChung Liew (Tsi-Chung.Liew@freescale.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
  */
 
 #include <common.h>
+#include <init.h>
+#include <net.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
 #include <netdev.h>
 
 #include <asm/immap.h>
+#include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int do_reset(cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char * const argv[])
+int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
-       volatile gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR);
+       gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR);
 
-       gptmr->pre = 10;
-       gptmr->cnt = 1;
+       out_be16(&gptmr->pre, 10);
+       out_be16(&gptmr->cnt, 1);
 
        /* enable watchdog, set timeout to 0 and wait */
-       gptmr->mode = GPT_TMS_SGPIO;
-       gptmr->ctrl = GPT_CTRL_WDEN | GPT_CTRL_CE;
+       out_8(&gptmr->mode, GPT_TMS_SGPIO);
+       out_8(&gptmr->ctrl, GPT_CTRL_WDEN | GPT_CTRL_CE);
 
        /* we don't return! */
        return 1;
 };
 
-int checkcpu(void)
+#if defined(CONFIG_DISPLAY_CPUINFO)
+int print_cpuinfo(void)
 {
-       volatile siu_t *siu = (siu_t *) MMAP_SIU;
+       siu_t *siu = (siu_t *) MMAP_SIU;
        u16 id = 0;
 
        puts("CPU:   ");
 
-       switch ((siu->jtagid & 0x000FF000) >> 12) {
+       switch ((in_be32(&siu->jtagid) & 0x000FF000) >> 12) {
        case 0x0C:
                id = 5485;
                break;
@@ -106,23 +94,24 @@ int checkcpu(void)
 
        return 0;
 };
+#endif /* CONFIG_DISPLAY_CPUINFO */
 
 #if defined(CONFIG_HW_WATCHDOG)
 /* Called by macro WATCHDOG_RESET */
 void hw_watchdog_reset(void)
 {
-       volatile gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR);
+       gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR);
 
-       gptmr->ocpw = 0xa5;
+       out_8(&gptmr->ocpw, 0xa5);
 }
 
 int watchdog_disable(void)
 {
-       volatile gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR);
+       gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR);
 
        /* UserManual, once the wdog is disabled, wdog cannot be re-enabled */
-       gptmr->mode = 0;
-       gptmr->ctrl = 0;
+       out_8(&gptmr->mode, 0);
+       out_8(&gptmr->ctrl, 0);
 
        puts("WATCHDOG:disabled\n");
 
@@ -131,14 +120,13 @@ int watchdog_disable(void)
 
 int watchdog_init(void)
 {
+       gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR);
 
-       volatile gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR);
-
-       gptmr->pre = CONFIG_WATCHDOG_TIMEOUT;
-       gptmr->cnt = CONFIG_SYS_TIMER_PRESCALER * 1000;
+       out_be16(&gptmr->pre, CONFIG_WATCHDOG_TIMEOUT);
+       out_be16(&gptmr->cnt, CONFIG_SYS_TIMER_PRESCALER * 1000);
 
-       gptmr->mode = GPT_TMS_SGPIO;
-       gptmr->ctrl = GPT_CTRL_CE | GPT_CTRL_WDEN;
+       out_8(&gptmr->mode, GPT_TMS_SGPIO);
+       out_8(&gptmr->ctrl, GPT_CTRL_CE | GPT_CTRL_WDEN);
        puts("WATCHDOG:enabled\n");
 
        return (0);