aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros/patches-3.10/100-board.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-06-24 18:13:47 +0000
committerJohn Crispin <john@openwrt.org>2014-06-24 18:13:47 +0000
commitbcc7374d7ddbc8a1aa55c3810804aa675034c385 (patch)
treef71e4232a376ef21f20f581d3051b73a8b222a3d /target/linux/atheros/patches-3.10/100-board.patch
parent78bdfeb30b091871f0edee7b034cddac2ac8608a (diff)
downloadupstream-bcc7374d7ddbc8a1aa55c3810804aa675034c385.tar.gz
upstream-bcc7374d7ddbc8a1aa55c3810804aa675034c385.tar.bz2
upstream-bcc7374d7ddbc8a1aa55c3810804aa675034c385.zip
atheros[ar2315-spiflash]: remove duplicated definitions
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> SVN-Revision: 41325
Diffstat (limited to 'target/linux/atheros/patches-3.10/100-board.patch')
-rw-r--r--target/linux/atheros/patches-3.10/100-board.patch20
1 files changed, 1 insertions, 19 deletions
diff --git a/target/linux/atheros/patches-3.10/100-board.patch b/target/linux/atheros/patches-3.10/100-board.patch
index c6eefebd14..f46dc0be9b 100644
--- a/target/linux/atheros/patches-3.10/100-board.patch
+++ b/target/linux/atheros/patches-3.10/100-board.patch
@@ -713,7 +713,7 @@
+#endif /* __ASM_MIPS_MACH_ATHEROS_WAR_H */
--- /dev/null
+++ b/arch/mips/include/asm/mach-ar231x/ar2315_regs.h
-@@ -0,0 +1,615 @@
+@@ -0,0 +1,597 @@
+/*
+ * Register definitions for AR2315+
+ *
@@ -1112,24 +1112,6 @@
+#define SDRAM_BANKADDR_BITS_S 3
+
+/*
-+ * SPI Flash Interface Registers
-+ */
-+
-+#define AR2315_SPI_CTL (AR2315_SPI + 0x00)
-+#define AR2315_SPI_OPCODE (AR2315_SPI + 0x04)
-+#define AR2315_SPI_DATA (AR2315_SPI + 0x08)
-+
-+#define SPI_CTL_START 0x00000100
-+#define SPI_CTL_BUSY 0x00010000
-+#define SPI_CTL_TXCNT_MASK 0x0000000f
-+#define SPI_CTL_RXCNT_MASK 0x000000f0
-+#define SPI_CTL_TX_RX_CNT_MASK 0x000000ff
-+#define SPI_CTL_SIZE_MASK 0x00060000
-+
-+#define SPI_CTL_CLK_SEL_MASK 0x03000000
-+#define SPI_OPCODE_MASK 0x000000ff
-+
-+/*
+ * PCI Bus Interface Registers
+ */
+#define AR2315_PCI_1MS_REG (AR2315_PCI + 0x0008)