[OpenWrt-Devel] [PATCH 15/23] ar71xx: refresh 463-spi-ath79-add-fast-flash-read.patch

[Zhao, Gang]

Signed-off-by: Zhao, Gang <gang.zhao.42 at gmail.com>
---
 .../patches-3.14/463-spi-ath79-add-fast-flash-read.patch   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/target/linux/ar71xx/patches-3.14/463-spi-ath79-add-fast-flash-read.patch b/target/linux/ar71xx/patches-3.14/463-spi-ath79-add-fast-flash-read.patch
index e861644..62d52d2 100644
--- a/target/linux/ar71xx/patches-3.14/463-spi-ath79-add-fast-flash-read.patch
+++ b/target/linux/ar71xx/patches-3.14/463-spi-ath79-add-fast-flash-read.patch
@@ -34,7 +34,7 @@
  }
  
  static void ath79_spi_disable(struct ath79_spi *sp)
-@@ -232,6 +239,110 @@ static u32 ath79_spi_txrx_mode0(struct s
+@@ -226,6 +233,110 @@ static u32 ath79_spi_txrx_mode0(struct s
  	return ath79_spi_rr(sp, AR71XX_SPI_REG_RDS);
  }
  
@@ -145,17 +145,17 @@
  static int ath79_spi_probe(struct platform_device *pdev)
  {
  	struct spi_master *master;
-@@ -254,6 +365,8 @@ static int ath79_spi_probe(struct platfo
+@@ -248,6 +359,8 @@ static int ath79_spi_probe(struct platfo
  	sp = spi_master_get_devdata(master);
  	platform_set_drvdata(pdev, sp);
  
 +	sp->state = ATH79_SPI_STATE_WAIT_CMD;
 +
+ 	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32);
  	master->setup = ath79_spi_setup;
  	master->cleanup = ath79_spi_cleanup;
- 	master->bus_num = pdata->bus_num;
-@@ -262,7 +375,7 @@ static int ath79_spi_probe(struct platfo
- 	sp->bitbang.master = spi_master_get(master);
+@@ -257,7 +370,7 @@ static int ath79_spi_probe(struct platfo
+ 	sp->bitbang.master = master;
  	sp->bitbang.chipselect = ath79_spi_chipselect;
  	sp->bitbang.txrx_word[SPI_MODE_0] = ath79_spi_txrx_mode0;
 -	sp->bitbang.setup_transfer = spi_bitbang_setup_transfer;
@@ -163,9 +163,9 @@
  	sp->bitbang.flags = SPI_CS_HIGH;
  
  	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-@@ -287,7 +400,8 @@ static int ath79_spi_probe(struct platfo
+@@ -282,7 +395,8 @@ static int ath79_spi_probe(struct platfo
  	if (ret)
- 		goto err_clk_put;
+ 		goto err_put_master;
  
 -	rate = DIV_ROUND_UP(clk_get_rate(sp->clk), MHZ);
 +	sp->ahb_rate = clk_get_rate(sp->clk);
-- 
1.9.3
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel