Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22cc1b6b authored by Jan Glauber's avatar Jan Glauber Committed by Mark Brown
Browse files

spi: octeon: Move include file from arch/mips to drivers/spi 



Move the register definitions to the drivers directory because they
are only used there.

Signed-off-by: default avatarJan Glauber <jglauber@cavium.com>
Tested-by: default avatarSteven J. Hill <steven.hill@cavium.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ee423c53

arch/mips/include/asm/octeon/cvmx-mpi-defs.h→drivers/spi/spi-cavium.h

+1 −31
Original line number Diff line number Diff line 
/***********************license start***************

 * Author: Cavium Networks

 *

 * Contact: support@caviumnetworks.com

 * This file is part of the OCTEON SDK

 *

 * Copyright (c) 2003-2012 Cavium Networks

 *

 * This file is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License, Version 2, as

 * published by the Free Software Foundation.

 *

 * This file is distributed in the hope that it will be useful, but

 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or

 * NONINFRINGEMENT.  See the GNU General Public License for more

 * details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this file; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

 * or visit http://www.gnu.org/licenses/.

 *

 * This file may also be available under a different license from Cavium.

 * Contact Cavium Networks for more information

 ***********************license end**************************************/



#ifndef __CVMX_MPI_DEFS_H__

#define __CVMX_MPI_DEFS_H__

/* MPI register descriptions */



#define CVMX_MPI_CFG (CVMX_ADD_IO_SEG(0x0001070000001000ull))

#define CVMX_MPI_DATX(offset) (CVMX_ADD_IO_SEG(0x0001070000001080ull) + ((offset) & 15) * 8)
@@ -324,5 +296,3 @@ union cvmx_mpi_tx { 
	struct cvmx_mpi_tx_s cn66xx;

	struct cvmx_mpi_tx_cn61xx cnf71xx;

};
 


#endif

drivers/spi/spi-octeon.c

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
#include <linux/of.h>



#include <asm/octeon/octeon.h>

#include <asm/octeon/cvmx-mpi-defs.h>



#include "spi-cavium.h"



#define OCTEON_SPI_MAX_BYTES 9