projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'omap-for-v4.8/soc' into omap-for-v4.8/fixes
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
qcom-msm8960.dtsi
diff --git
a/arch/arm/boot/dts/qcom-msm8960.dtsi
b/arch/arm/boot/dts/qcom-msm8960.dtsi
index
da05e28
..
288f56e
100644
(file)
--- a/
arch/arm/boot/dts/qcom-msm8960.dtsi
+++ b/
arch/arm/boot/dts/qcom-msm8960.dtsi
@@
-87,7
+87,8
@@
};
timer@200a000 {
- compatible = "qcom,kpss-timer", "qcom,msm-timer";
+ compatible = "qcom,kpss-timer",
+ "qcom,kpss-wdt-msm8960", "qcom,msm-timer";
interrupts = <1 1 0x301>,
<1 2 0x301>,
<1 3 0x301>;