diff options
| author | Tony Lindgren <tony@atomide.com> | 2021-03-08 10:34:12 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2021-03-08 10:34:12 +0100 |
| commit | 4c9f4865f4604744d4f1a43db22ac6ec9dc8e587 (patch) | |
| tree | 46abf93c9b90b880464772ce7d23309ee3616b91 /arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | |
| parent | soc: ti: omap-prm: Fix occasional abort on reset deassert for dra7 iva (diff) | |
| parent | ARM: dts: Fix moving mmc devices with aliases for omap4 & 5 (diff) | |
| download | linux-4c9f4865f4604744d4f1a43db22ac6ec9dc8e587.tar.xz linux-4c9f4865f4604744d4f1a43db22ac6ec9dc8e587.zip | |
Merge branch 'fixes-rc2' into fixes
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-sabreauto.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi index afe477f32984..5e58740d40c5 100644 --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi @@ -298,6 +298,7 @@ interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; fsl,err006687-workaround-present; + fsl,magic-packet; status = "okay"; }; |