From: Jagannadha Sutradharudu Teki <jagannadha.sutradharudu-teki@xilinx.com>
Date: Tue, 12 Mar 2013 04:14:50 +0000 (+0530)
Subject: spi: zynq: driver code cleanups
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ac988bcb2a9a46e32e157d053565e99aa47e15c;p=thirdparty%2Fu-boot.git

spi: zynq: driver code cleanups

- Moved the structures from zynq_qspips.h to zynq_qspips.c
- Removed typedef bool and zynq_qspips.h

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---

diff --git a/drivers/spi/zynq_qspips.c b/drivers/spi/zynq_qspips.c
index 7359f851e83..b6e423a7c9e 100644
--- a/drivers/spi/zynq_qspips.c
+++ b/drivers/spi/zynq_qspips.c
@@ -18,10 +18,9 @@
 #include <malloc.h>
 #include <ubi_uboot.h>
 #include <spi.h>
+#include <asm/io.h>
 #include <asm/arch/hardware.h>
 
-#include "zynq_qspips.h"
-
 /* Register offset definitions */
 #define XQSPIPS_CONFIG_OFFSET		0x00 /* Configuration  Register, RW */
 #define XQSPIPS_STATUS_OFFSET		0x04 /* Interrupt Status Register, RO */
@@ -133,6 +132,44 @@ enum xqspips_con_topology {
 #define xqspips_write(off, val)		__raw_writel(val, off)
 #define xqspips_read(off)		__raw_readl(off)
 
+/* Few mtd flash functions */
+extern int spi_flash_cmd(struct spi_slave *spi, u8 cmd,
+		void *response, size_t len);
+extern int spi_flash_cmd_read(struct spi_slave *spi, const u8 *cmd,
+		size_t cmd_len, void *data, size_t data_len);
+
+struct xqspips {
+	void *regs;
+	u32 input_clk_hz;
+	u32 speed_hz;
+	const void *txbuf;
+	void *rxbuf;
+	int bytes_to_transfer;
+	int bytes_to_receive;
+	struct xqspips_inst_format *curr_inst;
+	u8 inst_response;
+	unsigned int is_inst;
+	unsigned int is_dual;
+};
+
+struct spi_device {
+	struct xqspips	master;
+	u32		max_speed_hz;
+	u8		chip_select;
+	u8		mode;
+	u8		bits_per_word;
+};
+
+struct spi_transfer {
+	const void	*tx_buf;
+	void		*rx_buf;
+	unsigned	len;
+	unsigned	cs_change:1;
+	u8		bits_per_word;
+	u16		delay_usecs;
+	u32		speed_hz;
+};
+
 struct zynq_spi_slave {
 	struct spi_slave  slave;
 	struct spi_device qspi;
diff --git a/drivers/spi/zynq_qspips.h b/drivers/spi/zynq_qspips.h
deleted file mode 100644
index 2eb8b93b53d..00000000000
--- a/drivers/spi/zynq_qspips.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * (C) Copyright 2012 Xilinx
- *
- * Xilinx PSS Quad-SPI (QSPI) controller headers
- *
- * 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.
- *
- * 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
- */
-
-#ifndef _XILINX_QSPIPSS_H_
-#define _XILINX_QSPIPSS_H_
-
-#include <asm/io.h>
-
-#ifndef bool
-typedef unsigned int bool;
-#endif
-
-struct xqspips {
-	void *regs;
-	u32 input_clk_hz;
-	u32 speed_hz;
-
-	const void *txbuf;
-	void *rxbuf;
-	int bytes_to_transfer;
-	int bytes_to_receive;
-
-	struct xqspips_inst_format *curr_inst;
-	u8 inst_response;
-	bool is_inst;
-	bool is_dual;
-};
-
-struct spi_device {
-	struct xqspips master;
-	u32             max_speed_hz;
-	u8              chip_select;
-	u8              mode;
-	u8              bits_per_word;
-};
-
-struct spi_transfer {
-	const void      *tx_buf;
-	void            *rx_buf;
-	unsigned        len;
-	unsigned        cs_change:1;
-	u8              bits_per_word;
-	u16             delay_usecs;
-	u32             speed_hz;
-};
-
-/**************************************************************************/
-extern void xqspips_init_hw(void *regs_base, unsigned int is_dual);
-extern int  xqspips_setup_transfer(struct spi_device   *qspi,
-					struct spi_transfer *transfer);
-extern int  xqspips_transfer(struct spi_device   *qspi,
-				struct spi_transfer *transfer);
-extern int xqspips_check_is_dual_flash(void *regs_base);
-extern void xqspips_write_quad_bit(void *regs_base);
-
-/* Few mtd flash functions */
-extern int spi_flash_cmd(struct spi_slave *spi, u8 cmd,
-		void *response, size_t len);
-extern int spi_flash_cmd_read(struct spi_slave *spi, const u8 *cmd,
-		size_t cmd_len, void *data, size_t data_len);
-/**************************************************************************/
-
-#endif