diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-12-10 08:25:50 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-12-10 08:25:50 -0800 |
| commit | f577fc52a6d84d9721ff15e59a22c203c4961b2f (patch) | |
| tree | 8e32384c1dc73a8790f40f788fec2ebcbd4881f8 /arch/arm/boot/dts/dra7.dtsi | |
| parent | a0e4467726cd26bacb16f13d207ffcfa82ffc07d (diff) | |
| parent | e671538d5110e913a0a3cd6122d7f70b71fc0728 (diff) | |
Merge branch 'omap-for-v3.19/fixes-not-urgent' into omap-for-v3.19/fixes
Diffstat (limited to 'arch/arm/boot/dts/dra7.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/dra7.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 63bf99be1762..22771bc1643a 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -742,7 +742,7 @@ }; wdt2: wdt@4ae14000 { - compatible = "ti,omap4-wdt"; + compatible = "ti,omap3-wdt"; reg = <0x4ae14000 0x80>; interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "wd_timer2"; |