diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-05-12 11:44:53 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-12 11:44:53 -0400 |
| commit | 8a934ccbf90959877beec27780469e85f1c3f101 (patch) | |
| tree | fb38c5b01f0a4c273f8bc594fe5cd10c3411d525 | |
| parent | 2348548282d9a2450cc667c2f75ec1d2f0778a40 (diff) | |
| parent | aab0a4c83ceb344d2327194bf354820e50607af6 (diff) | |
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
| -rw-r--r-- | arch/arm/boot/dts/at91sam9x5.dtsi | 2 |
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 @@ | |||
| 106 | 106 | ||
| 107 | pmc: pmc@fffffc00 { | 107 | pmc: pmc@fffffc00 { |
| 108 | compatible = "atmel,at91sam9x5-pmc", "syscon"; | 108 | compatible = "atmel,at91sam9x5-pmc", "syscon"; |
| 109 | reg = <0xfffffc00 0x100>; | 109 | reg = <0xfffffc00 0x200>; |
| 110 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; | 110 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; |
| 111 | interrupt-controller; | 111 | interrupt-controller; |
| 112 | #address-cells = <1>; | 112 | #address-cells = <1>; |