From 102c6df148ee4b5df368c32e282e31f37f26363f Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Tue, 27 Mar 2012 19:38:15 +0000 Subject: 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 --- ...ath79-make-chipselect-logic-more-flexible.patch | 116 ++++++++++++++++++--- 1 file changed, 102 insertions(+), 14 deletions(-) (limited to 'target/linux/ar71xx/patches-3.2/207-spi-ath79-make-chipselect-logic-more-flexible.patch') diff --git a/target/linux/ar71xx/patches-3.2/207-spi-ath79-make-chipselect-logic-more-flexible.patch b/target/linux/ar71xx/patches-3.2/207-spi-ath79-make-chipselect-logic-more-flexible.patch index af96f55735..08d544fc45 100644 --- a/target/linux/ar71xx/patches-3.2/207-spi-ath79-make-chipselect-logic-more-flexible.patch +++ b/target/linux/ar71xx/patches-3.2/207-spi-ath79-make-chipselect-logic-more-flexible.patch @@ -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 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 --- + 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 #endif /* _ATH79_SPI_PLATFORM_H */ --- a/drivers/spi/spi-ath79.c +++ b/drivers/spi/spi-ath79.c -@@ -30,6 +30,8 @@ - - #define DRV_NAME "ath79-spi" +@@ -35,6 +35,8 @@ + #define ATH79_SPI_RRW_DELAY_FACTOR 12000 + #define MHZ (1000 * 1000) -+#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 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 } 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 } 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 } } -@@ -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 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); -- cgit v1.2.3