kernel: bump 4.14 to 4.14.114

[openwrt/staging/chunkeey.git] / target / linux / apm821xx / patches-4.14 / 021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch

diff --git a/target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch b/target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch
index fc8df388673ef32fe0e05a17c4d75497aea2dc9b..1b13c345ccff26e4f93d9a009e09e6b9606b2da0 100644 (file)
--- a/target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch
+++ b/target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch
@@ -17,7 +17,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
 
 --- a/drivers/crypto/amcc/crypto4xx_core.c
 +++ b/drivers/crypto/amcc/crypto4xx_core.c
-@@ -1075,9 +1075,6 @@ static irqreturn_t crypto4xx_ce_interrup
+@@ -1084,9 +1084,6 @@ static irqreturn_t crypto4xx_ce_interrup
        struct device *dev = (struct device *)data;
        struct crypto4xx_core_device *core_dev = dev_get_drvdata(dev);
  
@@ -27,7 +27,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
        writel(PPC4XX_INTERRUPT_CLR,
               core_dev->dev->ce_base + CRYPTO4XX_INT_CLR);
        tasklet_schedule(&core_dev->tasklet);
-@@ -1325,13 +1322,6 @@ static int crypto4xx_probe(struct platfo
+@@ -1334,13 +1331,6 @@ static int crypto4xx_probe(struct platfo
        tasklet_init(&core_dev->tasklet, crypto4xx_bh_tasklet_cb,
                     (unsigned long) dev);
  
@@ -41,7 +41,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
        core_dev->dev->ce_base = of_iomap(ofdev->dev.of_node, 0);
        if (!core_dev->dev->ce_base) {
                dev_err(dev, "failed to of_iomap\n");
-@@ -1339,6 +1329,13 @@ static int crypto4xx_probe(struct platfo
+@@ -1348,6 +1338,13 @@ static int crypto4xx_probe(struct platfo
                goto err_iomap;
        }
  
@@ -55,7 +55,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
        /* need to setup pdr, rdr, gdr and sdr before this */
        crypto4xx_hw_init(core_dev->dev);
  
-@@ -1352,11 +1349,11 @@ static int crypto4xx_probe(struct platfo
+@@ -1361,11 +1358,11 @@ static int crypto4xx_probe(struct platfo
        return 0;
  
  err_start_dev: