git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pwm/for-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
at91sam9261.dtsi
diff --git
a/arch/arm/boot/dts/at91sam9261.dtsi
b/arch/arm/boot/dts/at91sam9261.dtsi
index 53c63d0a418a47ab67624d52dcc558c0b0071809..33f09d5ea0201ed80cd3456363e8f0070ca8470d 100644
(file)
--- a/
arch/arm/boot/dts/at91sam9261.dtsi
+++ b/
arch/arm/boot/dts/at91sam9261.dtsi
@@
-590,7
+590,7
@@
};
pmc: pmc@fffffc00 {
- compatible = "atmel,at91
rm9200
-pmc", "syscon";
+ compatible = "atmel,at91
sam9261
-pmc", "syscon";
reg = <0xfffffc00 0x100>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
interrupt-controller;