Merge branch 'master' of git://git.denx.de/u-boot-spi

[oweals/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 f5d2ac35a6ad81a7074a7cf6bd556b61f91fe2e1..8c91a713bba4a96d92112c02ec91bdeda45af922 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 */
@@ -276,11 +260,9 @@ void spi_init_r (void)
 {
        volatile spi_t *spi;
        volatile immap_t *immr;
-       volatile cpm8260_t *cp;
        volatile cbd_t *tbdf, *rbdf;
 
        immr = (immap_t *)  CONFIG_SYS_IMMR;
-       cp   = (cpm8260_t *) &immr->im_cpm;
 
        spi  = (spi_t *)&immr->im_dprambase[PROFF_SPI];
 
@@ -358,7 +340,6 @@ ssize_t spi_read (uchar *addr, int alen, uchar *buffer, int len)
 ssize_t spi_xfer (size_t count)
 {
        volatile immap_t *immr;
-       volatile cpm8260_t *cp;
        volatile spi_t *spi;
        cbd_t *tbdf, *rbdf;
        int tm;
@@ -366,7 +347,6 @@ ssize_t spi_xfer (size_t count)
        DPRINT (("*** spi_xfer entered ***\n"));
 
        immr = (immap_t *) CONFIG_SYS_IMMR;
-       cp   = (cpm8260_t *) &immr->im_cpm;
 
        spi  = (spi_t *)&immr->im_dprambase[PROFF_SPI];