summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRadu Solea <radu.solea@nxp.com>2017-04-13 16:14:06 +0300
committerAnson Huang <Anson.Huang@nxp.com>2017-06-09 22:19:27 +0800
commit338109dff9eee2569a3a294ed95fc6084f4631ad (patch)
tree99b3aef3841a700c4a3c295f688157b933eed3fb /arch
parent79a6483b4b417ae95e18d353a0a4fe6a38cd0981 (diff)
MLK-14284 Fix CAAM Errata err005766 handling
Update ERA detection code to check 3 sources CCBVID, CAAMVID and the device tree. Fix bit handling of CAAMVID data to obtain correct results. Remove default device tree values. Update errata handling to target known affected platforms. Signed-off-by: Radu Solea <radu.solea@nxp.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6qdl.dtsi1
-rw-r--r--arch/arm/boot/dts/imx6sx.dtsi1
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index d1ff51b59207..b64e7830fced 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -1014,7 +1014,6 @@
crypto: caam@2100000 {
compatible = "fsl,sec-v4.0";
- fsl,sec-era = <4>;
#address-cells = <1>;
#size-cells = <1>;
reg = <0x2100000 0x10000>;
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 29f9caeb66f3..7359c206ffe8 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -929,7 +929,6 @@
crypto: caam@2100000 {
compatible = "fsl,sec-v4.0";
- fsl,sec-era = <4>;
#address-cells = <1>;
#size-cells = <1>;
reg = <0x2100000 0x40000>;