layerscape: update patches-4.14 to LSDK 19.03

[openwrt/staging/ynezz.git] / target / linux / layerscape / patches-4.14 / 818-qspi-support-layerscape.patch

diff --git a/target/linux/layerscape/patches-4.14/818-qspi-support-layerscape.patch b/target/linux/layerscape/patches-4.14/818-qspi-support-layerscape.patch
index b74c82ba025ee3e76b38d336801362c124a46a70..744245499f9b2c2a9d379c979f269b98efb19ada 100644 (file)
--- a/target/linux/layerscape/patches-4.14/818-qspi-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/818-qspi-support-layerscape.patch
@@ -1,68 +1,26 @@
-From 60eee49f37b77bc2d5f46c5db5a5c24d0c31bd02 Mon Sep 17 00:00:00 2001
+From fe21ef44284a3aa6fd80448e4ab2e1e8a55fb926 Mon Sep 17 00:00:00 2001
 From: Biwen Li <biwen.li@nxp.com>
-Date: Tue, 20 Nov 2018 15:36:57 +0800
+Date: Wed, 17 Apr 2019 18:58:59 +0800
 Subject: [PATCH] qspi: support layerscape
 
 This is an integrated patch of qspi for layerscape
 
 Signed-off-by: Abhimanyu Saini <abhimanyu.saini@nxp.com>
+Signed-off-by: Biwen Li <biwen.li@nxp.com>
+Signed-off-by: Chuanhua Han <chuanhua.han@nxp.com>
 Signed-off-by: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
+Signed-off-by: Mark Brown <broonie@kernel.org>
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
 Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
 Signed-off-by: Suresh Gupta <suresh.gupta@nxp.com>
-Signed-off-by: Yogesh Gaur <yogeshnarayan.gaur@nxp.com>
-Signed-off-by: Biwen Li <biwen.li@nxp.com>
 Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
+Signed-off-by: Yogesh Gaur <yogeshnarayan.gaur@nxp.com>
 ---
- .../devicetree/bindings/mtd/fsl-quadspi.txt   |  31 ++
- drivers/mtd/spi-nor/fsl-quadspi.c             | 444 +++++++++++-------
- drivers/mtd/spi-nor/spi-nor.c                 |   5 +
- 3 files changed, 320 insertions(+), 160 deletions(-)
+ drivers/mtd/spi-nor/fsl-quadspi.c | 444 +++++++++++++++++++-----------
+ drivers/mtd/spi-nor/spi-nor.c     |   5 +
+ drivers/spi/spi-fsl-dspi.c        |   4 +-
+ 3 files changed, 291 insertions(+), 162 deletions(-)
 
---- a/Documentation/devicetree/bindings/mtd/fsl-quadspi.txt
-+++ b/Documentation/devicetree/bindings/mtd/fsl-quadspi.txt
-@@ -7,6 +7,7 @@ Required properties:
-                or
-                "fsl,ls2080a-qspi" followed by "fsl,ls1021a-qspi",
-                "fsl,ls1043a-qspi" followed by "fsl,ls1021a-qspi"
-+               "fsl,ls2080a-qspi" followed by "fsl,ls1088a-qspi",
-   - reg : the first contains the register location and length,
-           the second contains the memory mapping address and length
-   - reg-names: Should contain the reg names "QuadSPI" and "QuadSPI-memory"
-@@ -39,3 +40,33 @@ qspi0: quadspi@40044000 {
-               ....
-       };
- };
-+
-+qspi1: quadspi@20c0000 {
-+      #address-cells = <1>;
-+      #size-cells = <0>;
-+      reg = <0x0 0x20c0000 0x0 0x10000>,
-+              <0x0 0x20000000 0x0 0x10000000>;
-+      reg-names = "QuadSPI", "QuadSPI-memory";
-+      interrupts = <0 25 0x4>; /* Level high type */
-+      clocks = <&clockgen 4 3>, <&clockgen 4 3>;
-+      clock-names = "qspi_en", "qspi";
-+      status = "okay";
-+
-+      qflash0: s25fs512s@0 {
-+              #address-cells = <1>;
-+              #size-cells = <1>;
-+              spi-max-frequency = <20000000>;
-+              reg = <0>;
-+              spi-rx-bus-width = <4>;
-+              spi-tx-bus-width = <4>;
-+      };
-+
-+      qflash1: s25fs512s@1 {
-+              #address-cells = <1>;
-+              #size-cells = <1>;
-+              spi-max-frequency = <20000000>;
-+              reg = <1>;
-+              spi-rx-bus-width = <4>;
-+              spi-tx-bus-width = <4>;
-+      };
-+};
 --- a/drivers/mtd/spi-nor/fsl-quadspi.c
 +++ b/drivers/mtd/spi-nor/fsl-quadspi.c
 @@ -41,6 +41,7 @@
@@ -760,7 +718,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1147,6 +1147,11 @@ static const struct flash_info spi_nor_i
+@@ -1154,6 +1154,11 @@ static const struct flash_info spi_nor_i
        { "w25x40", INFO(0xef3013, 0, 64 * 1024,  8,  SECT_4K) },
        { "w25x80", INFO(0xef3014, 0, 64 * 1024,  16, SECT_4K) },
        { "w25x16", INFO(0xef3015, 0, 64 * 1024,  32, SECT_4K) },
@@ -772,3 +730,16 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        { "w25x32", INFO(0xef3016, 0, 64 * 1024,  64, SECT_4K) },
        { "w25q20cl", INFO(0xef4012, 0, 64 * 1024,  4, SECT_4K) },
        { "w25q20bw", INFO(0xef5012, 0, 64 * 1024,  4, SECT_4K) },
+--- a/drivers/spi/spi-fsl-dspi.c
++++ b/drivers/spi/spi-fsl-dspi.c
+@@ -1024,8 +1024,8 @@ static int dspi_probe(struct platform_de
+               goto out_clk_put;
+       }
+ 
+-      ret = devm_request_irq(&pdev->dev, dspi->irq, dspi_interrupt, 0,
+-                      pdev->name, dspi);
++      ret = devm_request_irq(&pdev->dev, dspi->irq, dspi_interrupt,
++                                 IRQF_SHARED, pdev->name, dspi);
+       if (ret < 0) {
+               dev_err(&pdev->dev, "Unable to attach DSPI interrupt\n");
+               goto out_clk_put;