summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-29 17:30:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-29 17:30:41 -0800
commit818aba30b3a178b350b1d7bd12c3430fbf9c212f (patch)
tree23377cff156bed8e40c975dfcbcb5e693d015636 /arch
parent00fd6a7194d2f3be3ecc4fde0af02b39823afdcc (diff)
parent3abb1ada21a4fb5b2920457a2e5c8483abb09a45 (diff)
Merge tag 'rtc-4.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC fixes from Alexandre Belloni: "Two fixes for the ds1307 alarm and wakeup" * tag 'rtc-4.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: rtc: ds1307: fix alarm reading at probe time rtc: ds1307: fix kernel splat due to wakeup irq handling
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/am57xx-beagle-x15.dts1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index d9ba6b879fc1..00352e761b8c 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -604,6 +604,7 @@
reg = <0x6f>;
interrupts-extended = <&crossbar_mpu GIC_SPI 2 IRQ_TYPE_EDGE_RISING>,
<&dra7_pmx_core 0x424>;
+ interrupt-names = "irq", "wakeup";
pinctrl-names = "default";
pinctrl-0 = <&mcp79410_pins_default>;