Commit 8a934ccb authored May 12, 2016 by Arnd Bergmann

Merge tag 'at91-fixes2' of...

Merge tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into fixes

Merge "Second AT91 fix PR for 4.6" from Nicolas Ferre:

- fix a regression on the clock subsystem while switching to syscon/regmap
  due to a stricter check of the register map.

* tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: dts: at91: sam9x5: Fix the memory range assigned to the PMC

parents 23485482 aab0a4c8

arch/arm/boot/dts/at91sam9x5.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>;
		interrupt-controller;
		#address-cells = <1>;