projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-intel-next-fixes-2016-08-05' of git://anongit.freedesktop.org/drm...
[cascardo/linux.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
5c08d19
..
b7a24af
100644
(file)
--- a/
arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/
arch/arm/boot/dts/qcom-ipq4019.dtsi
@@
-84,6
+84,12
@@
};
};
};
};
+ pmu {
+ compatible = "arm,cortex-a7-pmu";
+ interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) |
+ IRQ_TYPE_LEVEL_HIGH)>;
+ };
+
clocks {
sleep_clk: sleep_clk {
compatible = "fixed-clock";
clocks {
sleep_clk: sleep_clk {
compatible = "fixed-clock";
@@
-252,7
+258,7
@@
};
watchdog@b017000 {
};
watchdog@b017000 {
- compatible = "qcom,kpss-
standalone
";
+ compatible = "qcom,kpss-
wdt", "qcom,kpss-wdt-ipq4019
";
reg = <0xb017000 0x40>;
clocks = <&sleep_clk>;
timeout-sec = <10>;
reg = <0xb017000 0x40>;
clocks = <&sleep_clk>;
timeout-sec = <10>;