OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ae88c9e
)
ARM: dts: imx6ull: Fix i.MX6ULL/ULZ ocotp compatible
author
Stefan Wahren
<stefan.wahren@i2se.com>
Tue, 11 Dec 2018 13:51:13 +0000
(14:51 +0100)
committer
Shawn Guo
<shawnguo@kernel.org>
Mon, 11 Feb 2019 01:22:24 +0000
(09:22 +0800)
Since imx6ulz.dtsi includes imx6ull.dtsi, we only need to fix the compatible
string here to achieve the correct OTP size for both SoCs.
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/imx6ull.dtsi
patch
|
blob
|
history
diff --git
a/arch/arm/boot/dts/imx6ull.dtsi
b/arch/arm/boot/dts/imx6ull.dtsi
index
f3668fe
..
9cd1a48
100644
(file)
--- a/
arch/arm/boot/dts/imx6ull.dtsi
+++ b/
arch/arm/boot/dts/imx6ull.dtsi
@@
-30,6
+30,10
@@
>;
};
+&ocotp {
+ compatible = "fsl,imx6ull-ocotp", "syscon";
+};
+
/ {
soc {
aips3: aips-bus@2200000 {