projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'for-4.4/upstream-fixes', 'for-4.5/async-suspend', 'for-4.5/container...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
sama5d3.dtsi
diff --git
a/arch/arm/boot/dts/sama5d3.dtsi
b/arch/arm/boot/dts/sama5d3.dtsi
index
1832736
..
a532791
100644
(file)
--- a/
arch/arm/boot/dts/sama5d3.dtsi
+++ b/
arch/arm/boot/dts/sama5d3.dtsi
@@
-907,7
+907,7
@@
};
pmc: pmc@fffffc00 {
- compatible = "atmel,sama5d3-pmc";
+ compatible = "atmel,sama5d3-pmc"
, "syscon"
;
reg = <0xfffffc00 0x120>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
interrupt-controller;