diff options
| author | Tony Lindgren <tony@atomide.com> | 2017-12-05 08:29:34 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2017-12-05 08:29:34 -0800 |
| commit | 7e32f8240167a97821a841ba6f9521798e4419d4 (patch) | |
| tree | 7e601aa04cc7c51338e0f8169bd88b06d3c74430 | |
| parent | 7cd4a5eb64b638a71564f62175f6c7ad3f27044e (diff) | |
| parent | c22fe696157dc94a25cc5396b43b29b6d6f4a189 (diff) | |
| download | linux-omap-omap-for-v4.15/fixes-v2.tar.gz | |
Merge branch 'fixes' into omap-for-v4.15/fixes-v2omap-for-v4.15/fixes-v2
| -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 b7a11c1168d10..681f5487406e3 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 3bba7128b8f3e..cc1a07a3620ff 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"; }; |