hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

atheros[ar2315-spiflash]: I/O fixes 

Directly use ioread/iowrite functions to avoid odd dependency. And
carefully annotate I/O memory pointers.

Singed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

SVN-Revision: 41322
owl
John Crispin 2014-06-24 18:13:35 +00:00
parent cce27e3b95
commit cef87d67f9
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
target/linux/atheros/patches-3.10/120-spiflash.patch
View File

@ -23,7 +23,7 @@
--- /dev/null --- /dev/null
+++ b/drivers/mtd/devices/ar2315.c +++ b/drivers/mtd/devices/ar2315.c
@@ -0,0 +1,539 @@ @@ -0,0 +1,536 @@
+ +
+/* +/*
+ * MTD driver for the SPI Flash Memory support on Atheros AR2315 + * MTD driver for the SPI Flash Memory support on Atheros AR2315
@ -54,7 +54,6 @@
+#include <linux/delay.h> +#include <linux/delay.h>
+#include <linux/io.h> +#include <linux/io.h>
+ +
+#include <ar231x.h>
+#include "ar2315_spiflash.h" +#include "ar2315_spiflash.h"
+ +
+ +
@ -140,8 +139,8 @@
+/* Driver private data structure */ +/* Driver private data structure */
+struct spiflash_priv { +struct spiflash_priv {
+ struct mtd_info mtd; + struct mtd_info mtd;
+ void *readaddr; /* memory mapped data for read */ + void __iomem *readaddr; /* memory mapped data for read */
+ void *mmraddr; /* memory mapped register space */ + void __iomem *mmraddr; /* memory mapped register space */
+ wait_queue_head_t wq; + wait_queue_head_t wq;
+ spinlock_t lock; + spinlock_t lock;
+ int state; + int state;
@ -161,13 +160,13 @@
+static u32 +static u32
+spiflash_read_reg(struct spiflash_priv *priv, int reg) +spiflash_read_reg(struct spiflash_priv *priv, int reg)
+{ +{
+ return ar231x_read_reg((u32) priv->mmraddr + reg); + return ioread32(priv->mmraddr + reg);
+} +}
+ +
+static void +static void
+spiflash_write_reg(struct spiflash_priv *priv, int reg, u32 data) +spiflash_write_reg(struct spiflash_priv *priv, int reg, u32 data)
+{ +{
+ ar231x_write_reg((u32) priv->mmraddr + reg, data); + iowrite32(data, priv->mmraddr + reg);
+} +}
+ +
+static u32 +static u32
@ -341,7 +340,6 @@
+ u_char *buf) + u_char *buf)
+{ +{
+ struct spiflash_priv *priv = to_spiflash(mtd); + struct spiflash_priv *priv = to_spiflash(mtd);
+ u8 *read_addr;
+ +
+ if (!len) + if (!len)
+ return 0; + return 0;
@ -354,8 +352,7 @@
+ if (!spiflash_wait_ready(priv, FL_READING)) + if (!spiflash_wait_ready(priv, FL_READING))
+ return -EINTR; + return -EINTR;
+ +
+ read_addr = (u8 *)(priv->readaddr + from); + memcpy_fromio(buf, priv->readaddr + from, len);
+ memcpy_fromio(buf, read_addr, len);
+ spiflash_done(priv); + spiflash_done(priv);
+ +
+ return 0; + return 0;