gic: fixed compilation error in GICv2 wait for interrupt macro

[karo-tx-uboot.git] / board / esd / cpci750 / mpsc.c

diff --git a/board/esd/cpci750/mpsc.c b/board/esd/cpci750/mpsc.c
index 52398b24ea41665c1f3cd4f66b7de9a0c29d12aa..a15877457df9f182856a2922a5dba307c27303ed 100644 (file)
--- a/board/esd/cpci750/mpsc.c
+++ b/board/esd/cpci750/mpsc.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2001
  * John Clemens <clemens@mclx.com>, Mission Critical Linux, Inc.
  *
- * 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+
  */
 
 /*************************************************************************
@@ -42,6 +26,8 @@
 
 #include "../../Marvell/include/memory.h"
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /* Define this if you wish to use the MPSC as a register based UART.
  * This will force the serial port to not use the SDMA engine at all.
  */
@@ -157,7 +143,6 @@ char mpsc_getchar_debug (void)
  * global variables [josh] */
 int mpsc_putchar_early (char ch)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        int mpsc = CHANNEL;
        int temp =
                GTREGREAD (GALMPSC_CHANNELREG_2 + (mpsc * GALMPSC_REG_GAP));
@@ -425,8 +410,8 @@ void mpsc_sdma_init (void)
                         (MV64360_SDMA_WIN_ACCESS_FULL <<
                          (MV64360_CUNIT_BASE_ADDR_WIN_0_BIT * 2)));
 
-/* Setup MPSC internal address space base address      */
-       GT_REG_WRITE (CUNIT_INTERNAL_SPACE_BASE_ADDR_REG, CFG_GT_REGS);
+/* Setup MPSC internal address space base address      */
+       GT_REG_WRITE (CUNIT_INTERNAL_SPACE_BASE_ADDR_REG, CONFIG_SYS_GT_REGS);
 
 /* no high address remap*/
        GT_REG_WRITE (CUNIT_HIGH_ADDR_REMAP_REG0, 0x00);
@@ -510,16 +495,15 @@ void mpsc_init2 (void)
 
 int galbrg_set_baudrate (int channel, int rate)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        int clock;
 
        galbrg_disable (channel);       /*ok */
 
 #ifdef ZUMA_NTL
        /* from tclk */
-       clock = (CFG_TCLK / (16 * rate)) - 1;
+       clock = (CONFIG_SYS_TCLK / (16 * rate)) - 1;
 #else
-       clock = (CFG_TCLK / (16 * rate)) - 1;
+       clock = (CONFIG_SYS_TCLK / (16 * rate)) - 1;
 #endif
 
        galbrg_set_CDV (channel, clock);        /* set timer Reg. for BRG */
@@ -967,7 +951,7 @@ static int galmpsc_set_snoop (int mpsc, int value)
 *       None.
 *
 * RETURN:
-*       True for success, false otherwise.
+*       true for success, false otherwise.
 *
 *******************************************************************************/