arm: marvell: Move arch-kirkwood/spi.h to arch-mvebu/spi.h

This move makes it possible to use this kirkwood SPI driver from other
MVEBU platforms as well. This will be used by the upcoming Armada XP
support.

Signed-off-by: Stefan Roese <sr@denx.de>
Reviewed-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Tested-by: Luka Perkov <luka@openwrt.org>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>

diff --git a/arch/arm/include/asm/arch-kirkwood/spi.h b/arch/arm/include/asm/arch-kirkwood/spi.h
deleted file mode 100644 (file)
index e512dce..0000000
--- a/arch/arm/include/asm/arch-kirkwood/spi.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * (C) Copyright 2009
- * Marvell Semiconductor <www.marvell.com>
- * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
- *
- * Derived from drivers/spi/mpc8xxx_spi.c
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef __KW_SPI_H__
-#define __KW_SPI_H__
-
-/* SPI Registers on kirkwood SOC */
-struct kwspi_registers {
-       u32 ctrl;       /* 0x10600 */
-       u32 cfg;        /* 0x10604 */
-       u32 dout;       /* 0x10608 */
-       u32 din;        /* 0x1060c */
-       u32 irq_cause;  /* 0x10610 */
-       u32 irq_mask;   /* 0x10614 */
-};
-
-/* They are used to define CONFIG_SYS_KW_SPI_MPP
- * each of the below #defines selects which mpp is
- * configured for each SPI signal in spi_claim_bus
- * bit 0: selects pin for MOSI (MPP1 if 0, MPP6 if 1)
- * bit 1: selects pin for SCK (MPP2 if 0, MPP10 if 1)
- * bit 2: selects pin for MISO (MPP3 if 0, MPP11 if 1)
- */
-#define MOSI_MPP6      (1 << 0)
-#define SCK_MPP10      (1 << 1)
-#define MISO_MPP11     (1 << 2)
-
-#define KWSPI_CLKPRESCL_MASK   0x1f
-#define KWSPI_CLKPRESCL_MIN    0x12
-#define KWSPI_CSN_ACT          1 /* Activates serial memory interface */
-#define KWSPI_SMEMRDY          (1 << 1) /* SerMem Data xfer ready */
-#define KWSPI_IRQUNMASK                1 /* unmask SPI interrupt */
-#define KWSPI_IRQMASK          0 /* mask SPI interrupt */
-#define KWSPI_SMEMRDIRQ                1 /* SerMem data xfer ready irq */
-#define KWSPI_XFERLEN_1BYTE    0
-#define KWSPI_XFERLEN_2BYTE    (1 << 5)
-#define KWSPI_XFERLEN_MASK     (1 << 5)
-#define KWSPI_ADRLEN_1BYTE     0
-#define KWSPI_ADRLEN_2BYTE     (1 << 8)
-#define KWSPI_ADRLEN_3BYTE     (2 << 8)
-#define KWSPI_ADRLEN_4BYTE     (3 << 8)
-#define KWSPI_ADRLEN_MASK      (3 << 8)
-#define KWSPI_TIMEOUT          10000
-
-#endif /* __KW_SPI_H__ */

diff --git a/arch/arm/include/asm/arch-mvebu/spi.h b/arch/arm/include/asm/arch-mvebu/spi.h
new file mode 100644 (file)
index 0000000..e512dce
--- /dev/null
+++ b/arch/arm/include/asm/arch-mvebu/spi.h
@@ -0,0 +1,52 @@
+/*
+ * (C) Copyright 2009
+ * Marvell Semiconductor <www.marvell.com>
+ * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
+ *
+ * Derived from drivers/spi/mpc8xxx_spi.c
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __KW_SPI_H__
+#define __KW_SPI_H__
+
+/* SPI Registers on kirkwood SOC */
+struct kwspi_registers {
+       u32 ctrl;       /* 0x10600 */
+       u32 cfg;        /* 0x10604 */
+       u32 dout;       /* 0x10608 */
+       u32 din;        /* 0x1060c */
+       u32 irq_cause;  /* 0x10610 */
+       u32 irq_mask;   /* 0x10614 */
+};
+
+/* They are used to define CONFIG_SYS_KW_SPI_MPP
+ * each of the below #defines selects which mpp is
+ * configured for each SPI signal in spi_claim_bus
+ * bit 0: selects pin for MOSI (MPP1 if 0, MPP6 if 1)
+ * bit 1: selects pin for SCK (MPP2 if 0, MPP10 if 1)
+ * bit 2: selects pin for MISO (MPP3 if 0, MPP11 if 1)
+ */
+#define MOSI_MPP6      (1 << 0)
+#define SCK_MPP10      (1 << 1)
+#define MISO_MPP11     (1 << 2)
+
+#define KWSPI_CLKPRESCL_MASK   0x1f
+#define KWSPI_CLKPRESCL_MIN    0x12
+#define KWSPI_CSN_ACT          1 /* Activates serial memory interface */
+#define KWSPI_SMEMRDY          (1 << 1) /* SerMem Data xfer ready */
+#define KWSPI_IRQUNMASK                1 /* unmask SPI interrupt */
+#define KWSPI_IRQMASK          0 /* mask SPI interrupt */
+#define KWSPI_SMEMRDIRQ                1 /* SerMem data xfer ready irq */
+#define KWSPI_XFERLEN_1BYTE    0
+#define KWSPI_XFERLEN_2BYTE    (1 << 5)
+#define KWSPI_XFERLEN_MASK     (1 << 5)
+#define KWSPI_ADRLEN_1BYTE     0
+#define KWSPI_ADRLEN_2BYTE     (1 << 8)
+#define KWSPI_ADRLEN_3BYTE     (2 << 8)
+#define KWSPI_ADRLEN_4BYTE     (3 << 8)
+#define KWSPI_ADRLEN_MASK      (3 << 8)
+#define KWSPI_TIMEOUT          10000
+
+#endif /* __KW_SPI_H__ */

diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c
index de0e9143eee57436cd09afef03d651b3afed753f..9710f12e12cce3bf4da20e39c71433d8212c7395 100644 (file)
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -13,8 +13,8 @@
 #include <spi.h>
 #include <asm/io.h>
 #include <asm/arch/soc.h>
-#include <asm/arch/spi.h>
 #include <asm/arch/mpp.h>
+#include <asm/arch-mvebu/spi.h>
 
 static struct kwspi_registers *spireg = (struct kwspi_registers *)KW_SPI_BASE;