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-ipq4019.dtsi
diff --git
a/arch/arm/boot/dts/qcom-ipq4019.dtsi
b/arch/arm/boot/dts/qcom-ipq4019.dtsi
index a520ef5c9a94bb09a239022bce4c1ee8e6fd8e13..b7a24af8f47b388e3bb9b35968495ae941399e16 100644
(file)
--- a/
arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/
arch/arm/boot/dts/qcom-ipq4019.dtsi
@@
-258,7
+258,7
@@
};
watchdog@b017000 {
- compatible = "qcom,kpss-
standalone
";
+ compatible = "qcom,kpss-
wdt", "qcom,kpss-wdt-ipq4019
";
reg = <0xb017000 0x40>;
clocks = <&sleep_clk>;
timeout-sec = <10>;