ar71xx: improve SPI flash read/write performance
mtd_speedtest results:
page write speed
old new delta
DB120 209 KiB/s 226 KiB/s +8.13%
TL-WR1043ND v1 122 KiB/s 148 KiB/s +21.31%
TL-WR703N v1 153 KiB/s 194 KiB/s +26.80%
TL-MR3220 v1 130 KiB/s 156 KiB/s +20.00%
TL-WR2543ND v1 158 KiB/s 202 KiB/s +27.85%
TL-WR741ND v2 122 KiB/s 152 KiB/s +24.59%
ALFA AP96 229 KiB/s 260 KiB/s +13.54%
WNDR3700 202 KiB/s 223 KiB/s +10.40%
page read speed
old new delta
DB120 691 KiB/s 929 KiB/s +34.44%
TL-WR1043ND v1 372 KiB/s 754 KiB/s +102.69%
TL-WR703N v1 375 KiB/s 745 KiB/s +98.67%
TL-MR3220 v1 372 KiB/s 752 KiB/s +102.15%
TL-WR2543ND v1 307 KiB/s 564 KiB/s +83.71%
TL-WR741ND v2 315 KiB/s 525 KiB/s +66.67%
ALFA AP96 515 KiB/s 702 KiB/s +36.31%
WNDR3700 515 KiB/s 697 KiB/s +35.34%
SVN-Revision: 31117
This commit is contained in:
Gabor Juhos
parent
6455178a6a
commit
102c6df148
18 changed files with 514 additions and 324 deletions
|
|
@ -1,4 +1,4 @@
|
|||
From 48b7e765e6e097d20d809fadd17a4355d26ad6d5 Mon Sep 17 00:00:00 2001
|
||||
From 8e948c035dd7983eccc3a889f2497e64044f3a31 Mon Sep 17 00:00:00 2001
|
||||
From: Gabor Juhos <juhosg@openwrt.org>
|
||||
Date: Wed, 11 Jan 2012 20:06:35 +0100
|
||||
Subject: [PATCH 1/7] spi/ath79: add delay between SCK changes
|
||||
|
|
@ -12,31 +12,111 @@ well.
|
|||
|
||||
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
---
|
||||
drivers/spi/spi-ath79.c | 8 ++++++++
|
||||
1 files changed, 8 insertions(+), 0 deletions(-)
|
||||
drivers/spi/spi-ath79.c | 44 +++++++++++++++++++++++++++++++++++++++++++-
|
||||
1 files changed, 43 insertions(+), 1 deletions(-)
|
||||
|
||||
--- a/drivers/spi/spi-ath79.c
|
||||
+++ b/drivers/spi/spi-ath79.c
|
||||
@@ -52,6 +52,12 @@ static inline struct ath79_spi *ath79_sp
|
||||
@@ -24,17 +24,24 @@
|
||||
#include <linux/spi/spi_bitbang.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/gpio.h>
|
||||
+#include <linux/clk.h>
|
||||
+#include <linux/err.h>
|
||||
|
||||
#include <asm/mach-ath79/ar71xx_regs.h>
|
||||
#include <asm/mach-ath79/ath79_spi_platform.h>
|
||||
|
||||
#define DRV_NAME "ath79-spi"
|
||||
|
||||
+#define ATH79_SPI_RRW_DELAY_FACTOR 12000
|
||||
+#define MHZ (1000 * 1000)
|
||||
+
|
||||
struct ath79_spi {
|
||||
struct spi_bitbang bitbang;
|
||||
u32 ioc_base;
|
||||
u32 reg_ctrl;
|
||||
void __iomem *base;
|
||||
+ struct clk *clk;
|
||||
+ unsigned rrw_delay;
|
||||
};
|
||||
|
||||
static inline u32 ath79_spi_rr(struct ath79_spi *sp, unsigned reg)
|
||||
@@ -52,6 +59,12 @@ static inline struct ath79_spi *ath79_sp
|
||||
return spi_master_get_devdata(spi->master);
|
||||
}
|
||||
|
||||
+static inline void ath79_spi_delay(unsigned nsecs)
|
||||
+static inline void ath79_spi_delay(struct ath79_spi *sp, unsigned nsecs)
|
||||
+{
|
||||
+ if (nsecs)
|
||||
+ ndelay(nsecs);
|
||||
+ if (nsecs > sp->rrw_delay)
|
||||
+ ndelay(nsecs - sp->rrw_delay);
|
||||
+}
|
||||
+
|
||||
static void ath79_spi_chipselect(struct spi_device *spi, int is_active)
|
||||
{
|
||||
struct ath79_spi *sp = ath79_spidev_to_sp(spi);
|
||||
@@ -184,7 +190,9 @@ static u32 ath79_spi_txrx_mode0(struct s
|
||||
@@ -184,7 +197,9 @@ static u32 ath79_spi_txrx_mode0(struct s
|
||||
|
||||
/* setup MSB (to slave) on trailing edge */
|
||||
ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, out);
|
||||
+ ath79_spi_delay(nsecs);
|
||||
+ ath79_spi_delay(sp, nsecs);
|
||||
ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, out | AR71XX_SPI_IOC_CLK);
|
||||
+ ath79_spi_delay(nsecs);
|
||||
+ ath79_spi_delay(sp, nsecs);
|
||||
|
||||
word <<= 1;
|
||||
}
|
||||
@@ -198,6 +213,7 @@ static __devinit int ath79_spi_probe(str
|
||||
struct ath79_spi *sp;
|
||||
struct ath79_spi_platform_data *pdata;
|
||||
struct resource *r;
|
||||
+ unsigned long rate;
|
||||
int ret;
|
||||
|
||||
master = spi_alloc_master(&pdev->dev, sizeof(*sp));
|
||||
@@ -239,12 +255,36 @@ static __devinit int ath79_spi_probe(str
|
||||
goto err_put_master;
|
||||
}
|
||||
|
||||
+ sp->clk = clk_get(&pdev->dev, "ahb");
|
||||
+ if (IS_ERR(sp->clk)) {
|
||||
+ ret = PTR_ERR(sp->clk);
|
||||
+ goto err_unmap;
|
||||
+ }
|
||||
+
|
||||
+ ret = clk_enable(sp->clk);
|
||||
+ if (ret)
|
||||
+ goto err_clk_put;
|
||||
+
|
||||
+ rate = DIV_ROUND_UP(clk_get_rate(sp->clk), MHZ);
|
||||
+ if (!rate) {
|
||||
+ ret = -EINVAL;
|
||||
+ goto err_clk_disable;
|
||||
+ }
|
||||
+
|
||||
+ sp->rrw_delay = ATH79_SPI_RRW_DELAY_FACTOR / rate;
|
||||
+ dev_dbg(&pdev->dev, "register read/write delay is %u nsecs\n",
|
||||
+ sp->rrw_delay);
|
||||
+
|
||||
ret = spi_bitbang_start(&sp->bitbang);
|
||||
if (ret)
|
||||
- goto err_unmap;
|
||||
+ goto err_clk_disable;
|
||||
|
||||
return 0;
|
||||
|
||||
+err_clk_disable:
|
||||
+ clk_disable(sp->clk);
|
||||
+err_clk_put:
|
||||
+ clk_put(sp->clk);
|
||||
err_unmap:
|
||||
iounmap(sp->base);
|
||||
err_put_master:
|
||||
@@ -259,6 +299,8 @@ static __devexit int ath79_spi_remove(st
|
||||
struct ath79_spi *sp = platform_get_drvdata(pdev);
|
||||
|
||||
spi_bitbang_stop(&sp->bitbang);
|
||||
+ clk_disable(sp->clk);
|
||||
+ clk_put(sp->clk);
|
||||
iounmap(sp->base);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
spi_master_put(sp->bitbang.master);
|
||||
|
|
|
|||
|
|
@ -1,20 +1,21 @@
|
|||
From 0ad8cbbb978bc01de08eadd3357ea188302b83ce Mon Sep 17 00:00:00 2001
|
||||
From ea7e40aedae58b7a0f0ccd8658063de499734874 Mon Sep 17 00:00:00 2001
|
||||
From: Gabor Juhos <juhosg@openwrt.org>
|
||||
Date: Wed, 11 Jan 2012 20:33:41 +0100
|
||||
Subject: [PATCH 2/7] spi/ath79: add missing HIGH->LOW SCK transition
|
||||
|
||||
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
---
|
||||
drivers/spi/spi-ath79.c | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
drivers/spi/spi-ath79.c | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
--- a/drivers/spi/spi-ath79.c
|
||||
+++ b/drivers/spi/spi-ath79.c
|
||||
@@ -193,6 +193,7 @@ static u32 ath79_spi_txrx_mode0(struct s
|
||||
ath79_spi_delay(nsecs);
|
||||
@@ -200,6 +200,8 @@ static u32 ath79_spi_txrx_mode0(struct s
|
||||
ath79_spi_delay(sp, nsecs);
|
||||
ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, out | AR71XX_SPI_IOC_CLK);
|
||||
ath79_spi_delay(nsecs);
|
||||
+ ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, out);
|
||||
ath79_spi_delay(sp, nsecs);
|
||||
+ if (bits == 1)
|
||||
+ ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, out);
|
||||
|
||||
word <<= 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 7385ff2cb72d6a0107890760466b9564aa5204c1 Mon Sep 17 00:00:00 2001
|
||||
From ecf57a64feb737dec1da72aab21dccd30a88ba19 Mon Sep 17 00:00:00 2001
|
||||
From: Gabor Juhos <juhosg@openwrt.org>
|
||||
Date: Mon, 9 Jan 2012 15:03:28 +0100
|
||||
Subject: [PATCH 3/7] spi/ath79: remove superfluous chip select code
|
||||
|
|
@ -15,7 +15,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
|
||||
--- a/drivers/spi/spi-ath79.c
|
||||
+++ b/drivers/spi/spi-ath79.c
|
||||
@@ -121,12 +121,6 @@ static int ath79_spi_setup_cs(struct spi
|
||||
@@ -128,12 +128,6 @@ static int ath79_spi_setup_cs(struct spi
|
||||
gpio_free(cdata->gpio);
|
||||
return status;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From c5bfb0c760a5d8de7ffc3a6acfb8c782be6af1a5 Mon Sep 17 00:00:00 2001
|
||||
From dd5b424b0b3f0370f9b63594ad53c16989b6ad78 Mon Sep 17 00:00:00 2001
|
||||
From: Gabor Juhos <juhosg@openwrt.org>
|
||||
Date: Mon, 9 Jan 2012 15:04:21 +0100
|
||||
Subject: [PATCH 4/7] spi/ath79: use gpio_request_one
|
||||
|
|
@ -12,7 +12,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
|
||||
--- a/drivers/spi/spi-ath79.c
|
||||
+++ b/drivers/spi/spi-ath79.c
|
||||
@@ -93,6 +93,7 @@ static int ath79_spi_setup_cs(struct spi
|
||||
@@ -100,6 +100,7 @@ static int ath79_spi_setup_cs(struct spi
|
||||
{
|
||||
struct ath79_spi *sp = ath79_spidev_to_sp(spi);
|
||||
struct ath79_spi_controller_data *cdata;
|
||||
|
|
@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
|
||||
cdata = spi->controller_data;
|
||||
if (spi->chip_select && !cdata)
|
||||
@@ -108,22 +109,21 @@ static int ath79_spi_setup_cs(struct spi
|
||||
@@ -115,22 +116,21 @@ static int ath79_spi_setup_cs(struct spi
|
||||
/* TODO: setup speed? */
|
||||
ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, 0x43);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,26 @@
|
|||
From 4518ae06e5fc953abfd9c2b66c6155fc2b2696ce Mon Sep 17 00:00:00 2001
|
||||
From 25e681989198e94656eab9df22b8b761abd2ae26 Mon Sep 17 00:00:00 2001
|
||||
From: Gabor Juhos <juhosg@openwrt.org>
|
||||
Date: Mon, 9 Jan 2012 15:00:46 +0100
|
||||
Subject: [PATCH 5/7] spi/ath79: introduce ath79_spi_{en,dis}able helpers
|
||||
Subject: [PATCH 5/7] spi/ath79: avoid multiple initialization of the SPI controller
|
||||
|
||||
Currently we are initializing the SPI controller in
|
||||
the chip select line function, and that function is
|
||||
called once for each SPI device on the bus. If a
|
||||
board has multiple SPI devices, the controller will
|
||||
be initialized multiple times.
|
||||
|
||||
Introduce ath79_spi_{en,dis}able helper functions,
|
||||
and call those from probe/response in order to avoid
|
||||
the mutliple initialization of the controller.
|
||||
|
||||
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
---
|
||||
drivers/spi/spi-ath79.c | 41 +++++++++++++++++++++++++----------------
|
||||
1 files changed, 25 insertions(+), 16 deletions(-)
|
||||
drivers/spi/spi-ath79.c | 41 ++++++++++++++++++++++++-----------------
|
||||
1 files changed, 24 insertions(+), 17 deletions(-)
|
||||
|
||||
--- a/drivers/spi/spi-ath79.c
|
||||
+++ b/drivers/spi/spi-ath79.c
|
||||
@@ -89,16 +89,8 @@ static void ath79_spi_chipselect(struct
|
||||
@@ -96,16 +96,8 @@ static void ath79_spi_chipselect(struct
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -27,7 +38,7 @@ Subject: [PATCH 5/7] spi/ath79: introduce ath79_spi_{en,dis}able helpers
|
|||
/* enable GPIO mode */
|
||||
ath79_spi_wr(sp, AR71XX_SPI_REG_FS, AR71XX_SPI_FS_GPIO);
|
||||
|
||||
@@ -108,6 +100,24 @@ static int ath79_spi_setup_cs(struct spi
|
||||
@@ -115,6 +107,24 @@ static int ath79_spi_setup_cs(struct spi
|
||||
|
||||
/* TODO: setup speed? */
|
||||
ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, 0x43);
|
||||
|
|
@ -52,7 +63,7 @@ Subject: [PATCH 5/7] spi/ath79: introduce ath79_spi_{en,dis}able helpers
|
|||
|
||||
status = 0;
|
||||
if (spi->chip_select) {
|
||||
@@ -128,17 +138,10 @@ static int ath79_spi_setup_cs(struct spi
|
||||
@@ -135,17 +145,10 @@ static int ath79_spi_setup_cs(struct spi
|
||||
|
||||
static void ath79_spi_cleanup_cs(struct spi_device *spi)
|
||||
{
|
||||
|
|
@ -70,29 +81,28 @@ Subject: [PATCH 5/7] spi/ath79: introduce ath79_spi_{en,dis}able helpers
|
|||
}
|
||||
|
||||
static int ath79_spi_setup(struct spi_device *spi)
|
||||
@@ -242,13 +245,15 @@ static __devinit int ath79_spi_probe(str
|
||||
goto err_put_master;
|
||||
}
|
||||
@@ -271,12 +274,15 @@ static __devinit int ath79_spi_probe(str
|
||||
dev_dbg(&pdev->dev, "register read/write delay is %u nsecs\n",
|
||||
sp->rrw_delay);
|
||||
|
||||
+ ath79_spi_enable(sp);
|
||||
ret = spi_bitbang_start(&sp->bitbang);
|
||||
if (ret)
|
||||
- goto err_unmap;
|
||||
- goto err_clk_disable;
|
||||
+ goto err_disable;
|
||||
|
||||
return 0;
|
||||
|
||||
-err_unmap:
|
||||
+err_disable:
|
||||
+ ath79_spi_disable(sp);
|
||||
iounmap(sp->base);
|
||||
err_put_master:
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
@@ -262,6 +267,7 @@ static __devexit int ath79_spi_remove(st
|
||||
err_clk_disable:
|
||||
clk_disable(sp->clk);
|
||||
err_clk_put:
|
||||
@@ -295,6 +301,7 @@ static __devexit int ath79_spi_remove(st
|
||||
struct ath79_spi *sp = platform_get_drvdata(pdev);
|
||||
|
||||
spi_bitbang_stop(&sp->bitbang);
|
||||
+ ath79_spi_disable(sp);
|
||||
clk_disable(sp->clk);
|
||||
clk_put(sp->clk);
|
||||
iounmap(sp->base);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
spi_master_put(sp->bitbang.master);
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 1025bfbe327b3f9f7227e781c71751d5251803cb Mon Sep 17 00:00:00 2001
|
||||
From e01dcc2835017b55e936bd150ddab29bfcf2c63c Mon Sep 17 00:00:00 2001
|
||||
From: Gabor Juhos <juhosg@openwrt.org>
|
||||
Date: Wed, 11 Jan 2012 22:19:32 +0100
|
||||
Subject: [PATCH 6/7] spi/ath79: add shutdown handler
|
||||
|
|
@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
|
||||
--- a/drivers/spi/spi-ath79.c
|
||||
+++ b/drivers/spi/spi-ath79.c
|
||||
@@ -262,7 +262,7 @@ err_put_master:
|
||||
@@ -296,7 +296,7 @@ err_put_master:
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
{
|
||||
struct ath79_spi *sp = platform_get_drvdata(pdev);
|
||||
|
||||
@@ -271,13 +271,23 @@ static __devexit int ath79_spi_remove(st
|
||||
@@ -307,13 +307,23 @@ static __devexit int ath79_spi_remove(st
|
||||
iounmap(sp->base);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
spi_master_put(sp->bitbang.master);
|
||||
|
|
|
|||
|
|
@ -1,14 +1,102 @@
|
|||
From b875f877d06acb852342636db4c3d1e6c9fe01ba Mon Sep 17 00:00:00 2001
|
||||
From bdbd9b2861ba73557795915598bb276a8568d130 Mon Sep 17 00:00:00 2001
|
||||
From: Gabor Juhos <juhosg@openwrt.org>
|
||||
Date: Wed, 11 Jan 2012 22:25:11 +0100
|
||||
Subject: [PATCH 7/7] spi/ath79: make chipselect logic more flexible
|
||||
|
||||
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
---
|
||||
arch/mips/ath79/mach-ap121.c | 6 ++
|
||||
arch/mips/ath79/mach-ap81.c | 6 ++
|
||||
arch/mips/ath79/mach-pb44.c | 6 ++
|
||||
arch/mips/ath79/mach-ubnt-xm.c | 6 ++
|
||||
.../include/asm/mach-ath79/ath79_spi_platform.h | 8 ++-
|
||||
drivers/spi/spi-ath79.c | 65 +++++++++++--------
|
||||
2 files changed, 45 insertions(+), 28 deletions(-)
|
||||
drivers/spi/spi-ath79.c | 63 ++++++++++++--------
|
||||
6 files changed, 69 insertions(+), 26 deletions(-)
|
||||
|
||||
--- a/arch/mips/ath79/mach-ap121.c
|
||||
+++ b/arch/mips/ath79/mach-ap121.c
|
||||
@@ -58,12 +58,18 @@ static struct gpio_keys_button ap121_gpi
|
||||
}
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data ap121_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info ap121_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "mx25l1606e",
|
||||
+ .controller_data = &ap121_spi0_data,
|
||||
}
|
||||
};
|
||||
|
||||
--- a/arch/mips/ath79/mach-ap81.c
|
||||
+++ b/arch/mips/ath79/mach-ap81.c
|
||||
@@ -67,12 +67,18 @@ static struct gpio_keys_button ap81_gpio
|
||||
}
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data ap81_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info ap81_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "m25p64",
|
||||
+ .controller_data = &ap81_spi0_data,
|
||||
}
|
||||
};
|
||||
|
||||
--- a/arch/mips/ath79/mach-pb44.c
|
||||
+++ b/arch/mips/ath79/mach-pb44.c
|
||||
@@ -87,12 +87,18 @@ static struct gpio_keys_button pb44_gpio
|
||||
}
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data pb44_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info pb44_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "m25p64",
|
||||
+ .controller_data = &pb44_spi0_data,
|
||||
},
|
||||
};
|
||||
|
||||
--- a/arch/mips/ath79/mach-ubnt-xm.c
|
||||
+++ b/arch/mips/ath79/mach-ubnt-xm.c
|
||||
@@ -65,12 +65,18 @@ static struct gpio_keys_button ubnt_xm_g
|
||||
}
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data ubnt_xm_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info ubnt_xm_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "mx25l6405d",
|
||||
+ .controller_data = &ubnt_xm_spi0_data,
|
||||
}
|
||||
};
|
||||
|
||||
--- a/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
|
||||
+++ b/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
|
||||
@@ -16,8 +16,14 @@ struct ath79_spi_platform_data {
|
||||
|
|
@ -29,16 +117,16 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
#endif /* _ATH79_SPI_PLATFORM_H */
|
||||
--- a/drivers/spi/spi-ath79.c
|
||||
+++ b/drivers/spi/spi-ath79.c
|
||||
@@ -30,6 +30,8 @@
|
||||
@@ -35,6 +35,8 @@
|
||||
#define ATH79_SPI_RRW_DELAY_FACTOR 12000
|
||||
#define MHZ (1000 * 1000)
|
||||
|
||||
#define DRV_NAME "ath79-spi"
|
||||
|
||||
+#define ATH79_SPI_CS_LINE_MAX 2
|
||||
+#define ATH79_SPI_CS_LINE_MAX 2
|
||||
+
|
||||
struct ath79_spi {
|
||||
struct spi_bitbang bitbang;
|
||||
u32 ioc_base;
|
||||
@@ -62,6 +64,7 @@ static void ath79_spi_chipselect(struct
|
||||
@@ -69,6 +71,7 @@ static void ath79_spi_chipselect(struct
|
||||
{
|
||||
struct ath79_spi *sp = ath79_spidev_to_sp(spi);
|
||||
int cs_high = (spi->mode & SPI_CS_HIGH) ? is_active : !is_active;
|
||||
|
|
@ -46,7 +134,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
|
||||
if (is_active) {
|
||||
/* set initial clock polarity */
|
||||
@@ -73,20 +76,21 @@ static void ath79_spi_chipselect(struct
|
||||
@@ -80,20 +83,21 @@ static void ath79_spi_chipselect(struct
|
||||
ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);
|
||||
}
|
||||
|
||||
|
|
@ -77,7 +165,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
}
|
||||
|
||||
static void ath79_spi_enable(struct ath79_spi *sp)
|
||||
@@ -113,24 +117,30 @@ static void ath79_spi_disable(struct ath
|
||||
@@ -120,24 +124,30 @@ static void ath79_spi_disable(struct ath
|
||||
static int ath79_spi_setup_cs(struct spi_device *spi)
|
||||
{
|
||||
struct ath79_spi_controller_data *cdata;
|
||||
|
|
@ -112,7 +200,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
}
|
||||
|
||||
return status;
|
||||
@@ -138,9 +148,15 @@ static int ath79_spi_setup_cs(struct spi
|
||||
@@ -145,9 +155,15 @@ static int ath79_spi_setup_cs(struct spi
|
||||
|
||||
static void ath79_spi_cleanup_cs(struct spi_device *spi)
|
||||
{
|
||||
|
|
@ -131,8 +219,8 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
}
|
||||
}
|
||||
|
||||
@@ -206,6 +222,10 @@ static __devinit int ath79_spi_probe(str
|
||||
struct resource *r;
|
||||
@@ -215,6 +231,10 @@ static __devinit int ath79_spi_probe(str
|
||||
unsigned long rate;
|
||||
int ret;
|
||||
|
||||
+ pdata = pdev->dev.platform_data;
|
||||
|
|
@ -142,7 +230,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
master = spi_alloc_master(&pdev->dev, sizeof(*sp));
|
||||
if (master == NULL) {
|
||||
dev_err(&pdev->dev, "failed to allocate spi master\n");
|
||||
@@ -215,17 +235,10 @@ static __devinit int ath79_spi_probe(str
|
||||
@@ -224,17 +244,10 @@ static __devinit int ath79_spi_probe(str
|
||||
sp = spi_master_get_devdata(master);
|
||||
platform_set_drvdata(pdev, sp);
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
--- a/arch/mips/ath79/mach-db120.c
|
||||
+++ b/arch/mips/ath79/mach-db120.c
|
||||
@@ -95,12 +95,18 @@ static struct gpio_keys_button db120_gpi
|
||||
},
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data db120_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info db120_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "s25sl064a",
|
||||
+ .controller_data = &db120_spi0_data,
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -1,105 +0,0 @@
|
|||
--- a/arch/mips/ath79/mach-ap121.c
|
||||
+++ b/arch/mips/ath79/mach-ap121.c
|
||||
@@ -58,12 +58,18 @@ static struct gpio_keys_button ap121_gpi
|
||||
}
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data ap121_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info ap121_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "mx25l1606e",
|
||||
+ .controller_data = &ap121_spi0_data,
|
||||
}
|
||||
};
|
||||
|
||||
--- a/arch/mips/ath79/mach-ap81.c
|
||||
+++ b/arch/mips/ath79/mach-ap81.c
|
||||
@@ -67,12 +67,18 @@ static struct gpio_keys_button ap81_gpio
|
||||
}
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data ap81_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info ap81_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "m25p64",
|
||||
+ .controller_data = &ap81_spi0_data,
|
||||
}
|
||||
};
|
||||
|
||||
--- a/arch/mips/ath79/mach-db120.c
|
||||
+++ b/arch/mips/ath79/mach-db120.c
|
||||
@@ -95,12 +95,18 @@ static struct gpio_keys_button db120_gpi
|
||||
},
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data db120_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info db120_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "s25sl064a",
|
||||
+ .controller_data = &db120_spi0_data,
|
||||
}
|
||||
};
|
||||
|
||||
--- a/arch/mips/ath79/mach-pb44.c
|
||||
+++ b/arch/mips/ath79/mach-pb44.c
|
||||
@@ -87,12 +87,18 @@ static struct gpio_keys_button pb44_gpio
|
||||
}
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data pb44_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info pb44_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "m25p64",
|
||||
+ .controller_data = &pb44_spi0_data,
|
||||
},
|
||||
};
|
||||
|
||||
--- a/arch/mips/ath79/mach-ubnt-xm.c
|
||||
+++ b/arch/mips/ath79/mach-ubnt-xm.c
|
||||
@@ -65,12 +65,18 @@ static struct gpio_keys_button ubnt_xm_g
|
||||
}
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data ubnt_xm_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info ubnt_xm_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "mx25l6405d",
|
||||
+ .controller_data = &ubnt_xm_spi0_data,
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 48b7e765e6e097d20d809fadd17a4355d26ad6d5 Mon Sep 17 00:00:00 2001
|
||||
From 8e948c035dd7983eccc3a889f2497e64044f3a31 Mon Sep 17 00:00:00 2001
|
||||
From: Gabor Juhos <juhosg@openwrt.org>
|
||||
Date: Wed, 11 Jan 2012 20:06:35 +0100
|
||||
Subject: [PATCH 1/7] spi/ath79: add delay between SCK changes
|
||||
|
|
@ -12,31 +12,111 @@ well.
|
|||
|
||||
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
---
|
||||
drivers/spi/spi-ath79.c | 8 ++++++++
|
||||
1 files changed, 8 insertions(+), 0 deletions(-)
|
||||
drivers/spi/spi-ath79.c | 44 +++++++++++++++++++++++++++++++++++++++++++-
|
||||
1 files changed, 43 insertions(+), 1 deletions(-)
|
||||
|
||||
--- a/drivers/spi/spi-ath79.c
|
||||
+++ b/drivers/spi/spi-ath79.c
|
||||
@@ -52,6 +52,12 @@ static inline struct ath79_spi *ath79_sp
|
||||
@@ -24,17 +24,24 @@
|
||||
#include <linux/spi/spi_bitbang.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/gpio.h>
|
||||
+#include <linux/clk.h>
|
||||
+#include <linux/err.h>
|
||||
|
||||
#include <asm/mach-ath79/ar71xx_regs.h>
|
||||
#include <asm/mach-ath79/ath79_spi_platform.h>
|
||||
|
||||
#define DRV_NAME "ath79-spi"
|
||||
|
||||
+#define ATH79_SPI_RRW_DELAY_FACTOR 12000
|
||||
+#define MHZ (1000 * 1000)
|
||||
+
|
||||
struct ath79_spi {
|
||||
struct spi_bitbang bitbang;
|
||||
u32 ioc_base;
|
||||
u32 reg_ctrl;
|
||||
void __iomem *base;
|
||||
+ struct clk *clk;
|
||||
+ unsigned rrw_delay;
|
||||
};
|
||||
|
||||
static inline u32 ath79_spi_rr(struct ath79_spi *sp, unsigned reg)
|
||||
@@ -52,6 +59,12 @@ static inline struct ath79_spi *ath79_sp
|
||||
return spi_master_get_devdata(spi->master);
|
||||
}
|
||||
|
||||
+static inline void ath79_spi_delay(unsigned nsecs)
|
||||
+static inline void ath79_spi_delay(struct ath79_spi *sp, unsigned nsecs)
|
||||
+{
|
||||
+ if (nsecs)
|
||||
+ ndelay(nsecs);
|
||||
+ if (nsecs > sp->rrw_delay)
|
||||
+ ndelay(nsecs - sp->rrw_delay);
|
||||
+}
|
||||
+
|
||||
static void ath79_spi_chipselect(struct spi_device *spi, int is_active)
|
||||
{
|
||||
struct ath79_spi *sp = ath79_spidev_to_sp(spi);
|
||||
@@ -184,7 +190,9 @@ static u32 ath79_spi_txrx_mode0(struct s
|
||||
@@ -184,7 +197,9 @@ static u32 ath79_spi_txrx_mode0(struct s
|
||||
|
||||
/* setup MSB (to slave) on trailing edge */
|
||||
ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, out);
|
||||
+ ath79_spi_delay(nsecs);
|
||||
+ ath79_spi_delay(sp, nsecs);
|
||||
ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, out | AR71XX_SPI_IOC_CLK);
|
||||
+ ath79_spi_delay(nsecs);
|
||||
+ ath79_spi_delay(sp, nsecs);
|
||||
|
||||
word <<= 1;
|
||||
}
|
||||
@@ -198,6 +213,7 @@ static __devinit int ath79_spi_probe(str
|
||||
struct ath79_spi *sp;
|
||||
struct ath79_spi_platform_data *pdata;
|
||||
struct resource *r;
|
||||
+ unsigned long rate;
|
||||
int ret;
|
||||
|
||||
master = spi_alloc_master(&pdev->dev, sizeof(*sp));
|
||||
@@ -239,12 +255,36 @@ static __devinit int ath79_spi_probe(str
|
||||
goto err_put_master;
|
||||
}
|
||||
|
||||
+ sp->clk = clk_get(&pdev->dev, "ahb");
|
||||
+ if (IS_ERR(sp->clk)) {
|
||||
+ ret = PTR_ERR(sp->clk);
|
||||
+ goto err_unmap;
|
||||
+ }
|
||||
+
|
||||
+ ret = clk_enable(sp->clk);
|
||||
+ if (ret)
|
||||
+ goto err_clk_put;
|
||||
+
|
||||
+ rate = DIV_ROUND_UP(clk_get_rate(sp->clk), MHZ);
|
||||
+ if (!rate) {
|
||||
+ ret = -EINVAL;
|
||||
+ goto err_clk_disable;
|
||||
+ }
|
||||
+
|
||||
+ sp->rrw_delay = ATH79_SPI_RRW_DELAY_FACTOR / rate;
|
||||
+ dev_dbg(&pdev->dev, "register read/write delay is %u nsecs\n",
|
||||
+ sp->rrw_delay);
|
||||
+
|
||||
ret = spi_bitbang_start(&sp->bitbang);
|
||||
if (ret)
|
||||
- goto err_unmap;
|
||||
+ goto err_clk_disable;
|
||||
|
||||
return 0;
|
||||
|
||||
+err_clk_disable:
|
||||
+ clk_disable(sp->clk);
|
||||
+err_clk_put:
|
||||
+ clk_put(sp->clk);
|
||||
err_unmap:
|
||||
iounmap(sp->base);
|
||||
err_put_master:
|
||||
@@ -259,6 +299,8 @@ static __devexit int ath79_spi_remove(st
|
||||
struct ath79_spi *sp = platform_get_drvdata(pdev);
|
||||
|
||||
spi_bitbang_stop(&sp->bitbang);
|
||||
+ clk_disable(sp->clk);
|
||||
+ clk_put(sp->clk);
|
||||
iounmap(sp->base);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
spi_master_put(sp->bitbang.master);
|
||||
|
|
|
|||
|
|
@ -1,20 +1,21 @@
|
|||
From 0ad8cbbb978bc01de08eadd3357ea188302b83ce Mon Sep 17 00:00:00 2001
|
||||
From ea7e40aedae58b7a0f0ccd8658063de499734874 Mon Sep 17 00:00:00 2001
|
||||
From: Gabor Juhos <juhosg@openwrt.org>
|
||||
Date: Wed, 11 Jan 2012 20:33:41 +0100
|
||||
Subject: [PATCH 2/7] spi/ath79: add missing HIGH->LOW SCK transition
|
||||
|
||||
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
---
|
||||
drivers/spi/spi-ath79.c | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
drivers/spi/spi-ath79.c | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
--- a/drivers/spi/spi-ath79.c
|
||||
+++ b/drivers/spi/spi-ath79.c
|
||||
@@ -193,6 +193,7 @@ static u32 ath79_spi_txrx_mode0(struct s
|
||||
ath79_spi_delay(nsecs);
|
||||
@@ -200,6 +200,8 @@ static u32 ath79_spi_txrx_mode0(struct s
|
||||
ath79_spi_delay(sp, nsecs);
|
||||
ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, out | AR71XX_SPI_IOC_CLK);
|
||||
ath79_spi_delay(nsecs);
|
||||
+ ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, out);
|
||||
ath79_spi_delay(sp, nsecs);
|
||||
+ if (bits == 1)
|
||||
+ ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, out);
|
||||
|
||||
word <<= 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 7385ff2cb72d6a0107890760466b9564aa5204c1 Mon Sep 17 00:00:00 2001
|
||||
From ecf57a64feb737dec1da72aab21dccd30a88ba19 Mon Sep 17 00:00:00 2001
|
||||
From: Gabor Juhos <juhosg@openwrt.org>
|
||||
Date: Mon, 9 Jan 2012 15:03:28 +0100
|
||||
Subject: [PATCH 3/7] spi/ath79: remove superfluous chip select code
|
||||
|
|
@ -15,7 +15,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
|
||||
--- a/drivers/spi/spi-ath79.c
|
||||
+++ b/drivers/spi/spi-ath79.c
|
||||
@@ -121,12 +121,6 @@ static int ath79_spi_setup_cs(struct spi
|
||||
@@ -128,12 +128,6 @@ static int ath79_spi_setup_cs(struct spi
|
||||
gpio_free(cdata->gpio);
|
||||
return status;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From c5bfb0c760a5d8de7ffc3a6acfb8c782be6af1a5 Mon Sep 17 00:00:00 2001
|
||||
From dd5b424b0b3f0370f9b63594ad53c16989b6ad78 Mon Sep 17 00:00:00 2001
|
||||
From: Gabor Juhos <juhosg@openwrt.org>
|
||||
Date: Mon, 9 Jan 2012 15:04:21 +0100
|
||||
Subject: [PATCH 4/7] spi/ath79: use gpio_request_one
|
||||
|
|
@ -12,7 +12,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
|
||||
--- a/drivers/spi/spi-ath79.c
|
||||
+++ b/drivers/spi/spi-ath79.c
|
||||
@@ -93,6 +93,7 @@ static int ath79_spi_setup_cs(struct spi
|
||||
@@ -100,6 +100,7 @@ static int ath79_spi_setup_cs(struct spi
|
||||
{
|
||||
struct ath79_spi *sp = ath79_spidev_to_sp(spi);
|
||||
struct ath79_spi_controller_data *cdata;
|
||||
|
|
@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
|
||||
cdata = spi->controller_data;
|
||||
if (spi->chip_select && !cdata)
|
||||
@@ -108,22 +109,21 @@ static int ath79_spi_setup_cs(struct spi
|
||||
@@ -115,22 +116,21 @@ static int ath79_spi_setup_cs(struct spi
|
||||
/* TODO: setup speed? */
|
||||
ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, 0x43);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,26 @@
|
|||
From 4518ae06e5fc953abfd9c2b66c6155fc2b2696ce Mon Sep 17 00:00:00 2001
|
||||
From 25e681989198e94656eab9df22b8b761abd2ae26 Mon Sep 17 00:00:00 2001
|
||||
From: Gabor Juhos <juhosg@openwrt.org>
|
||||
Date: Mon, 9 Jan 2012 15:00:46 +0100
|
||||
Subject: [PATCH 5/7] spi/ath79: introduce ath79_spi_{en,dis}able helpers
|
||||
Subject: [PATCH 5/7] spi/ath79: avoid multiple initialization of the SPI controller
|
||||
|
||||
Currently we are initializing the SPI controller in
|
||||
the chip select line function, and that function is
|
||||
called once for each SPI device on the bus. If a
|
||||
board has multiple SPI devices, the controller will
|
||||
be initialized multiple times.
|
||||
|
||||
Introduce ath79_spi_{en,dis}able helper functions,
|
||||
and call those from probe/response in order to avoid
|
||||
the mutliple initialization of the controller.
|
||||
|
||||
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
---
|
||||
drivers/spi/spi-ath79.c | 41 +++++++++++++++++++++++++----------------
|
||||
1 files changed, 25 insertions(+), 16 deletions(-)
|
||||
drivers/spi/spi-ath79.c | 41 ++++++++++++++++++++++++-----------------
|
||||
1 files changed, 24 insertions(+), 17 deletions(-)
|
||||
|
||||
--- a/drivers/spi/spi-ath79.c
|
||||
+++ b/drivers/spi/spi-ath79.c
|
||||
@@ -89,16 +89,8 @@ static void ath79_spi_chipselect(struct
|
||||
@@ -96,16 +96,8 @@ static void ath79_spi_chipselect(struct
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -27,7 +38,7 @@ Subject: [PATCH 5/7] spi/ath79: introduce ath79_spi_{en,dis}able helpers
|
|||
/* enable GPIO mode */
|
||||
ath79_spi_wr(sp, AR71XX_SPI_REG_FS, AR71XX_SPI_FS_GPIO);
|
||||
|
||||
@@ -108,6 +100,24 @@ static int ath79_spi_setup_cs(struct spi
|
||||
@@ -115,6 +107,24 @@ static int ath79_spi_setup_cs(struct spi
|
||||
|
||||
/* TODO: setup speed? */
|
||||
ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, 0x43);
|
||||
|
|
@ -52,7 +63,7 @@ Subject: [PATCH 5/7] spi/ath79: introduce ath79_spi_{en,dis}able helpers
|
|||
|
||||
status = 0;
|
||||
if (spi->chip_select) {
|
||||
@@ -128,17 +138,10 @@ static int ath79_spi_setup_cs(struct spi
|
||||
@@ -135,17 +145,10 @@ static int ath79_spi_setup_cs(struct spi
|
||||
|
||||
static void ath79_spi_cleanup_cs(struct spi_device *spi)
|
||||
{
|
||||
|
|
@ -70,29 +81,28 @@ Subject: [PATCH 5/7] spi/ath79: introduce ath79_spi_{en,dis}able helpers
|
|||
}
|
||||
|
||||
static int ath79_spi_setup(struct spi_device *spi)
|
||||
@@ -242,13 +245,15 @@ static __devinit int ath79_spi_probe(str
|
||||
goto err_put_master;
|
||||
}
|
||||
@@ -271,12 +274,15 @@ static __devinit int ath79_spi_probe(str
|
||||
dev_dbg(&pdev->dev, "register read/write delay is %u nsecs\n",
|
||||
sp->rrw_delay);
|
||||
|
||||
+ ath79_spi_enable(sp);
|
||||
ret = spi_bitbang_start(&sp->bitbang);
|
||||
if (ret)
|
||||
- goto err_unmap;
|
||||
- goto err_clk_disable;
|
||||
+ goto err_disable;
|
||||
|
||||
return 0;
|
||||
|
||||
-err_unmap:
|
||||
+err_disable:
|
||||
+ ath79_spi_disable(sp);
|
||||
iounmap(sp->base);
|
||||
err_put_master:
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
@@ -262,6 +267,7 @@ static __devexit int ath79_spi_remove(st
|
||||
err_clk_disable:
|
||||
clk_disable(sp->clk);
|
||||
err_clk_put:
|
||||
@@ -295,6 +301,7 @@ static __devexit int ath79_spi_remove(st
|
||||
struct ath79_spi *sp = platform_get_drvdata(pdev);
|
||||
|
||||
spi_bitbang_stop(&sp->bitbang);
|
||||
+ ath79_spi_disable(sp);
|
||||
clk_disable(sp->clk);
|
||||
clk_put(sp->clk);
|
||||
iounmap(sp->base);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
spi_master_put(sp->bitbang.master);
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 1025bfbe327b3f9f7227e781c71751d5251803cb Mon Sep 17 00:00:00 2001
|
||||
From e01dcc2835017b55e936bd150ddab29bfcf2c63c Mon Sep 17 00:00:00 2001
|
||||
From: Gabor Juhos <juhosg@openwrt.org>
|
||||
Date: Wed, 11 Jan 2012 22:19:32 +0100
|
||||
Subject: [PATCH 6/7] spi/ath79: add shutdown handler
|
||||
|
|
@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
|
||||
--- a/drivers/spi/spi-ath79.c
|
||||
+++ b/drivers/spi/spi-ath79.c
|
||||
@@ -262,7 +262,7 @@ err_put_master:
|
||||
@@ -296,7 +296,7 @@ err_put_master:
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
{
|
||||
struct ath79_spi *sp = platform_get_drvdata(pdev);
|
||||
|
||||
@@ -271,13 +271,23 @@ static __devexit int ath79_spi_remove(st
|
||||
@@ -307,13 +307,23 @@ static __devexit int ath79_spi_remove(st
|
||||
iounmap(sp->base);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
spi_master_put(sp->bitbang.master);
|
||||
|
|
|
|||
|
|
@ -1,14 +1,102 @@
|
|||
From b875f877d06acb852342636db4c3d1e6c9fe01ba Mon Sep 17 00:00:00 2001
|
||||
From bdbd9b2861ba73557795915598bb276a8568d130 Mon Sep 17 00:00:00 2001
|
||||
From: Gabor Juhos <juhosg@openwrt.org>
|
||||
Date: Wed, 11 Jan 2012 22:25:11 +0100
|
||||
Subject: [PATCH 7/7] spi/ath79: make chipselect logic more flexible
|
||||
|
||||
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
---
|
||||
arch/mips/ath79/mach-ap121.c | 6 ++
|
||||
arch/mips/ath79/mach-ap81.c | 6 ++
|
||||
arch/mips/ath79/mach-pb44.c | 6 ++
|
||||
arch/mips/ath79/mach-ubnt-xm.c | 6 ++
|
||||
.../include/asm/mach-ath79/ath79_spi_platform.h | 8 ++-
|
||||
drivers/spi/spi-ath79.c | 65 +++++++++++--------
|
||||
2 files changed, 45 insertions(+), 28 deletions(-)
|
||||
drivers/spi/spi-ath79.c | 63 ++++++++++++--------
|
||||
6 files changed, 69 insertions(+), 26 deletions(-)
|
||||
|
||||
--- a/arch/mips/ath79/mach-ap121.c
|
||||
+++ b/arch/mips/ath79/mach-ap121.c
|
||||
@@ -58,12 +58,18 @@ static struct gpio_keys_button ap121_gpi
|
||||
}
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data ap121_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info ap121_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "mx25l1606e",
|
||||
+ .controller_data = &ap121_spi0_data,
|
||||
}
|
||||
};
|
||||
|
||||
--- a/arch/mips/ath79/mach-ap81.c
|
||||
+++ b/arch/mips/ath79/mach-ap81.c
|
||||
@@ -67,12 +67,18 @@ static struct gpio_keys_button ap81_gpio
|
||||
}
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data ap81_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info ap81_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "m25p64",
|
||||
+ .controller_data = &ap81_spi0_data,
|
||||
}
|
||||
};
|
||||
|
||||
--- a/arch/mips/ath79/mach-pb44.c
|
||||
+++ b/arch/mips/ath79/mach-pb44.c
|
||||
@@ -87,12 +87,18 @@ static struct gpio_keys_button pb44_gpio
|
||||
}
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data pb44_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info pb44_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "m25p64",
|
||||
+ .controller_data = &pb44_spi0_data,
|
||||
},
|
||||
};
|
||||
|
||||
--- a/arch/mips/ath79/mach-ubnt-xm.c
|
||||
+++ b/arch/mips/ath79/mach-ubnt-xm.c
|
||||
@@ -65,12 +65,18 @@ static struct gpio_keys_button ubnt_xm_g
|
||||
}
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data ubnt_xm_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info ubnt_xm_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "mx25l6405d",
|
||||
+ .controller_data = &ubnt_xm_spi0_data,
|
||||
}
|
||||
};
|
||||
|
||||
--- a/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
|
||||
+++ b/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
|
||||
@@ -16,8 +16,14 @@ struct ath79_spi_platform_data {
|
||||
|
|
@ -29,16 +117,16 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
#endif /* _ATH79_SPI_PLATFORM_H */
|
||||
--- a/drivers/spi/spi-ath79.c
|
||||
+++ b/drivers/spi/spi-ath79.c
|
||||
@@ -30,6 +30,8 @@
|
||||
@@ -35,6 +35,8 @@
|
||||
#define ATH79_SPI_RRW_DELAY_FACTOR 12000
|
||||
#define MHZ (1000 * 1000)
|
||||
|
||||
#define DRV_NAME "ath79-spi"
|
||||
|
||||
+#define ATH79_SPI_CS_LINE_MAX 2
|
||||
+#define ATH79_SPI_CS_LINE_MAX 2
|
||||
+
|
||||
struct ath79_spi {
|
||||
struct spi_bitbang bitbang;
|
||||
u32 ioc_base;
|
||||
@@ -62,6 +64,7 @@ static void ath79_spi_chipselect(struct
|
||||
@@ -69,6 +71,7 @@ static void ath79_spi_chipselect(struct
|
||||
{
|
||||
struct ath79_spi *sp = ath79_spidev_to_sp(spi);
|
||||
int cs_high = (spi->mode & SPI_CS_HIGH) ? is_active : !is_active;
|
||||
|
|
@ -46,7 +134,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
|
||||
if (is_active) {
|
||||
/* set initial clock polarity */
|
||||
@@ -73,20 +76,21 @@ static void ath79_spi_chipselect(struct
|
||||
@@ -80,20 +83,21 @@ static void ath79_spi_chipselect(struct
|
||||
ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);
|
||||
}
|
||||
|
||||
|
|
@ -77,7 +165,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
}
|
||||
|
||||
static void ath79_spi_enable(struct ath79_spi *sp)
|
||||
@@ -113,24 +117,30 @@ static void ath79_spi_disable(struct ath
|
||||
@@ -120,24 +124,30 @@ static void ath79_spi_disable(struct ath
|
||||
static int ath79_spi_setup_cs(struct spi_device *spi)
|
||||
{
|
||||
struct ath79_spi_controller_data *cdata;
|
||||
|
|
@ -112,7 +200,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
}
|
||||
|
||||
return status;
|
||||
@@ -138,9 +148,15 @@ static int ath79_spi_setup_cs(struct spi
|
||||
@@ -145,9 +155,15 @@ static int ath79_spi_setup_cs(struct spi
|
||||
|
||||
static void ath79_spi_cleanup_cs(struct spi_device *spi)
|
||||
{
|
||||
|
|
@ -131,8 +219,8 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
}
|
||||
}
|
||||
|
||||
@@ -206,6 +222,10 @@ static __devinit int ath79_spi_probe(str
|
||||
struct resource *r;
|
||||
@@ -215,6 +231,10 @@ static __devinit int ath79_spi_probe(str
|
||||
unsigned long rate;
|
||||
int ret;
|
||||
|
||||
+ pdata = pdev->dev.platform_data;
|
||||
|
|
@ -142,7 +230,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||
master = spi_alloc_master(&pdev->dev, sizeof(*sp));
|
||||
if (master == NULL) {
|
||||
dev_err(&pdev->dev, "failed to allocate spi master\n");
|
||||
@@ -215,17 +235,10 @@ static __devinit int ath79_spi_probe(str
|
||||
@@ -224,17 +244,10 @@ static __devinit int ath79_spi_probe(str
|
||||
sp = spi_master_get_devdata(master);
|
||||
platform_set_drvdata(pdev, sp);
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
--- a/arch/mips/ath79/mach-db120.c
|
||||
+++ b/arch/mips/ath79/mach-db120.c
|
||||
@@ -95,12 +95,18 @@ static struct gpio_keys_button db120_gpi
|
||||
},
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data db120_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info db120_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "s25sl064a",
|
||||
+ .controller_data = &db120_spi0_data,
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -1,105 +0,0 @@
|
|||
--- a/arch/mips/ath79/mach-ap121.c
|
||||
+++ b/arch/mips/ath79/mach-ap121.c
|
||||
@@ -58,12 +58,18 @@ static struct gpio_keys_button ap121_gpi
|
||||
}
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data ap121_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info ap121_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "mx25l1606e",
|
||||
+ .controller_data = &ap121_spi0_data,
|
||||
}
|
||||
};
|
||||
|
||||
--- a/arch/mips/ath79/mach-ap81.c
|
||||
+++ b/arch/mips/ath79/mach-ap81.c
|
||||
@@ -67,12 +67,18 @@ static struct gpio_keys_button ap81_gpio
|
||||
}
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data ap81_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info ap81_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "m25p64",
|
||||
+ .controller_data = &ap81_spi0_data,
|
||||
}
|
||||
};
|
||||
|
||||
--- a/arch/mips/ath79/mach-db120.c
|
||||
+++ b/arch/mips/ath79/mach-db120.c
|
||||
@@ -95,12 +95,18 @@ static struct gpio_keys_button db120_gpi
|
||||
},
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data db120_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info db120_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "s25sl064a",
|
||||
+ .controller_data = &db120_spi0_data,
|
||||
}
|
||||
};
|
||||
|
||||
--- a/arch/mips/ath79/mach-pb44.c
|
||||
+++ b/arch/mips/ath79/mach-pb44.c
|
||||
@@ -87,12 +87,18 @@ static struct gpio_keys_button pb44_gpio
|
||||
}
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data pb44_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info pb44_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "m25p64",
|
||||
+ .controller_data = &pb44_spi0_data,
|
||||
},
|
||||
};
|
||||
|
||||
--- a/arch/mips/ath79/mach-ubnt-xm.c
|
||||
+++ b/arch/mips/ath79/mach-ubnt-xm.c
|
||||
@@ -65,12 +65,18 @@ static struct gpio_keys_button ubnt_xm_g
|
||||
}
|
||||
};
|
||||
|
||||
+static struct ath79_spi_controller_data ubnt_xm_spi0_data = {
|
||||
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||
+ .cs_line = 0,
|
||||
+};
|
||||
+
|
||||
static struct spi_board_info ubnt_xm_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "mx25l6405d",
|
||||
+ .controller_data = &ubnt_xm_spi0_data,
|
||||
}
|
||||
};
|
||||
|
||||
Loading…
Reference in a new issue