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 branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6ul.dtsi
diff --git
a/arch/arm/boot/dts/imx6ul.dtsi
b/arch/arm/boot/dts/imx6ul.dtsi
index 53d3f8e41e9b8e99a15888cb63a50fc19aa591d4..b9d7d2d09402b3dccbdfa8697cb8e8c141bfe644 100644
(file)
--- a/
arch/arm/boot/dts/imx6ul.dtsi
+++ b/
arch/arm/boot/dts/imx6ul.dtsi
@@
-99,11
+99,11
@@
};
intc: interrupt-controller@00a01000 {
};
intc: interrupt-controller@00a01000 {
- compatible = "arm,cortex-a7-gic";
+ compatible = "arm,
gic-400", "arm,
cortex-a7-gic";
#interrupt-cells = <3>;
interrupt-controller;
reg = <0x00a01000 0x1000>,
#interrupt-cells = <3>;
interrupt-controller;
reg = <0x00a01000 0x1000>,
- <0x00a02000 0x
1
000>,
+ <0x00a02000 0x
2
000>,
<0x00a04000 0x2000>,
<0x00a06000 0x2000>;
};
<0x00a04000 0x2000>,
<0x00a06000 0x2000>;
};
@@
-542,7
+542,6
@@
anatop-min-bit-val = <0>;
anatop-min-voltage = <2625000>;
anatop-max-voltage = <3400000>;
anatop-min-bit-val = <0>;
anatop-min-voltage = <2625000>;
anatop-max-voltage = <3400000>;
- anatop-enable-bit = <0>;
};
reg_arm: regulator-vddcore {
};
reg_arm: regulator-vddcore {
@@
-859,6
+858,12
@@
reg = <0x021b0000 0x4000>;
};
reg = <0x021b0000 0x4000>;
};
+ ocotp: ocotp-ctrl@021bc000 {
+ compatible = "fsl,imx6ul-ocotp", "syscon";
+ reg = <0x021bc000 0x4000>;
+ clocks = <&clks IMX6UL_CLK_OCOTP>;
+ };
+
lcdif: lcdif@021c8000 {
compatible = "fsl,imx6ul-lcdif", "fsl,imx28-lcdif";
reg = <0x021c8000 0x4000>;
lcdif: lcdif@021c8000 {
compatible = "fsl,imx6ul-lcdif", "fsl,imx28-lcdif";
reg = <0x021c8000 0x4000>;