path: root/arch/arm/boot/dts/at91sam9x5.dtsi
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-13 09:52:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-13 09:52:00 -0700
commit18759462b6dd8de0f668a346cfe3776fe9370bac (patch)
tree6811c0ccde5acc823b660ae29b4812776eca6a8a /arch/arm/boot/dts/at91sam9x5.dtsi
parentc3548b730dceecf6197d629a425c99801dadfa5e (diff)
parent8a934ccbf90959877beec27780469e85f1c3f101 (diff)
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann: "Three more bug fixes for ARM SoCs this week: - The Atmel sama5d2 was registering the wrong NFC device type - On Atmel sam9x5, the power management controller had an incorrect register area size - On ARM64 Allwinner machine was not secting the generic irqchip code, causing build errors in some configurations" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: dts: at91: sam9x5: Fix the memory range assigned to the PMC arm64/sunxi: 4.6-rc1: Add dependency on generic irq chip ARM: dts: at91: sama5d2: use "atmel,sama5d3-nfc" compatible for nfc
Diffstat (limited to 'arch/arm/boot/dts/at91sam9x5.dtsi')
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 0827d594b1f0..cd0cd5fd09a3 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -106,7 +106,7 @@
pmc: pmc@fffffc00 {
compatible = "atmel,at91sam9x5-pmc", "syscon";
- reg = <0xfffffc00 0x100>;
+ reg = <0xfffffc00 0x200>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
#address-cells = <1>;