ath79: replace patches

[openwrt/openwrt.git] / target / linux / ath79 / patches-4.14 / 461-spi-ath79-add-fast-flash-read.patch

diff --git a/target/linux/ath79/patches-4.14/461-spi-ath79-add-fast-flash-read.patch b/target/linux/ath79/patches-4.14/461-spi-ath79-add-fast-flash-read.patch
index 06da2b34e8896077113738a307f42d87100b904d..7c24fc5e14e593e8945789c2ac3e37bd14ad92be 100644 (file)
--- a/target/linux/ath79/patches-4.14/461-spi-ath79-add-fast-flash-read.patch
+++ b/target/linux/ath79/patches-4.14/461-spi-ath79-add-fast-flash-read.patch
@@ -1,6 +1,6 @@
 --- a/drivers/spi/spi-ath79.c
 +++ b/drivers/spi/spi-ath79.c
-@@ -102,9 +102,6 @@ static void ath79_spi_enable(struct ath7
+@@ -101,9 +101,6 @@ static void ath79_spi_enable(struct ath7
        /* save CTRL register */
        sp->reg_ctrl = ath79_spi_rr(sp, AR71XX_SPI_REG_CTRL);
        sp->ioc_base = ath79_spi_rr(sp, AR71XX_SPI_REG_IOC);
@@ -10,7 +10,7 @@
  }
  
  static void ath79_spi_disable(struct ath79_spi *sp)
-@@ -204,6 +201,38 @@ static u32 ath79_spi_txrx_mode0(struct s
+@@ -203,6 +200,38 @@ static u32 ath79_spi_txrx_mode0(struct s
        return ath79_spi_rr(sp, AR71XX_SPI_REG_RDS);
  }
  
@@ -49,12 +49,12 @@
  static int ath79_spi_probe(struct platform_device *pdev)
  {
        struct spi_master *master;
-@@ -232,6 +261,8 @@ static int ath79_spi_probe(struct platfo
-               master->bus_num = pdata->bus_num;
-               master->num_chipselect = pdata->num_chipselect;
+@@ -237,6 +266,8 @@ static int ath79_spi_probe(struct platfo
+               ret = PTR_ERR(sp->base);
+               goto err_put_master;
        }
 +      master->spi_flash_read = ath79_spi_read_flash_data;
 +      master->flash_read_supported = ath79_spi_flash_read_supported;
  
-       sp->bitbang.master = master;
-       sp->bitbang.chipselect = ath79_spi_chipselect;
+       sp->clk = devm_clk_get(&pdev->dev, "ahb");
+       if (IS_ERR(sp->clk)) {