Skip to content
Snippets Groups Projects
Commit 69b8df5d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.15/fixes-dt-warnings' of...

Merge tag 'omap-for-v4.15/fixes-dt-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Two fixes for dts compiler warnings

These recently started showing up with better dtc checks being
introduced.

* tag 'omap-for-v4.15/fixes-dt-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: Fix dm814x missing phy-cells property
  ARM: dts: Fix elm interrupt compiler warning

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 863204cf c22fe696
No related branches found
No related tags found
No related merge requests found
...@@ -386,6 +386,7 @@ ...@@ -386,6 +386,7 @@
reg = <0x1b00 0x100>; reg = <0x1b00 0x100>;
reg-names = "phy"; reg-names = "phy";
ti,ctrl_mod = <&usb_ctrl_mod>; ti,ctrl_mod = <&usb_ctrl_mod>;
#phy-cells = <0>;
}; };
}; };
......
...@@ -398,7 +398,7 @@ ...@@ -398,7 +398,7 @@
elm: elm@48078000 { elm: elm@48078000 {
compatible = "ti,am3352-elm"; compatible = "ti,am3352-elm";
reg = <0x48078000 0x2000>; reg = <0x48078000 0x2000>;
interrupts = <4>; interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
ti,hwmods = "elm"; ti,hwmods = "elm";
status = "disabled"; status = "disabled";
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment