linux-next: manual merge of the devicetree tree with the crypto tree

[Stephen Rothwell]

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in
drivers/crypto/caam/jr.c between commit 313ea293e9c4 ("crypto: caam - Add
Platform driver for Job Ring") from the crypto tree and commit
f7578496a671 ("of/irq: Use irq_of_parse_and_map()") from the devicetree
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/crypto/caam/jr.c
index 636bb53125ab,517a16d87e4b..000000000000
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@@ -480,7 -403,7 +480,7 @@@ static int caam_jr_probe(struct platfor
                dma_set_mask(jrdev, DMA_BIT_MASK(32));
  
        /* Identify the interrupt */
-       jrpriv->irq = of_irq_to_resource(nprop, 0, NULL);
 -      jrpriv->irq = irq_of_parse_and_map(np, 0);
++      jrpriv->irq = irq_of_parse_and_map(nprop, 0);
  
        /* Now do the platform independent part */
        error = caam_jr_init(jrdev); /* now turn on hardware */

pgpnboESatY1r.pgp
Description: PGP signature