diff options
| author | Olof Johansson <olof@lixom.net> | 2017-12-10 05:22:01 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-12-10 05:22:01 +0100 |
| commit | 69b8df5d6a4222fd6996227ae8ef60fe44db74fc (patch) | |
| tree | c7fedf113070bf702903eea5c090da5a55818b35 /arch | |
| parent | ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds (diff) | |
| parent | ARM: dts: Fix dm814x missing phy-cells property (diff) | |
| download | linux-69b8df5d6a4222fd6996227ae8ef60fe44db74fc.tar.xz linux-69b8df5d6a4222fd6996227ae8ef60fe44db74fc.zip | |
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 <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/dm814x.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap4.dtsi | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/dm814x.dtsi b/arch/arm/boot/dts/dm814x.dtsi index b7a11c1168d1..681f5487406e 100644 --- a/arch/arm/boot/dts/dm814x.dtsi +++ b/arch/arm/boot/dts/dm814x.dtsi @@ -386,6 +386,7 @@ reg = <0x1b00 0x100>; reg-names = "phy"; ti,ctrl_mod = <&usb_ctrl_mod>; + #phy-cells = <0>; }; }; diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 3bba7128b8f3..cc1a07a3620f 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -398,7 +398,7 @@ elm: elm@48078000 { compatible = "ti,am3352-elm"; reg = <0x48078000 0x2000>; - interrupts = <4>; + interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "elm"; status = "disabled"; }; |