projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
sama5d4.dtsi
diff --git
a/arch/arm/boot/dts/sama5d4.dtsi
b/arch/arm/boot/dts/sama5d4.dtsi
index 15bbaf690047dfb9ab0082d31b83142b63228e09..2193637b9cd2bdb4a14a13e8e48218cc04cadf01 100644
(file)
--- a/
arch/arm/boot/dts/sama5d4.dtsi
+++ b/
arch/arm/boot/dts/sama5d4.dtsi
@@
-1300,7
+1300,7
@@
};
watchdog@fc068640 {
- compatible = "atmel,
at91sam9260
-wdt";
+ compatible = "atmel,
sama5d4
-wdt";
reg = <0xfc068640 0x10>;
clocks = <&clk32k>;
status = "disabled";