Skip to content

Commit 69b8df5

Browse files
committed
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: Olof Johansson <[email protected]>
2 parents 863204c + c22fe69 commit 69b8df5

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

arch/arm/boot/dts/dm814x.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@
386386
reg = <0x1b00 0x100>;
387387
reg-names = "phy";
388388
ti,ctrl_mod = <&usb_ctrl_mod>;
389+
#phy-cells = <0>;
389390
};
390391
};
391392

arch/arm/boot/dts/omap4.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@
398398
elm: elm@48078000 {
399399
compatible = "ti,am3352-elm";
400400
reg = <0x48078000 0x2000>;
401-
interrupts = <4>;
401+
interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
402402
ti,hwmods = "elm";
403403
status = "disabled";
404404
};

0 commit comments

Comments
 (0)