projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4.9-shared/soc-hdr' into v4.9-armsoc/dts32
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
imx6qdl-nitrogen6_max.dtsi
diff --git
a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
index
657da6b
..
9677bf3
100644
(file)
--- a/
arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
+++ b/
arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
@@
-385,6
+385,7
@@
txd3-skew-ps = <0>;
interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
+ fsl,err006687-workaround-present;
status = "okay";
};