MLK-21453: crypto: caam - fix Mentor's port, merge conflict resolutions

MLK-21453: crypto: caam - fix Mentor's port, merge conflict resolutions

1. imx_4.14.y commit ("6c68d27892c4 MLK-18082: boot: dtsi: Align DTSI")
changes in Documentation/devicetree/bindings/crypto/fsl-sec4.txt were
omitted, add them now.

2. Some commits (see Fixes tags) are incomplete / merge conflict
resolutions are incorrect.

Fixes: 0cab3173f44a ("MLK-18082: ARM: dts: imx: Change size of caam-sm to correct size")
Fixes: 9c5e81b8410b ("MLK-9710-18 snvs - make SECVIO module device tree correct")
Reviewed-by: Franck LENORMAND <franck.lenormand@nxp.com>
Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>