git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6qp.dtsi
diff --git
a/arch/arm/boot/dts/imx6qp.dtsi
b/arch/arm/boot/dts/imx6qp.dtsi
index 59453f2ac4bafeaad4efbb98ab4189c27bb788f8..299d863690c5dbbaded0a3b1bf05de9002b7cd3d 100644
(file)
--- a/
arch/arm/boot/dts/imx6qp.dtsi
+++ b/
arch/arm/boot/dts/imx6qp.dtsi
@@
-120,6
+120,10
@@
<0 119 IRQ_TYPE_LEVEL_HIGH>;
};
+&gpc {
+ compatible = "fsl,imx6qp-gpc", "fsl,imx6q-gpc";
+};
+
&ipu1 {
compatible = "fsl,imx6qp-ipu", "fsl,imx6q-ipu";
fsl,prg = <&prg1>;