powerpc: Drop CONFIG_SYS_ALLOC_DPRAM

[people/ms/u-boot.git] / arch / powerpc / cpu / mpc8260 / spi.c

diff --git a/arch/powerpc/cpu/mpc8260/spi.c b/arch/powerpc/cpu/mpc8260/spi.c
index dc98ea73f2673d64c2f36050e18282f889378306..c7fb4e9a6c073f16d308d9902e9079f5499e7481 100644 (file)
--- a/arch/powerpc/cpu/mpc8260/spi.c
+++ b/arch/powerpc/cpu/mpc8260/spi.c
@@ -5,23 +5,7 @@
  * Copyright (c) 2001 Gerd Mennchen <Gerd.Mennchen@icn.siemens.de>
  * Copyright (c) 2001-2003 Wolfgang Denk, DENX Software Engineering, <wd@denx.de>.
  *
- * 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+
  */
 
 /*
@@ -146,7 +130,7 @@ void spi_init_f (void)
        immr = (immap_t *)  CONFIG_SYS_IMMR;
        cp   = (cpm8260_t *) &immr->im_cpm;
 
-       *(ushort *)(&immr->im_dprambase[PROFF_SPI_BASE]) = PROFF_SPI;
+       immr->im_dprambase16[PROFF_SPI_BASE / sizeof(u16)] = PROFF_SPI;
        spi  = (spi_t *)&immr->im_dprambase[PROFF_SPI];
 
 /* 1 */
@@ -197,14 +181,7 @@ void spi_init_f (void)
        spi->spi_tbc    = 0;
        spi->spi_txtmp  = 0;
 
-       /* Allocate space for one transmit and one receive buffer
-        * descriptor in the DP ram
-        */
-#ifdef CONFIG_SYS_ALLOC_DPRAM
-       dpaddr = m8260_cpm_dpalloc (sizeof(cbd_t)*2, 8);
-#else
        dpaddr = CPM_SPI_BASE;
-#endif
 
 /* 3 */
        /* Set up the SPI parameters in the parameter ram */