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

Commit 644b2a68 authored Oct 12, 2009 by Anton Vorontsov Committed by Kumar Gala Nov 11, 2009

powerpc/cpm: Remove SPI defines and spi structs



When cpm2.h included into spi_mpc8xxx driver, the SPI defines
in the header conflict with defines in the driver.

We don't need them in the header file, so remove them. Plus
remove "struct spi", we'll use a better version in the driver.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

parent 52dffd7f

arch/powerpc/include/asm/cpm1.h

+0 −45

Original line number	Original line	Diff line number	Diff line
	@@ -478,51 +478,6 @@ typedef struct iic {
	char res2[2]; /* Reserved */		char res2[2]; /* Reserved */
	} iic_t;		} iic_t;

	/* SPI parameter RAM.
	*/
	typedef struct spi {
	ushort spi_rbase; /* Rx Buffer descriptor base address */
	ushort spi_tbase; /* Tx Buffer descriptor base address */
	u_char spi_rfcr; /* Rx function code */
	u_char spi_tfcr; /* Tx function code */
	ushort spi_mrblr; /* Max receive buffer length */
	uint spi_rstate; /* Internal */
	uint spi_rdp; /* Internal */
	ushort spi_rbptr; /* Internal */
	ushort spi_rbc; /* Internal */
	uint spi_rxtmp; /* Internal */
	uint spi_tstate; /* Internal */
	uint spi_tdp; /* Internal */
	ushort spi_tbptr; /* Internal */
	ushort spi_tbc; /* Internal */
	uint spi_txtmp; /* Internal */
	uint spi_res;
	ushort spi_rpbase; /* Relocation pointer */
	ushort spi_res2;
	} spi_t;

	/* SPI Mode register.
	*/
	#define SPMODE_LOOP ((ushort)0x4000) /* Loopback */
	#define SPMODE_CI ((ushort)0x2000) /* Clock Invert */
	#define SPMODE_CP ((ushort)0x1000) /* Clock Phase */
	#define SPMODE_DIV16 ((ushort)0x0800) /* BRG/16 mode */
	#define SPMODE_REV ((ushort)0x0400) /* Reversed Data */
	#define SPMODE_MSTR ((ushort)0x0200) /* SPI Master */
	#define SPMODE_EN ((ushort)0x0100) /* Enable */
	#define SPMODE_LENMSK ((ushort)0x00f0) /* character length */
	#define SPMODE_LEN4 ((ushort)0x0030) /* 4 bits per char */
	#define SPMODE_LEN8 ((ushort)0x0070) /* 8 bits per char */
	#define SPMODE_LEN16 ((ushort)0x00f0) /* 16 bits per char */
	#define SPMODE_PMMSK ((ushort)0x000f) /* prescale modulus */

	/* SPIE fields */
	#define SPIE_MME 0x20
	#define SPIE_TXE 0x10
	#define SPIE_BSY 0x04
	#define SPIE_TXB 0x02
	#define SPIE_RXB 0x01

	/*		/*
	* RISC Controller Configuration Register definitons		* RISC Controller Configuration Register definitons
	*/		*/

arch/powerpc/include/asm/cpm2.h

+0 −39

Original line number	Original line	Diff line number	Diff line
	@@ -654,45 +654,6 @@ typedef struct iic {
	uint iic_txtmp; /* Internal */		uint iic_txtmp; /* Internal */
	} iic_t;		} iic_t;

	/* SPI parameter RAM.
	*/
	typedef struct spi {
	ushort spi_rbase; /* Rx Buffer descriptor base address */
	ushort spi_tbase; /* Tx Buffer descriptor base address */
	u_char spi_rfcr; /* Rx function code */
	u_char spi_tfcr; /* Tx function code */
	ushort spi_mrblr; /* Max receive buffer length */
	uint spi_rstate; /* Internal */
	uint spi_rdp; /* Internal */
	ushort spi_rbptr; /* Internal */
	ushort spi_rbc; /* Internal */
	uint spi_rxtmp; /* Internal */
	uint spi_tstate; /* Internal */
	uint spi_tdp; /* Internal */
	ushort spi_tbptr; /* Internal */
	ushort spi_tbc; /* Internal */
	uint spi_txtmp; /* Internal */
	uint spi_res; /* Tx temp. */
	uint spi_res1[4]; /* SDMA temp. */
	} spi_t;

	/* SPI Mode register.
	*/
	#define SPMODE_LOOP ((ushort)0x4000) /* Loopback */
	#define SPMODE_CI ((ushort)0x2000) /* Clock Invert */
	#define SPMODE_CP ((ushort)0x1000) /* Clock Phase */
	#define SPMODE_DIV16 ((ushort)0x0800) /* BRG/16 mode */
	#define SPMODE_REV ((ushort)0x0400) /* Reversed Data */
	#define SPMODE_MSTR ((ushort)0x0200) /* SPI Master */
	#define SPMODE_EN ((ushort)0x0100) /* Enable */
	#define SPMODE_LENMSK ((ushort)0x00f0) /* character length */
	#define SPMODE_PMMSK ((ushort)0x000f) /* prescale modulus */

	#define SPMODE_LEN(x) ((((x)-1)&0xF)<<4)
	#define SPMODE_PM(x) ((x) &0xF)

	#define SPI_EB ((u_char)0x10) /* big endian byte order */

	/* IDMA parameter RAM		/* IDMA parameter RAM
	*/		*/
	typedef struct idma {		typedef struct idma {