projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[deliverable/linux.git]
/
arch
/
arm
/
boot
/
dts
/
qcom-ipq8064.dtsi
diff --git
a/arch/arm/boot/dts/qcom-ipq8064.dtsi
b/arch/arm/boot/dts/qcom-ipq8064.dtsi
index 2601a907947b97f4e58c8e07d1524afa2aad02d1..2e375576ffd06edc7c1f83863df13e6f17f571e4 100644
(file)
--- a/
arch/arm/boot/dts/qcom-ipq8064.dtsi
+++ b/
arch/arm/boot/dts/qcom-ipq8064.dtsi
@@
-122,7
+122,8
@@
};
timer@200a000 {
- compatible = "qcom,kpss-timer", "qcom,msm-timer";
+ compatible = "qcom,kpss-timer",
+ "qcom,kpss-wdt-ipq8064", "qcom,msm-timer";
interrupts = <1 1 0x301>,
<1 2 0x301>,
<1 3 0x301>,
This page took
0.049755 seconds
and
5
git commands to generate.