projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6-block.git]
/
arch
/
arm
/
boot
/
dts
/
qcom-apq8064.dtsi
diff --git
a/arch/arm/boot/dts/qcom-apq8064.dtsi
b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 906bb81cfd67b3a2a74196aba804e56c416ec0ab..74a9b6c394f555fbcc947486f92d25b5702b536b 100644
(file)
--- a/
arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/
arch/arm/boot/dts/qcom-apq8064.dtsi
@@
-253,7
+253,8
@@
};
timer@200a000 {
- compatible = "qcom,kpss-timer", "qcom,msm-timer";
+ compatible = "qcom,kpss-timer",
+ "qcom,kpss-wdt-apq8064", "qcom,msm-timer";
interrupts = <1 1 0x301>,
<1 2 0x301>,
<1 3 0x301>;