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 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
imx6ul.dtsi
diff --git
a/arch/arm/boot/dts/imx6ul.dtsi
b/arch/arm/boot/dts/imx6ul.dtsi
index
33b95d7
..
c5c05fd
100644
(file)
--- a/
arch/arm/boot/dts/imx6ul.dtsi
+++ b/
arch/arm/boot/dts/imx6ul.dtsi
@@
-411,6
+411,8
@@
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
+ gpio-ranges = <&iomuxc 0 23 10>, <&iomuxc 10 17 6>,
+ <&iomuxc 16 33 16>;
};
gpio2: gpio@020a0000 {
};
gpio2: gpio@020a0000 {
@@
-422,6
+424,7
@@
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
+ gpio-ranges = <&iomuxc 0 49 16>, <&iomuxc 16 111 6>;
};
gpio3: gpio@020a4000 {
};
gpio3: gpio@020a4000 {
@@
-433,6
+436,7
@@
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
+ gpio-ranges = <&iomuxc 0 65 29>;
};
gpio4: gpio@020a8000 {
};
gpio4: gpio@020a8000 {
@@
-444,6
+448,7
@@
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
+ gpio-ranges = <&iomuxc 0 94 17>, <&iomuxc 17 117 12>;
};
gpio5: gpio@020ac000 {
};
gpio5: gpio@020ac000 {
@@
-455,6
+460,7
@@
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
+ gpio-ranges = <&iomuxc 0 7 10>, <&iomuxc 10 5 2>;
};
fec2: ethernet@020b4000 {
};
fec2: ethernet@020b4000 {
@@
-644,7
+650,8
@@
};
gpr: iomuxc-gpr@020e4000 {
};
gpr: iomuxc-gpr@020e4000 {
- compatible = "fsl,imx6ul-iomuxc-gpr", "syscon";
+ compatible = "fsl,imx6ul-iomuxc-gpr",
+ "fsl,imx6q-iomuxc-gpr", "syscon";
reg = <0x020e4000 0x4000>;
};
reg = <0x020e4000 0x4000>;
};