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 'sound-fix-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6ull.dtsi
diff --git
a/arch/arm/boot/dts/imx6ull.dtsi
b/arch/arm/boot/dts/imx6ull.dtsi
index f3668fe69eaced1fcd539d2ddac99ba3b8591fcc..22e4a307fa5934b08c6c16052c8f84bd636278e0 100644
(file)
--- a/
arch/arm/boot/dts/imx6ull.dtsi
+++ b/
arch/arm/boot/dts/imx6ull.dtsi
@@
-30,6
+30,18
@@
>;
};
+&ocotp {
+ compatible = "fsl,imx6ull-ocotp", "syscon";
+};
+
+&usdhc1 {
+ compatible = "fsl,imx6ull-usdhc", "fsl,imx6sx-usdhc";
+};
+
+&usdhc2 {
+ compatible = "fsl,imx6ull-usdhc", "fsl,imx6sx-usdhc";
+};
+
/ {
soc {
aips3: aips-bus@2200000 {